[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/08: Merge branch 'master' into core-updates |
|
Date: |
Tue, 06 Jan 2015 18:42:45 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 23800e47361304682914314b99cfd4f3926f28e3
Merge: 9b1bf33 aebb05b
Author: Mark H Weaver <address@hidden>
Date: Tue Jan 6 12:57:15 2015 -0500
Merge branch 'master' into core-updates
config-daemon.ac | 2 +-
doc/guix.texi | 17 +-
gnu-system.am | 13 +-
gnu/build/file-systems.scm | 9 +-
gnu/build/linux-boot.scm | 5 +-
gnu/packages.scm | 17 +-
gnu/packages/autotools.scm | 32 +++-
gnu/packages/cpio.scm | 15 ++-
gnu/packages/games.scm | 11 +-
gnu/packages/gcc.scm | 24 ++-
gnu/packages/gl.scm | 13 +-
gnu/packages/gnome.scm | 12 +
gnu/packages/mail.scm | 3 +-
gnu/packages/patches/cpio-CVE-2014-9112-pt1.patch | 231 ++++++++++++++++++++
gnu/packages/patches/cpio-CVE-2014-9112-pt2.patch | 51 +++++
gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch | 23 ++
gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch | 105 +++++++++
gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch | 88 ++++++++
gnu/packages/patches/libtool-2.4-skip-tests.patch | 24 ++
.../patches/minetest-subgame-env-var.patch | 92 --------
gnu/packages/patches/mutt-CVE-2014-9116.patch | 46 ++++
gnu/packages/patches/unzip-CVE-2014-8139.patch | 49 ++++
gnu/packages/patches/unzip-CVE-2014-8140.patch | 27 +++
gnu/packages/patches/unzip-CVE-2014-8141.patch | 137 ++++++++++++
gnu/packages/version-control.scm | 53 +++++-
gnu/packages/xdisorg.scm | 22 --
gnu/packages/xml.scm | 2 +-
gnu/packages/zip.scm | 6 +-
guix/build/syscalls.scm | 4 +-
guix/pk-crypto.scm | 14 +-
nix/libstore/build.cc | 1 +
nix/libstore/derivations.cc | 16 +-
nix/libstore/derivations.hh | 4 +-
nix/libstore/local-store.cc | 33 +++-
nix/libstore/local-store.hh | 19 ++-
nix/libstore/misc.cc | 2 +-
nix/libstore/optimise-store.cc | 76 ++++++-
nix/libutil/archive.cc | 2 +-
nix/libutil/util.cc | 2 +-
nix/libutil/util.hh | 2 +
tests/guix-package.sh | 23 ++-
41 files changed, 1132 insertions(+), 195 deletions(-)
- branch core-updates updated (9b1bf33 -> 77a3979), Mark H. Weaver, 2015/01/06
- 02/08: gnu: mit-krb5: Build with default gcc., Mark H. Weaver, 2015/01/06
- 05/08: gnu: boost: Fix target-system check., Mark H. Weaver, 2015/01/06
- 04/08: gnu: texlive: Fix target-system check., Mark H. Weaver, 2015/01/06
- 06/08: gnu: gawk: Fix target-system check., Mark H. Weaver, 2015/01/06
- 07/08: gnu: icu4c: Avoid use of 'patchelf'; fix build on ARM systems., Mark H. Weaver, 2015/01/06
- 01/08: Merge branch 'master' into core-updates,
Mark H. Weaver <=
- 08/08: gnu: swig: Build a UTF-8 locale for the tests., Mark H. Weaver, 2015/01/06
- 03/08: gnu: gtk+: Include xorg-server in native-inputs on MIPS; enable tests., Mark H. Weaver, 2015/01/06