From d260015062ca596bce3f8fdf3109f69322b00d43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 29 Jul 2016 14:48:01 -0400 Subject: [PATCH 1/7] gnu: perl-dbd-mysql: Update to 4.035 [fixes CVE-2015-8949]. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.035. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 330837f141..e05232dccd 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -755,15 +755,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.033") + (version "4.035") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" + (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c")))) + "0dqrnrk8yjl06xl8hld5wyalk77z0h9j5h1gdk4z9g0nx9js7v5p")))) (build-system perl-build-system) ;; Tests require running MySQL server (arguments `(#:tests? #f)) From 814572aff53ced7a4c92192f5e7e682d1900de51 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 29 Jul 2016 14:58:17 -0400 Subject: [PATCH 2/7] gnu: wireshark: Update to 2.0.5. * gnu/packages/networking.scm (wireshark): Update to 2.0.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8b76b0738f..5135fb07f7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -331,7 +331,7 @@ and up to 1 Mbit/s downstream.") (define-public wireshark (package (name "wireshark") - (version "2.0.4") + (version "2.0.5") (synopsis "Network traffic analyzer") (source (origin @@ -340,7 +340,7 @@ and up to 1 Mbit/s downstream.") version ".tar.bz2")) (sha256 (base32 - "19g11m8m8qd7dkcvcb27lyppklg608d9ap7wr3mr88clm4nwiacy")))) + "02xi3fz8blcz9cf75rs11g7bijk06wm45vpgnksp72c2609j9q0c")))) (build-system glib-or-gtk-build-system) (inputs `(("bison" ,bison) ("c-ares" ,c-ares) From ce290354ec4e97003be5f56042e55b36831818c1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 29 Jul 2016 15:58:06 -0400 Subject: [PATCH 3/7] gnu: gd: Add fix for gd2_read test. * gnu/packages/patches/gd-fix-gd2-read-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gd.scm (gd)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/gd.scm | 3 ++- gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gd-fix-gd2-read-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index a0d9b8fe11..473197078d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -514,6 +514,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ + %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \ %D%/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 153e1c7f8b..b1bbc22cd7 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -50,7 +50,8 @@ (sha256 (base32 "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl")) - (patches (search-patches "gd-fix-tests-on-i686.patch")))) + (patches (search-patches "gd-fix-gd2-read-test.patch" + "gd-fix-tests-on-i686.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gd-fix-gd2-read-test.patch b/gnu/packages/patches/gd-fix-gd2-read-test.patch new file mode 100644 index 0000000000..65f39e4426 --- /dev/null +++ b/gnu/packages/patches/gd-fix-gd2-read-test.patch @@ -0,0 +1,14 @@ +Fix a 'maybe-uninitialized' warning (turned error) +which occurs on non-Intel platforms. + +--- libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-21 01:21:16.000000000 -0400 ++++ libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-29 15:52:03.806405312 -0400 +@@ -5,7 +5,7 @@ + + int main(int argc, char *argv[]) + { +- int error, i = 0; ++ int error = 0, i = 0; + gdImagePtr im, exp; + FILE *fp; + char *path[] = { From 31c995f8afbb3dc2913c9bfb17ea8de68cf804cb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 29 Jul 2016 16:17:35 -0400 Subject: [PATCH 4/7] Revert "gnu: gd: Add fix for gd2_read test." This reverts commit ce290354ec4e97003be5f56042e55b36831818c1. --- gnu/local.mk | 1 - gnu/packages/gd.scm | 3 +-- gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 -------------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/gd-fix-gd2-read-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 473197078d..a0d9b8fe11 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -514,7 +514,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ - %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \ %D%/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index b1bbc22cd7..153e1c7f8b 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -50,8 +50,7 @@ (sha256 (base32 "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl")) - (patches (search-patches "gd-fix-gd2-read-test.patch" - "gd-fix-tests-on-i686.patch")))) + (patches (search-patches "gd-fix-tests-on-i686.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gd-fix-gd2-read-test.patch b/gnu/packages/patches/gd-fix-gd2-read-test.patch deleted file mode 100644 index 65f39e4426..0000000000 --- a/gnu/packages/patches/gd-fix-gd2-read-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix a 'maybe-uninitialized' warning (turned error) -which occurs on non-Intel platforms. - ---- libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-21 01:21:16.000000000 -0400 -+++ libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-29 15:52:03.806405312 -0400 -@@ -5,7 +5,7 @@ - - int main(int argc, char *argv[]) - { -- int error, i = 0; -+ int error = 0, i = 0; - gdImagePtr im, exp; - FILE *fp; - char *path[] = { From da2d893e324fcdd4ab9e3ccdd62d7aab520da3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 29 Jul 2016 19:48:23 +0200 Subject: [PATCH 5/7] size: Fix corner case with multiple items on the command line. Fixes 'guix size foo bar' when 'foo' is in the local store and 'bar' isn't, which could lead to an incomplete requisite list. * guix/scripts/size.scm (requisites*): Partition ITEMS according to 'valid-path?'. Use 'substitutable-requisites' only on invalid items. --- guix/scripts/size.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index f28832ce90..ea259f3758 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -29,6 +29,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-37) #:use-module (ice-9 match) @@ -119,10 +120,12 @@ substitutes." information available in the local store or using information about substitutes." (lambda (store) - (guard (c ((nix-protocol-error? c) - (values (substitutable-requisites store items) - store))) - (values (requisites store items) store)))) + (let-values (((local missing) + (partition (cut valid-path? store <>) items))) + (values (delete-duplicates + (append (requisites store local) + (substitutable-requisites store missing))) + store)))) (define (store-profile items) "Return as a monadic value a list of objects representing the From de30a6e0f0c5fdb27dfac5460e8efda1408667a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 29 Jul 2016 16:02:45 -0400 Subject: [PATCH 6/7] gnu: protobuf: Update to 2.6.1. * gnu/packages/protobuf.scm (protobuf): Update to 2.6.1. [source]: Update to new upstream URL. --- gnu/packages/protobuf.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 86c418bb05..e1a3d8a6f1 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -32,14 +32,15 @@ (define-public protobuf (package (name "protobuf") - (version "2.5.0") + (version "2.6.1") (source (origin (method url-fetch) - (uri (string-append "http://protobuf.googlecode.com/files/protobuf-" + (uri (string-append "https://github.com/google/protobuf/releases/" + "download/v" version "/protobuf-" version ".tar.bz2")) (sha256 (base32 - "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk")))) + "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) (home-page "http://code.google.com/p/protobuf/") From 9bdf56dc1349d1759fc670ff8715de25de0f0a9c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 29 Jul 2016 15:58:06 -0400 Subject: [PATCH 7/7] gnu: gd: Add fix for gd2_read test. * gnu/packages/patches/gd-fix-gd2-read-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gd.scm (gd)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/gd.scm | 3 ++- gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gd-fix-gd2-read-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index a0d9b8fe11..473197078d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -514,6 +514,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ + %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \ %D%/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 153e1c7f8b..b1bbc22cd7 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -50,7 +50,8 @@ (sha256 (base32 "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl")) - (patches (search-patches "gd-fix-tests-on-i686.patch")))) + (patches (search-patches "gd-fix-gd2-read-test.patch" + "gd-fix-tests-on-i686.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gd-fix-gd2-read-test.patch b/gnu/packages/patches/gd-fix-gd2-read-test.patch new file mode 100644 index 0000000000..65f39e4426 --- /dev/null +++ b/gnu/packages/patches/gd-fix-gd2-read-test.patch @@ -0,0 +1,14 @@ +Fix a 'maybe-uninitialized' warning (turned error) +which occurs on non-Intel platforms. + +--- libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-21 01:21:16.000000000 -0400 ++++ libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-29 15:52:03.806405312 -0400 +@@ -5,7 +5,7 @@ + + int main(int argc, char *argv[]) + { +- int error, i = 0; ++ int error = 0, i = 0; + gdImagePtr im, exp; + FILE *fp; + char *path[] = {