From 737397355cfcf604c8f72fa1ef8c8e321221a6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 24 May 2017 10:51:34 +0200 Subject: [PATCH 01/25] publish: Do not bake the same item several times. Before this patch, there was a possibility that we'd queue several baking tasks for the same item. The first one would bake the item but subsequent tasks wouldn't check whether the item had been baked in the meantime and would re-bake it. * guix/scripts/publish.scm (render-narinfo/cached): Don't call 'bake-narinfo+nar' when (file-exists? cached). --- guix/scripts/publish.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index db7f6a957e..c306b809a7 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -425,11 +425,13 @@ requested using POOL." ;; return 404. (eventually pool (single-baker item - ;; (format #t "baking ~s~%" item) - (bake-narinfo+nar cache item - #:ttl ttl - #:compression compression - #:nar-path nar-path)) + ;; Check whether CACHED has been produced in the meantime. + (unless (file-exists? cached) + ;; (format #t "baking ~s~%" item) + (bake-narinfo+nar cache item + #:ttl ttl + #:compression compression + #:nar-path nar-path))) (when ttl (single-baker 'cache-cleanup From 3015d4556f18e9f3b79b8079f6cfef17ebe22ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Miguel=20S=C3=A1nchez=20Garc=C3=ADa?= Date: Tue, 23 May 2017 17:53:11 +0200 Subject: [PATCH 02/25] gnu: python-cairocffi: Update source and home-page URIs. * gnu/packages/python.scm (python-cairocffi)[source]: Update URI. [home-page]: Update URI. Signed-off-by: Arun Isaac --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 54dc493904..ecb037f338 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 José Miguel Sánchez García ;;; ;;; This file is part of GNU Guix. ;;; @@ -4772,7 +4773,7 @@ support for Python 3 and PyPy. It is based on cffi.") (origin (method url-fetch) ;; The archive on pypi is missing the 'utils' directory! - (uri (string-append "https://github.com/SimonSapin/cairocffi/archive/v" + (uri (string-append "https://github.com/Kozea/cairocffi/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -4811,7 +4812,7 @@ support for Python 3 and PyPy. It is based on cffi.") (system* "python" "setup.py" "build_sphinx") (copy-recursively "docs/_build/html" html) #t)))))) - (home-page "https://github.com/SimonSapin/cairocffi") + (home-page "https://github.com/Kozea/cairocffi") (synopsis "Python bindings and object-oriented API for Cairo") (description "Cairocffi is a CFFI-based drop-in replacement for Pycairo, a set of From 80f78e8f6fbe23d2b824a075db7e8d08999189e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Miguel=20S=C3=A1nchez=20Garc=C3=ADa?= Date: Tue, 23 May 2017 17:56:15 +0200 Subject: [PATCH 03/25] gnu: python-cairocffi: Update to 0.8.0. * gnu/packages/python.scm (python-cairocffi): Update to 0.8.0. Signed-off-by: Arun Isaac --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ecb037f338..d29a14c18a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4768,7 +4768,7 @@ support for Python 3 and PyPy. It is based on cffi.") (define-public python-cairocffi (package (name "python-cairocffi") - (version "0.6") + (version "0.8.0") (source (origin (method url-fetch) @@ -4778,7 +4778,7 @@ support for Python 3 and PyPy. It is based on cffi.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03w5p62sp3nqiccx864sbq0jvh7946277jqx3rcc3dch5xwfvv51")))) + "1rk2dvy3fxrga6bvvxc2fi5lbaynm5h4a0w0aaxyn3bc77rszjg9")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs From c4ec1ae010955e29c8a8dcdb99104b9239406610 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 May 2017 15:55:47 +0200 Subject: [PATCH 04/25] gnu: samba: Update to 4.6.4 [security fixes]. Fixes CVE-2017-7494. * gnu/packages/samba.scm (samba): Update to 4.6.4. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 623ef93a4e..b7f298d2be 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -147,14 +147,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.5.8") + (version "4.6.4") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "1w41pxszv5z6gjclg6zymn47mk8n51lnpgcx1k2q18i3i1nnafzn")))) + "0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija")))) (build-system gnu-build-system) (arguments '(#:phases From 460e72c7b7d8cfe866e3275f6c8e463d0ed6e55b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 May 2017 18:44:44 +0200 Subject: [PATCH 05/25] gnu: slop: Update to 5.3.38. * gnu/packages/xdisorg.scm (slop): Update to 5.3.38. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8d7f2195c2..73479581bb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -441,7 +441,7 @@ of the screen selected by mouse.") (define-public slop (package (name "slop") - (version "5.3.37") + (version "5.3.38") (source (origin (method url-fetch) (uri (string-append @@ -450,7 +450,7 @@ of the screen selected by mouse.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p2ih123zkj8rxz8acsxpaim1kq57f4rbq7zqsibafn5rkw5c5is")))) + "1gvsxzl4y4l7d5gvx24i0yxk3jxc1gnb48bjwvqmrh34gx974wn7")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target From 2133f193787c7ca0f5e18aee96657756c5fb1384 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 02:59:24 +0200 Subject: [PATCH 06/25] gnu: maim: Update to 5.4.62. * gnu/packages/xdisorg.scm (maim): Update to 5.4.62. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 73479581bb..980b6e8022 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -472,7 +472,7 @@ selection's dimensions to stdout.") (define-public maim (package (name "maim") - (version "4.4.62") + (version "5.4.62") (source (origin (method url-fetch) (uri (string-append @@ -481,7 +481,7 @@ selection's dimensions to stdout.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08lnbsl9ialqik1ris6piz1g0fgq4r3767ycr4nziphw3kz89vr1")))) + "084czvwcicl8apjlv729inxx8rpycra76ignfjmcbaq0hhn6ip6w")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target From 3c74a74ea2814bca25257f8211b8084a3cc1a3b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 17:45:05 +0200 Subject: [PATCH 07/25] gnu: glog: Update to 0.3.5. * gnu/packages/logging.scm (glog): Update to 0.3.5. [source]: Switch to tarball download. --- gnu/packages/logging.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 7501f1e5db..b2b0582aee 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -55,17 +55,15 @@ staying as close to their API as is reasonable.") (define-public glog (package (name "glog") - (version "0.3.4") + (version "0.3.5") (home-page "https://github.com/google/glog") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) (sha256 (base32 - "0ym5g15m7c8kjfr2c3zq6bz08ghin2d1r1nb6v2vnkfh1vn945x1")) - (file-name (string-append name "-" version "-checkout")) + "1q6ihk2asbx95a56kmyqwysq1x3grrw9jwqllafaidf0l84f903m")) + (file-name (string-append name "-" version ".tar.gz")) (patches (search-patches "glog-gcc-5-demangling.patch")))) (build-system gnu-build-system) (native-inputs From 47b93ae5bf6cc47d8fecbe56f54018d61c7b10ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:56:19 +0200 Subject: [PATCH 08/25] gnu: libgnomekbd: Update to 3.22.0.1. * gnu/packages/gnome.scm (libgnomekbd): Update to 3.22.0.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e81a3f0883..e2397d6da5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5824,7 +5824,7 @@ GLib/GObject code.") (define-public libgnomekbd (package (name "libgnomekbd") - (version "3.22.0") + (version "3.22.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5832,7 +5832,7 @@ GLib/GObject code.") name "-" version ".tar.xz")) (sha256 (base32 - "1pvpbljvxc0riamraiflnm05dpb6i4vlmqqgdh74xggbpzd302rl")))) + "1plkkack6s8b21gcmmly0lapgcjz53dmw2vixnn4rw4jxjwbdzaf")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 4063a40a4b0d50061798c783edac29b2548f37c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:53:45 +0200 Subject: [PATCH 09/25] gnu: gnome-autoar: Update to 0.2.2. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.2.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e2397d6da5..df01c70671 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5124,7 +5124,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.1.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5132,7 +5132,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") name "-" version ".tar.xz")) (sha256 (base32 - "1jcs6jgysg9n3zi3d1l4iqddzmczfdcvz7vkxn607p32nl8bhp7n")))) + "0qnafiwgajsaryh669lfclb4f6z5n1r9r4zhig1ha0ykxq32rzp1")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gnome-common" ,gnome-common) From 0ef48cd99e79054c987e04e8fb9c8c4fefb6fbc0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:54:09 +0200 Subject: [PATCH 10/25] gnu: tracker: Update to 1.12.0. * gnu/packages/gnome.scm (tracker): Update to 1.12.0. [inputs]: Add JSON-GLIB and LIBSOUP. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index df01c70671..94ea921b92 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5153,7 +5153,7 @@ easy, safe, and automatic.") (define-public tracker (package (name "tracker") - (version "1.10.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5161,7 +5161,7 @@ easy, safe, and automatic.") name "-" version ".tar.xz")) (sha256 (base32 - "03ch3ndmxghfr9wnw9hfmpkjfa7k5v5cwwf3y1ja6ihk3c5avgbb")))) + "0vsrzzkcfvmylhpk1ww6xdx8z9sgjs0gn74gz82qngjyq3c3s6c3")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gnome-common" ,gnome-common) @@ -5188,13 +5188,14 @@ easy, safe, and automatic.") ("exempi" ,exempi) ("libxml2" ,libxml2) ("upower" ,upower) - ("libgee" ,libgee) ("libunistring" ,libunistring) ("giflib" ,giflib) + ("json-glib" ,json-glib) ("openjpeg" ,openjpeg-1) ("libosinfo" ,libosinfo) ("libcue" ,libcue) ("libseccomp" ,libseccomp) + ("libsoup" ,libsoup) ("libuuid" ,util-linux))) (arguments `(#:tests? #f)) ; XXX FIXME enable tests (some fail) (synopsis "Metadata database, indexer and search tool") From 6206db897b6a4baacadc9d2ddd18bb6f13fb9d3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:46:31 +0200 Subject: [PATCH 11/25] gnu: libgtop: Update to 2.36.0. * gnu/packages/gnome.scm (libgtop): Update to 2.36.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 94ea921b92..bda4cab239 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4872,7 +4872,7 @@ providing graphical log-ins and managing local and remote displays.") (define-public libgtop (package (name "libgtop") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4880,7 +4880,7 @@ providing graphical log-ins and managing local and remote displays.") name "-" version ".tar.xz")) (sha256 (base32 - "1qh9srg8pqmrsl12mwnclncs7agmjjvx3q6v5qwqvcb2cskpi6f8")))) + "0ax17c7nplghxgsf8zl92nmhkbnggj62wwzl7nq00aqb2m6f7gqk")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) From afd8e16b150d0d0f6f78e42e48e5cd33be125a32 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:43:32 +0200 Subject: [PATCH 12/25] gnu: libgee: Update to 0.20.0. * gnu/packages/gnome.scm (libgee): Update to 0.20.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bda4cab239..2ad22748ce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3947,7 +3947,7 @@ wraps things up in a developer-friendly way.") (define-public libgee (package (name "libgee") - (version "0.18.1") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3955,7 +3955,7 @@ wraps things up in a developer-friendly way.") name "-" version ".tar.xz")) (sha256 (base32 - "18ir5264bhdg76kcjn8i5bfs1vz89qqn2py20aavm2cwbaz6ns4r")))) + "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11")))) (build-system gnu-build-system) (arguments `(#:phases From 356f0cef4bf231266d51108a3740b1d2b4ecd675 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:41:18 +0200 Subject: [PATCH 13/25] gnu: libchamplain: Update to 0.12.15. * gnu/packages/gnome.scm (libchamplain): Update to 0.12.15. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2ad22748ce..bc81cf2e50 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3100,7 +3100,7 @@ GL based interactive canvas library.") (define-public libchamplain (package (name "libchamplain") - (version "0.12.14") + (version "0.12.15") (source (origin (method url-fetch) (uri (string-append @@ -3108,7 +3108,7 @@ GL based interactive canvas library.") version ".tar.xz")) (sha256 (base32 - "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi")))) + "0x5qa1aw1y59lzkmf4j4szspn49341a87vcja4ydgxny1chilwjl")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-vala"))) (native-inputs From 6a88e4ee64433386dcd5ee9bf8ca00e0e1a9e87e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:40:28 +0200 Subject: [PATCH 14/25] gnu: clutter: Update to 1.26.2. * gnu/packages/gnome.scm (clutter): Update to 1.26.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc81cf2e50..936d03745e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2985,7 +2985,7 @@ without stepping on each others toes.") (define-public clutter (package (name "clutter") - (version "1.26.0") + (version "1.26.2") (source (origin (method url-fetch) @@ -2994,7 +2994,7 @@ without stepping on each others toes.") name "-" version ".tar.xz")) (sha256 (base32 - "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7")))) + "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7")))) ;; NOTE: mutter exports a bundled fork of clutter, so when making changes ;; to clutter, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) From 8773600542b6bb86e194010a7daf4c540858e5fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:40:49 +0200 Subject: [PATCH 15/25] gnu: clutter-gst: Update to 3.0.24. * gnu/packages/gnome.scm (clutter-gst): Update to 3.0.24. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 936d03745e..973b08b215 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3069,7 +3069,7 @@ presentations, kiosk style applications and so on.") (define-public clutter-gst (package (name "clutter-gst") - (version "3.0.22") + (version "3.0.24") (source (origin (method url-fetch) @@ -3078,7 +3078,7 @@ presentations, kiosk style applications and so on.") name "-" version ".tar.xz")) (sha256 (base32 - "1m6zwc7xr7lmbwiqav961g7jhc7gp5gb73dm6j93szpa6bxmgz7i")))) + "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums From 0b7b8fb0456475374de24b6302a6ce3cc5921ed0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:36:24 +0200 Subject: [PATCH 16/25] gnu: gnome-themes-standard: Update to 3.22.3. * gnu/packages/gnome.scm (gnome-themes-standard): Update to 3.22.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 973b08b215..68183eb553 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1757,7 +1757,7 @@ engineering.") (define-public gnome-themes-standard (package (name "gnome-themes-standard") - (version "3.22.2") + (version "3.22.3") (source (origin (method url-fetch) @@ -1766,7 +1766,7 @@ engineering.") version ".tar.xz")) (sha256 (base32 - "19bxw69ms46px5xgvwbjlhq2vkmrqfx2az49q63w2wxqb76icidk")))) + "0smmiamrgcgf5sa88bsn8hwmvsyx4gczzs359nwxbkv14b2qgp31")))) (build-system gnu-build-system) (arguments '(#:configure-flags From ff7da7e04d4dde9d90c70f1e986c2485df364f7a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 May 2017 16:32:09 -0400 Subject: [PATCH 17/25] gnu: asn1c: Update to 0.9.28. * gnu/packages/tls.scm (asn1c): Update to 0.9.28. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ebf9a47302..d50534081c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -75,14 +75,14 @@ specifications.") (define-public asn1c (package (name "asn1c") - (version "0.9.27") + (version "0.9.28") (source (origin (method url-fetch) (uri (string-append "https://lionet.info/soft/asn1c-" version ".tar.gz")) (sha256 (base32 - "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2")))) + "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) From 37c04f9184e05bfe6b0c7ddbb43724c8cc78d2c0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 May 2017 15:44:24 -0400 Subject: [PATCH 18/25] gnu: python-idna: Update to 2.5. * gnu/packages/python.scm (python-idna, python2-idna): Update to 2.5. [source]: Use pypi-uri. --- gnu/packages/python.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d29a14c18a..8b56c2f9f9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7253,15 +7253,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.0") + (version "2.5") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/i/" - "idna/idna-" version ".tar.gz")) + (uri (pypi-uri "idna" version)) (sha256 (base32 - "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n")))) + "1ara12a7k2zc69msa0arrvw00gn61a6i6by01xb3lkkc0h4cxd9w")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") From 5e0ddfba7ca64b3be0b1537dc1b2d670e042764d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 May 2017 15:43:56 -0400 Subject: [PATCH 19/25] gnu: python-pyasn1: Update to 0.2.3. * gnu/packages/python.scm (python-pyasn1, python2-pyasn1): Update to 0.2.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8b56c2f9f9..dc1efd62a4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7155,14 +7155,14 @@ designed to efficiently cope with extremely large amounts of data.") (define-public python-pyasn1 (package (name "python-pyasn1") - (version "0.1.9") + (version "0.2.3") (source (origin (method url-fetch) (uri (pypi-uri "pyasn1" version)) (sha256 (base32 - "0zraxni14bqi20kr4bi6nwsh32aibz0fq0xaczfisw0zdpcsqg45")))) + "1b86yx23c1x74clai05a5ma8c8nfmhlx3j1mxq0ff657i2ylx33k")))) (build-system python-build-system) (home-page "http://pyasn1.sourceforge.net/") (synopsis "ASN.1 types and codecs") From 09a1a6e111f3ac9d51f46c7d3b265e6dacae3dfd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 May 2017 22:45:15 +0200 Subject: [PATCH 20/25] gnu: qtractor: Update to 0.8.2. * gnu/packages/music.scm (qtractor): Update to 0.8.2. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5c0be39c27..58ad91f714 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1883,14 +1883,14 @@ computer's keyboard.") (define-public qtractor (package (name "qtractor") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1pvs9r5ykfaci900p0kz2xc5xsrswnwwbcl2chsvd98f1ns4vwds")))) + "0sp7r9n926ggdn285l4xzvw558jz1440n7kn2f1qs6w6h6l0f1q3")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target (inputs From 523544d3d16908bf00f08eef27769d0186bf0ee3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 May 2017 22:45:42 +0200 Subject: [PATCH 21/25] gnu: qtractor: Use modular Qt. * gnu/packages/music.scm (qtractor)[inputs]: Remove qt, add qtbase and qtx11extras. [native-inputs]: Add qttools. --- gnu/packages/music.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 58ad91f714..186dc276be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1894,7 +1894,8 @@ computer's keyboard.") (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target (inputs - `(("qt" ,qt) + `(("qt" ,qtbase) + ("qtx11extras" ,qtx11extras) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("libsndfile" ,libsndfile) @@ -1909,7 +1910,8 @@ computer's keyboard.") ("liblo" ,liblo) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (home-page "http://qtractor.org/") (synopsis "Audio/MIDI multi-track sequencer") (description From 9f64f7e6318e4ddd7e048844d377673b7c08191e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 May 2017 22:46:44 +0200 Subject: [PATCH 22/25] gnu: suil: Use qtbase instead of qt-4. * gnu/packages/audio.scm (suil)[inputs]: Replace qt-4 with qtbase. [arguments]: Add configure flags that are needed for qtbase. --- gnu/packages/audio.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 497f20538d..dc668ce131 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2054,11 +2054,14 @@ the Turtle syntax.") (base32 "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf")))) (build-system waf-build-system) - (arguments `(#:tests? #f)) ; no check target + (arguments + `(#:tests? #f ; no check target + #:configure-flags + '("CXXFLAGS=-std=gnu++11"))) (inputs `(("lv2" ,lv2) ("gtk+-2" ,gtk+-2) - ("qt-4" ,qt-4))) + ("qt" ,qtbase))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://drobilla.net/software/suil/") From 4febd4b0f4fc99eb9357180166764febc410812e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 May 2017 17:04:39 +0200 Subject: [PATCH 23/25] gnu: sane-backends-minimal, sane-backends: Update to 1.0.27. * gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.27. [source]: Use (what should be) a more stable download URI. --- gnu/packages/scanner.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 7bdbf35f05..ff3e37f46c 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -31,15 +31,15 @@ (define-public sane-backends-minimal (package (name "sane-backends-minimal") - (version "1.0.25") + (version "1.0.27") (source (origin (method url-fetch) (uri (string-append - "https://alioth.debian.org/frs/download.php/file/4146/" + "https://alioth.debian.org/frs/download.php/latestfile/176/" "sane-backends-" version ".tar.gz")) (sha256 (base32 - "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4")) + "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a From 4ed390a0e7fc468303c07d6efebc54c80b2369c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 May 2017 17:08:22 +0200 Subject: [PATCH 24/25] gnu: sane-backends-minimal: Run most tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scanner.scm (sane-backends-minimal)[arguments]: Add a ‘disable-failing-tests’ phase to do just that, and run the rest. --- gnu/packages/scanner.scm | 45 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index ff3e37f46c..f44f037efb 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2016 Andy Patterson +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,32 +54,34 @@ (inputs `(("libusb-compat" ,libusb-compat))) (arguments - `(#:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") #t)) - (add-after - 'install 'install-udev-rules - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib/udev/rules.d")) - (copy-file "tools/udev/libsane.rules" - (string-append out - "/lib/udev/rules.d/" - "60-libsane.rules")))))))) - ;; It would seem that tests are not maintained - fails with - ;; the following: - ;; - ;; < This page was last updated on Wed Jul 31 07:52:48 2013 - ;; < by sane-desc 3.5 from sane-backends 1.0.24git - ;; --- - ;; > This page was last updated on Sun Oct 19 15:41:39 2014 - ;; > by sane-desc 3.5 from sane-backends 1.0.24 - ;; **** File generated for html-backends-split mode is different from reference - ;; Makefile:501: recipe for target 'check.local' failed + ;; Disable unmaintained tests that that fail with errors resembling: + ;; + ;; < # by sane-desc 3.5 from sane-backends 1.0.24git on Jul 31 2013 + ;; --- + ;; > # by sane-desc 3.5 from sane-backends 1.0.27 on 1970-01-01# + ;; FAIL: sane-desc -m usermap -s ./data + (add-before 'configure 'disable-failing-tests + (lambda _ + (for-each + (lambda (pattern) + (substitute* "testsuite/tools/Makefile.in" + (((string-append " " pattern " ")) " "))) + (list "usermap" "db" "udev" "udev\\+acl" "udev\\+hwdb" "hwdb")) + #t)) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib/udev/rules.d")) + (copy-file "tools/udev/libsane.rules" + (string-append out + "/lib/udev/rules.d/" + "60-libsane.rules")))))))) (home-page "http://www.sane-project.org") (synopsis "Raster image scanner library and drivers, without scanner support") From ff51a87cae360334ed42c79c3e4e46fb7c121eb2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 May 2017 16:25:54 -0400 Subject: [PATCH 25/25] gnu: libtasn1: Fix CVE-2017-6891. * gnu/packages/patches/libtasn1-CVE-2017-6891.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/tls.scm (libtasn1)[replacement]: New field. (libtasn1/fixed): New variable. --- gnu/local.mk | 3 +- .../patches/libtasn1-CVE-2017-6891.patch | 51 +++++++++++++++++++ gnu/packages/tls.scm | 10 ++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtasn1-CVE-2017-6891.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b80fde9d..178ad35482 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -744,7 +744,8 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ - %D%/packages/patches/libtar-CVE-2013-4420.patch \ + %D%/packages/patches/libtar-CVE-2013-4420.patch \ + %D%/packages/patches/libtasn1-CVE-2017-6891.patch \ %D%/packages/patches/libtheora-config-guess.patch \ %D%/packages/patches/libtiff-CVE-2016-10092.patch \ %D%/packages/patches/libtiff-CVE-2016-10093.patch \ diff --git a/gnu/packages/patches/libtasn1-CVE-2017-6891.patch b/gnu/packages/patches/libtasn1-CVE-2017-6891.patch new file mode 100644 index 0000000000..1f847ed025 --- /dev/null +++ b/gnu/packages/patches/libtasn1-CVE-2017-6891.patch @@ -0,0 +1,51 @@ +Fix CVE-2017-6891: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6891 + +Patch copied from upstream source repository: + +https://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=5520704d075802df25ce4ffccc010ba1641bd484 + +From 5520704d075802df25ce4ffccc010ba1641bd484 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Thu, 18 May 2017 18:03:34 +0200 +Subject: [PATCH] asn1_find_node: added safety check on asn1_find_node() + +This prevents a stack overflow in asn1_find_node() which +is triggered by too long variable names in the definitions +files. That means that applications have to deliberately +pass a too long 'name' constant to asn1_write_value() +and friends. Reported by Jakub Jirasek. + +Signed-off-by: Nikos Mavrogiannopoulos +--- + lib/parser_aux.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lib/parser_aux.c b/lib/parser_aux.c +index b4a7370..976ab38 100644 +--- a/lib/parser_aux.c ++++ b/lib/parser_aux.c +@@ -120,6 +120,9 @@ asn1_find_node (asn1_node pointer, const char *name) + if (n_end) + { + nsize = n_end - n_start; ++ if (nsize >= sizeof(n)) ++ return NULL; ++ + memcpy (n, n_start, nsize); + n[nsize] = 0; + n_start = n_end; +@@ -158,6 +161,9 @@ asn1_find_node (asn1_node pointer, const char *name) + if (n_end) + { + nsize = n_end - n_start; ++ if (nsize >= sizeof(n)) ++ return NULL; ++ + memcpy (n, n_start, nsize); + n[nsize] = 0; + n_start = n_end; +-- +2.13.0 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d50534081c..9f8c070a53 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -52,6 +52,7 @@ (define-public libtasn1 (package (name "libtasn1") + (replacement libtasn1/fixed) (version "4.10") (source (origin @@ -72,6 +73,15 @@ networking, allowing for formal validation of data according to some specifications.") (license license:lgpl2.0+))) +(define libtasn1/fixed + (package + (inherit libtasn1) + (source + (origin + (inherit (package-source libtasn1)) + (patches + (search-patches "libtasn1-CVE-2017-6891.patch")))))) + (define-public asn1c (package (name "asn1c")