From e0288fd80d080d7173d227976e1ce3526c1cc995 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:24:38 +0100 Subject: gnu: cups-filters: Update to 1.25.13. * gnu/packages/cups.scm (cups-filters): Update to 1.25.13. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 1f8e7bd179..4e4d4727c3 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.25.11") + (version "1.25.13") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh")) + "1z3b7p6pp6yzvzl2nip9q0gn4fr5k9qwpnnhqqkiaaf3b1nfswjj")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From ed530aeb71dec4c77d3686438a83b5565654336c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:25:02 +0100 Subject: gnu: imagemagick: Update to 6.9.10-78. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-78. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 74fbf9158a..6e10c323e8 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-68") + (version "6.9.10-78") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1jxjxhnvznpbdigry2cgxx94cx6k6y3rs40a464n5yln29s1qlz1")))) + "178sai7r0w2hwv01is25c8mxf9lc2ba0l16qm45h9vv49y5dy08q")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From db942cdaff1b63ce945bc471f16ea7d3a23ddc65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:25:29 +0100 Subject: gnu: qpdf: Update to 9.1.0. * gnu/packages/pdf.scm (qpdf): Update to 9.1.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ebe0168ff2..3b6829c4bc 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -670,14 +670,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "9.0.1") + (version "9.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495")) + "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove -- cgit v1.2.3 From bb14766e757928f922efd9fbbb758f0e36b67adf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:26:06 +0100 Subject: gnu: libdrm: Update to 2.4.100. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.100. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b1759eabb2..8e53afeb3f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -421,7 +421,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.99") + (version "2.4.100") (source (origin (method url-fetch) @@ -431,7 +431,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd")) + "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 8d9d6adbab6cb21b44f86ab445ad60f8c115249b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:26:32 +0100 Subject: gnu: libepoxy: Update to 1.5.4. * gnu/packages/gl.scm (libepoxy): Update to 1.5.4. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 63e12efe06..a1350be26a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -604,7 +604,7 @@ OpenGL graphics API.") (define-public libepoxy (package (name "libepoxy") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append @@ -612,7 +612,7 @@ OpenGL graphics API.") version "/libepoxy-" version ".tar.xz")) (sha256 (base32 - "0ga3qjv50x37my6pw5xr14g5n6z78hy5s8s06kays8c3ab2mha80")))) + "1ll9fach4v30dsyd47s5ial4gaiwihzr2afb77vxxzzy3mlcrlhb")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 91304b79453440a90c366cb667a19d91eb5752e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:27:31 +0100 Subject: gnu: mesa: Update to 19.2.7. * gnu/packages/patches/mesa-timespec-test-32bit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gl.scm (mesa): Update to 19.2.7. [source](patches): Remove obsolete. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 7 +++---- gnu/packages/patches/mesa-timespec-test-32bit.patch | 17 ----------------- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/mesa-timespec-test-32bit.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0faa0ba07c..a76f222abd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1136,7 +1136,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mes-remove-store-name.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ - %D%/packages/patches/mesa-timespec-test-32bit.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a1350be26a..6423a61f34 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.2.1") + (version "19.2.7") (source (origin (method url-fetch) @@ -241,10 +241,9 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) + "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3")) (patches - (search-patches "mesa-skip-disk-cache-test.patch" - "mesa-timespec-test-32bit.patch")))) + (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-timespec-test-32bit.patch b/gnu/packages/patches/mesa-timespec-test-32bit.patch deleted file mode 100644 index 3e4890f3a4..0000000000 --- a/gnu/packages/patches/mesa-timespec-test-32bit.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix a test failure on 32-bit systems. - -Taken from upstream: -https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef - -diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp ---- a/src/util/tests/timespec/timespec_test.cpp -+++ b/src/util/tests/timespec/timespec_test.cpp -@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec) - - timespec_from_nsec(&a, UINT64_MAX); - EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC); -- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC); -+ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC)); - } - - TEST(timespec_test, timespec_from_usec) -- cgit v1.2.3 From 70255a1ac267d25734b49676a053630e5e645c84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:28:26 +0100 Subject: gnu: libinput: Update to 1.14.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.14.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f911340858..379f96da0a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -155,14 +155,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.14.1") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3")))) + "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From b7d8856a7f24e8d99ef48933393cdcc0b787cf80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:28:45 +0100 Subject: gnu: gtk+: Update to 3.24.13. * gnu/packages/gtk.scm (gtk+): Update to 3.24.13. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 777601ed97..3ef61c9b4a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -722,7 +722,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.12") + (version "3.24.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -730,7 +730,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k")) + "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From ed05d6b242f00ae3da2405fffe2fe2a85dc8d0d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:14 +0100 Subject: gnu: eudev: Update to 3.2.9. * gnu/packages/linux.scm (eudev): Update to 3.2.9. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 383698b400..1565677a70 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2628,7 +2628,7 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.8") + (version "3.2.9") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -2636,7 +2636,7 @@ from the module-init-tools project.") (file-name (git-file-name name version)) (sha256 (base32 - "1g95yzzx4qxm5qhhylbi930lrq4gsbz207n72018nkvswj6gmpjw")) + "1g9z3d33m0i3hmbhm0wxpvkzf6ac7xj1drwcfrhzlfhhi63sg9h7")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 049e4501623c6bcc19b31c48edc4e710faa61ae7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:38 +0100 Subject: gnu: bluez: Update to 5.52. * gnu/packages/linux.scm (bluez): Update to 5.52. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1565677a70..8879112357 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3750,7 +3750,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.51") + (version "5.52") (source (origin (method url-fetch) (uri (string-append @@ -3758,7 +3758,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb")))) + "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 3a24bf3a2a7fc89c04dba4c74419e9183e509eb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:58 +0100 Subject: gnu: libxkbcommon: Update to 0.9.1. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.9.1. [build-system]: Change to MESON-BUILD-SYSTEM. [inputs]: Add WAYLAND and WAYLAND-PROTOCOLS. [native-inputs]: Add DOXYGEN. [arguments]: Adjust #:configure-flags for Meson. --- gnu/packages/xdisorg.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8e53afeb3f..f82bd9e1e8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -261,28 +261,31 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.8.4") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0")))) - (build-system gnu-build-system) + "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl")))) + (build-system meson-build-system) (inputs `(("libx11" ,libx11) ("libxcb" ,libxcb) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) ("xkeyboard-config" ,xkeyboard-config))) (native-inputs `(("bison" ,bison) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - (list (string-append "--with-xkb-config-root=" + (list (string-append "-Dxkb-config-root=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") - (string-append "--with-x-locale-root=" + (string-append "-Dx-locale-root=" (assoc-ref %build-inputs "libx11") "/share/X11/locale")))) (home-page "https://xkbcommon.org/") -- cgit v1.2.3 From ddf31e9a49dffab297946f15cc8625a8984845cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:31:03 +0100 Subject: gnu: ALSA: Update to 1.2.1. * gnu/packages/linux.scm (alsa-lib): Update to 1.2.1.2. [arguments]: New field. (alsa-utils): Update to 1.2.1. (alsa-plugins): Likewise. --- gnu/packages/linux.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8879112357..96e15ebaac 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1534,7 +1534,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.9") + (version "1.2.1.2") (source (origin (method url-fetch) (uri (string-append @@ -1542,8 +1542,12 @@ intercept and print the system calls executed by the program.") version ".tar.bz2")) (sha256 (base32 - "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8")))) + "0hvrx0ipzqbcx4y1cmr9bgm9niifzkrhsb1ddgzzdwbk6q72d3lm")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")))) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") (description @@ -1554,14 +1558,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.9") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx")))) + "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -1608,14 +1612,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.9") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn")))) + "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. -- cgit v1.2.3 From ab0cb26f1a068a8ff31f058f01f25f8d51729cf2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:05 +0100 Subject: gnu: MariaDB: Update to 10.1.43. * gnu/packages/databases.scm (mariadb): Update to 10.1.43. [arguments]: Disable new test. [inputs]: Add LINUX-PAM. --- gnu/packages/databases.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cb843672af..581f7b79a5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -686,7 +686,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.41") + (version "10.1.43") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -694,7 +694,7 @@ Language.") version ".tar.gz")) (sha256 (base32 - "1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb")) + "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -815,6 +815,12 @@ Language.") disabled-tests) (close-port unstable-tests) + ;; XXX: This test fails because it expects a latin1 charset and + ;; collation. See . + (substitute* "mysql-test/r/gis_notembedded.result" + (("latin1_swedish_ci") "utf8_general_ci") + (("\tlatin1") "\tutf8")) + (substitute* "mysql-test/mysql-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh"))) @@ -883,6 +889,7 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) -- cgit v1.2.3 From cb669c095156eef44c1ae8aecda9931a777794ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:24 +0100 Subject: gnu: postgresql@10: Update to 10.11. * gnu/packages/databases.scm (postgresql): Update to 10.11. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 581f7b79a5..23c5ed32e0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -910,14 +910,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.10") + (version "10.11") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd")) + "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 99732a8f2286782f6e89280c0b398764aac5b31e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:05:49 +0100 Subject: gnu: orc: Update to 0.4.31. * gnu/packages/patches/orc-typedef-enum.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gstreamer.scm (orc): Update to 0.4.31. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/gstreamer.scm | 5 ++--- gnu/packages/patches/orc-typedef-enum.patch | 17 ----------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/orc-typedef-enum.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a76f222abd..21102514a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1212,7 +1212,6 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/openssl-CVE-2019-1559.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ - %D%/packages/patches/orc-typedef-enum.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 51b9d8f11c..bed9e36ce6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -69,15 +69,14 @@ (define-public orc (package (name "orc") - (version "0.4.30") + (version "0.4.31") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/data/src/" "orc/orc-" version ".tar.xz")) - (patches (search-patches "orc-typedef-enum.patch")) (sha256 (base32 - "0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds")))) + "0xb0c7q3xv1ldmz5ipybazb01gy3cijj8622dcx7rbm9lq85zax0")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/orc-typedef-enum.patch b/gnu/packages/patches/orc-typedef-enum.patch deleted file mode 100644 index 207bf32ba9..0000000000 --- a/gnu/packages/patches/orc-typedef-enum.patch +++ /dev/null @@ -1,17 +0,0 @@ -Orc 0.4.30 has a bug that causes duplicate symbols due to a missing typedef. - -Taken from upstream: -https://gitlab.freedesktop.org/gstreamer/orc/merge_requests/32 - -diff --git a/orc/orctarget.h b/orc/orctarget.h ---- a/orc/orctarget.h -+++ b/orc/orctarget.h -@@ -19,7 +19,7 @@ enum { - ORC_TARGET_FAST_DENORMAL = (1<<31) - }; - --enum { -+typedef enum { - ORC_TARGET_POWERPC_64BIT = (1<<0), - ORC_TARGET_POWERPC_LE = (1<<1), - ORC_TARGET_POWERPC_ALTIVEC = (1<<2), -- cgit v1.2.3 From 94249ba89cba7d50d346cecc3df388d6dd59e482 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:07:53 +0100 Subject: gnu: gstreamer: Update to 1.16.2. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-ugly, gst-libav, python-gst): Update to 1.16.2. (gst-plugins-bad): Likewise. [arguments]: Remove #:make-flags. --- gnu/packages/gstreamer.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index bed9e36ce6..323e3ccfee 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -106,7 +106,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -115,7 +115,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882")))) + "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -154,7 +154,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -162,7 +162,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w")))) + "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -213,7 +213,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -222,7 +222,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz")))) + "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -276,23 +276,18 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n")))) + "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments '(#:tests? #f ; XXX: 13 of 53 tests fail - - ;; FIXME: OpenEXR 2.4.0 requires C++ 11 or later. Remove when the - ;; default compiler is >= GCC 5. - #:make-flags '("CXXFLAGS=-std=gnu++11") - #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") @@ -356,7 +351,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -364,7 +359,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab")))) + "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -391,7 +386,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append @@ -399,7 +394,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8")) + "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967")) (modules '((guix build utils))) (snippet '(begin @@ -427,7 +422,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append @@ -435,7 +430,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl")))) + "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From ed8adb2240202575deffce4065b67ed7903ea0c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:09:30 +0100 Subject: gnu: check: Update to 0.13.0. * gnu/packages/check.scm (check): Update to 0.13.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c0cb4ae7fd..a9b38f329d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -78,7 +78,7 @@ (define-public check (package (name "check") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ version "/check-" version ".tar.gz")) (sha256 (base32 - "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6")))) + "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4")))) (build-system gnu-build-system) (home-page "https://libcheck.github.io/check/") (synopsis "Unit test framework for C") -- cgit v1.2.3 From 0a2c10d5cc51b2b53fd5a129b52ab59506f3cb8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:00 +0100 Subject: gnu: nspr: Update to 4.24. * gnu/packages/nss.scm (nspr): Update to 4.24. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 65f95aaa8a..fe2f443721 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -34,7 +34,7 @@ (define-public nspr (package (name "nspr") - (version "4.22") + (version "4.24") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69")))) + "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 90076d2ce17d5b3c44ea663a44b40fa3084ead97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:22 +0100 Subject: gnu: nss: Update to 3.48. * gnu/packages/nss.scm (nss): Update to 3.48. --- gnu/packages/nss.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index fe2f443721..2e34f8e26f 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.46.1") + (version "3.48") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")) + "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" @@ -130,7 +130,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2019-10-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2019-12-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From b5414ff4dbfbf55d196471102de07f5d93f92a79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:43 +0100 Subject: gnu: python-sphinx: Update to 2.2.2. * gnu/packages/sphinx.scm (python-sphinx): Update to 2.2.2. --- gnu/packages/sphinx.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b74137362c..8075406c99 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -46,14 +46,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "2.2.0") + (version "2.2.2") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0ig8s94xg0p6h9y5s3ns9x8i10b24ihzvs65b5jwrhrgih7nnn0d")))) + "1wjcm382824rq8ijls9mlqwl2h8l26s201v5fwprhnins671m72m")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 336cf4e779b0903b76a8824075f30082f41aa4b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:12 +0100 Subject: gnu: atk: Update to 2.34.1. * gnu/packages/gtk.scm (atk): Update to 2.34.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3ef61c9b4a..a70a2a5650 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -89,7 +89,7 @@ (define-public atk (package (name "atk") - (version "2.32.0") + (version "2.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -97,7 +97,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb")))) + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l")))) (build-system meson-build-system) (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs -- cgit v1.2.3 From 4ebc3339ba7b9a66306810cebf496bf2ce9a32eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:33 +0100 Subject: gnu: at-spi2-core: Update to 2.34.0. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.34.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a70a2a5650..315cd18aba 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -552,7 +552,7 @@ in the GNOME project.") (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.32.1") + (version "2.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -560,7 +560,7 @@ in the GNOME project.") name "-" version ".tar.xz")) (sha256 (base32 - "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw")))) + "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 3d19c77d74d0d5b68e1265939c046f69915b699f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:52 +0100 Subject: gnu: at-spi2-atk: Update to 2.34.1. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.34.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 315cd18aba..db88c84413 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -621,7 +621,7 @@ is part of the GNOME accessibility project.") (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.32.0") + (version "2.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -629,7 +629,7 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b")))) + "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:19:23 +0100 Subject: gnu: MariaDB: Do not propagate OpenSSL. * gnu/packages/databases.scm (mariadb)[propagated-inputs]: Remove. [inputs]: Add OPENSSL-1.0. [arguments]: Add absolute references to OpenSSL in "post-install" phase. --- gnu/packages/databases.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 23c5ed32e0..0f04647a73 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -851,10 +851,11 @@ Language.") #t)) (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dev (assoc-ref outputs "dev")) - (lib (assoc-ref outputs "lib"))) + (lib (assoc-ref outputs "lib")) + (openssl (assoc-ref inputs "openssl"))) (substitute* (string-append out "/bin/mysql_install_db") (("basedir=\"\"") (string-append "basedir=\"" out "\""))) @@ -876,6 +877,14 @@ Language.") (string-append dev "/share/pkgconfig")) (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) + + ;; Embed an absolute reference to OpenSSL in mysql_config + ;; and the pkg-config file to avoid propagation. + (substitute* (list (string-append dev "/bin/mysql_config") + (string-append dev "/share/pkgconfig/mariadb.pc")) + (("-lssl -lcrypto" all) + (string-append "-L" openssl "/lib " all))) + #t)))))) (native-inputs `(("bison" ,bison) @@ -889,13 +898,11 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("openssl" ,openssl-1.0) ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) - (propagated-inputs - ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours -- cgit v1.2.3 From f8a8984c4b95538d027dd63e23d8340dfbea72e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 22:40:40 +0100 Subject: gnu: nss: Remove replacement package. The merge preceding this commit ignored the 'replacement' added to nss in commit 04b33ce205f38813b4dbd04b6ad3c7aa0be0b6f6, because the security fix is already present in NSS 3.48. This commit removes the remaining bits. * gnu/packages/patches/nss-CVE-2019-11745.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/nss.scm (nss/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/nss.scm | 8 -------- gnu/packages/patches/nss-CVE-2019-11745.patch | 24 ------------------------ 3 files changed, 33 deletions(-) delete mode 100644 gnu/packages/patches/nss-CVE-2019-11745.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4d89f17bbe..21102514a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1179,7 +1179,6 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nss-CVE-2019-11745.patch \ %D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e81c859a51..2e34f8e26f 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -183,11 +183,3 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) - -(define nss/fixed - (package - (inherit nss) - (source (origin - (inherit (package-source nss)) - (patches (append (search-patches "nss-CVE-2019-11745.patch") - (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/patches/nss-CVE-2019-11745.patch b/gnu/packages/patches/nss-CVE-2019-11745.patch deleted file mode 100644 index ae0eeda3c8..0000000000 --- a/gnu/packages/patches/nss-CVE-2019-11745.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix CVE-2019-11745 (Out-of-bounds write when passing an output buffer smaller -than the block size to NSC_EncryptUpdate). - -Copied from Debian, equivalent to upstream fix: -. - -# HG changeset patch -# User Craig Disselkoen -# Date 1574189697 25200 -# Node ID 60bca7c6dc6dc44579b9b3e0fb62ca3b82d92eec -# Parent 64e55c9f658e2a75f0835d00a8a1cdc2f25c74d6 -Bug 1586176 - EncryptUpdate should use maxout not block size. r=franziskus - ---- a/nss/lib/softoken/pkcs11c.c -+++ b/nss/lib/softoken/pkcs11c.c -@@ -1285,7 +1285,7 @@ NSC_EncryptUpdate(CK_SESSION_HANDLE hSes - } - /* encrypt the current padded data */ - rv = (*context->update)(context->cipherInfo, pEncryptedPart, -- &padoutlen, context->blockSize, context->padBuf, -+ &padoutlen, maxout, context->padBuf, - context->blockSize); - if (rv != SECSuccess) { - return sftk_MapCryptError(PORT_GetError()); -- cgit v1.2.3 From eccd2c14d6b42142e85ed517e8cfa81a73b6bd88 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:38:08 +0100 Subject: gnu: pcre2: Update to 10.34. * gnu/packages/patches/pcre2-fix-jit_match-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/pcre.scm (pcre2): Update to 10.34. [source](patches): Remove. --- gnu/local.mk | 1 - .../patches/pcre2-fix-jit_match-crash.patch | 25 ---------------------- gnu/packages/pcre.scm | 5 ++--- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/pcre2-fix-jit_match-crash.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 21102514a9..b1b5045469 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1222,7 +1222,6 @@ dist_patch_DATA = \ %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ diff --git a/gnu/packages/patches/pcre2-fix-jit_match-crash.patch b/gnu/packages/patches/pcre2-fix-jit_match-crash.patch deleted file mode 100644 index 7543319ee9..0000000000 --- a/gnu/packages/patches/pcre2-fix-jit_match-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Thu, 01 Aug 2019 21:12:52 +0200 -Subject: [PATCH] gnu: pcre2: Fix jit_match crash. - -Fixes , reported as a ‘secrity -problem’. - -Copied verbatim from upstream[0]. - -[0]: https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_jit_compile.c?view=patch&r1=1089&r2=1092&pathrev=1092 - ---- trunk/src/pcre2_jit_compile.c 2019/05/10 13:15:20 1089 -+++ trunk/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092 -@@ -8571,7 +8571,10 @@ - PCRE2_SPTR bptr; - uint32_t c; - --GETCHARINC(c, cc); -+/* Patch by PH */ -+/* GETCHARINC(c, cc); */ -+ -+c = *cc++; - #if PCRE2_CODE_UNIT_WIDTH == 32 - if (c >= 0x110000) - return NULL; diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 91c32d6e5d..560244619e 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,15 +89,14 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.33") + (version "10.34") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" version "/pcre2-" version ".tar.bz2")) - (patches (search-patches "pcre2-fix-jit_match-crash.patch")) (sha256 (base32 - "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m")))) + "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From f6943db7d39a060742b820e2f2f215b0bdeca690 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:39:01 +0100 Subject: gnu: pcre2: Do not build static libraries. * gnu/packages/pcre.scm (pcre2)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/pcre.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 560244619e..ea45a3d06b 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -108,7 +108,8 @@ POSIX regular expression API.") "--enable-pcre2test-libreadline" "--enable-pcre2-16" "--enable-pcre2-32" - "--enable-jit") + "--enable-jit" + "--disable-static") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths -- cgit v1.2.3 From 371d95ebc778b7a8fec2df06a4d7da96a1488bf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:56:48 +0100 Subject: gnu: libwebp: Do not build static libraries. * gnu/packages/image.scm (libwebp)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0536779b64..b0005bd817 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1128,7 +1128,8 @@ language bindings to VIGRA.") (arguments '(#:configure-flags '("--enable-libwebpmux" "--enable-libwebpdemux" - "--enable-libwebpdecoder"))) + "--enable-libwebpdecoder" + "--disable-static"))) (home-page "https://developers.google.com/speed/webp/") (synopsis "Lossless and lossy image compression") (description -- cgit v1.2.3 From e500b9d908220d4d104c42d85a3c4fc3c38b7bc2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:00:50 +0100 Subject: gnu: opus: Do not build static libraries. * gnu/packages/xiph.scm (opus)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 61d836a50b..1927da4c5b 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -352,6 +352,8 @@ ogginfo, to obtain information (tags, bitrate, length, etc.) about (base32 "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Versatile audio codec") (description "Opus is a totally open, royalty-free, highly versatile audio codec. Opus -- cgit v1.2.3 From 542432e8ff091be463f62a34e410b52481383287 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:01:32 +0100 Subject: gnu: libogg: Do not build static libraries. * gnu/packages/xiph.scm (libogg)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 1927da4c5b..8ffe2c327d 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -69,6 +69,8 @@ (base32 "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Library for manipulating the ogg multimedia format") (description "The libogg library allows to manipulate the ogg multimedia container -- cgit v1.2.3 From b134c7ba166b57ff56fbf144bf79b28ddace676f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:03:13 +0100 Subject: gnu: libvorbis: Do not build static libraries. * gnu/packages/xiph.scm (libvorbis)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/xiph.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8ffe2c327d..3489206dd8 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -95,7 +95,8 @@ periodic timestamps for seeking.") "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g")))) (build-system gnu-build-system) (propagated-inputs `(("libogg" ,libogg))) - (arguments `(#:configure-flags '("LDFLAGS=-lm") + (arguments `(#:configure-flags '("LDFLAGS=-lm" + "--disable-static") #:parallel-tests? #f)) (synopsis "Library implementing the vorbis audio format") (description -- cgit v1.2.3 From 5c1f02727e6e366cbdc2782ef2c80c857af33124 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:04:03 +0100 Subject: gnu: libtheora: Do not build static libraries. * gnu/packages/xiph.scm (libtheora)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 3489206dd8..f4c111164d 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -122,6 +122,8 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) (patches (search-patches "libtheora-config-guess.patch")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libvorbis" ,libvorbis))) ;; The .pc files refer to libogg. (propagated-inputs `(("libogg" ,libogg))) -- cgit v1.2.3 From 28b4ff244dfbf141a9aae4f1ddcc1021372d412f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:06:47 +0100 Subject: gnu: speexdsp: Do not build static libraries. * gnu/packages/xiph.scm (speexdsp)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xiph.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index f4c111164d..34ed5dcab2 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -179,7 +179,8 @@ stereo encoding, and voice activity detection.") "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '(,@(if (string=? "aarch64-linux" + `(#:configure-flags '("--disable-static" + ,@(if (string=? "aarch64-linux" (%current-system)) '("--enable-neon=no") ; neon defaults to armv7-a '())))) -- cgit v1.2.3 From 7711db7f4ec24015d7c2412ef1e624cbf8110ed3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Dec 2019 14:16:01 +0100 Subject: gnu: r-with-tests: Update to 3.6.2. * gnu/packages/statistics.scm (r-with-tests): Update to 3.6.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 81ff0107b4..c3054473a2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -183,7 +183,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "3.6.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -191,7 +191,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv")))) + "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3