[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 28 Jul 2016 20:46:36 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 49d725a108dc33f4eb72faff7cf138c5dd8c64f4
Merge: 622c22c a1dfa02
Author: Leo Famulari <address@hidden>
Date: Thu Jul 28 16:46:16 2016 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 6 +-
gnu/packages/gd.scm | 10 +-
gnu/packages/patches/gd-CVE-2016-5766.patch | 81 ++++++++
gnu/packages/patches/gd-CVE-2016-6128.patch | 253 +++++++++++++++++++++++
gnu/packages/patches/gd-CVE-2016-6132.patch | 55 +++++
gnu/packages/patches/gd-CVE-2016-6214.patch | 66 ++++++
gnu/packages/patches/gd-fix-test-on-i686.patch | 34 +++
gnu/packages/patches/gd-fix-tests-on-i686.patch | 61 ------
guix/scripts/package.scm | 3 +-
9 files changed, 503 insertions(+), 66 deletions(-)