[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into security-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into security-updates |
|
Date: |
Sun, 06 Dec 2015 21:19:02 +0000 |
mhw pushed a commit to branch security-updates
in repository guix.
commit 8f8400108be7d5b95660354874b323fdc3221904
Merge: 6735db8 07ab3b8
Author: Mark H Weaver <address@hidden>
Date: Sun Dec 6 16:18:55 2015 -0500
Merge branch 'master' into security-updates
emacs/guix-base.el | 12 +-
emacs/guix-command.el | 1 +
emacs/guix-emacs.el | 36 +-
emacs/guix-info.el | 2 +-
emacs/guix-init.el | 2 +-
gnu-system.am | 20 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gdb.scm | 5 +-
gnu/packages/gnupg.scm | 45 +-
gnu/packages/gnuzilla.scm | 25 +-
gnu/packages/messaging.scm | 5 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 25 +
.../patches/icecat-CVE-2015-4513-pt01.patch | 36 --
.../patches/icecat-CVE-2015-4513-pt02.patch | 103 ----
.../patches/icecat-CVE-2015-4513-pt03.patch | 48 --
.../patches/icecat-CVE-2015-4513-pt04.patch | 50 --
.../patches/icecat-CVE-2015-4513-pt05.patch | 25 -
.../patches/icecat-CVE-2015-4513-pt06.patch | 461 -----------------
.../patches/icecat-CVE-2015-4513-pt07.patch | 93 ----
.../patches/icecat-CVE-2015-4513-pt08.patch | 41 --
.../patches/icecat-CVE-2015-4513-pt09.patch | 65 ---
.../patches/icecat-CVE-2015-4513-pt10.patch | 110 ----
.../patches/icecat-CVE-2015-4513-pt11.patch | 42 --
gnu/packages/patches/icecat-CVE-2015-7188.patch | 143 ------
gnu/packages/patches/icecat-CVE-2015-7189.patch | 143 ------
gnu/packages/patches/icecat-CVE-2015-7193.patch | 397 ---------------
gnu/packages/patches/icecat-CVE-2015-7194.patch | 32 --
gnu/packages/patches/icecat-CVE-2015-7196.patch | 27 -
gnu/packages/patches/icecat-CVE-2015-7197.patch | 70 ---
gnu/packages/patches/icecat-CVE-2015-7198.patch | 27 -
gnu/packages/patches/icecat-CVE-2015-7199.patch | 84 ----
.../patches/python-configobj-setuptools.patch | 30 ++
gnu/packages/python.scm | 523 +++++++++++++++++++-
gnu/packages/tls.scm | 77 +++
gnu/packages/xiph.scm | 8 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/base.scm | 36 ++
gnu/system.scm | 39 +-
gnu/system/pam.scm | 9 +-
guix/profiles.scm | 5 +-
guix/scripts/edit.scm | 14 +-
guix/store.scm | 13 +-
43 files changed, 815 insertions(+), 2126 deletions(-)