ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
Marius Bakke 2020-01-07 17:43:20 +01:00
commit 6d15516dc6
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
21 changed files with 109 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/local.mk
View file

@ -1164,7 +1164,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 \
@ -1206,7 +1205,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 \
@ -1240,7 +1238,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 \
@ -1251,7 +1248,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 \

4
gnu/packages/check.scm
View file

@ -78,7 +78,7 @@ (define-module (gnu packages check)
(define-public check
(package
(name "check")
(version "0.12.0")
(version "0.13.0")
(source
(origin
(method url-fetch)
@ -86,7 +86,7 @@ (define-public check
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")

4
gnu/packages/cups.scm
View file

@ -58,7 +58,7 @@ (define-module (gnu packages cups)
(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 @@ (define-public cups-filters
"cups-filters-" version ".tar.xz"))
(sha256
(base32
"0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh"))
"1z3b7p6pp6yzvzl2nip9q0gn4fr5k9qwpnnhqqkiaaf3b1nfswjj"))
(modules '((guix build utils)))
(snippet
;; install backends, banners and filters to cups-filters output

32
gnu/packages/databases.scm
View file

@ -687,7 +687,7 @@ (define-public mysql
(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"
@ -695,7 +695,7 @@ (define-public mariadb
version ".tar.gz"))
(sha256
(base32
"1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb"))
"1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63"))
(patches (search-patches "mariadb-client-test-32bit.patch"))
(modules '((guix build utils)))
(snippet
@ -816,6 +816,12 @@ (define-public mariadb
disabled-tests)
(close-port unstable-tests)
;; XXX: This test fails because it expects a latin1 charset and
;; collation. See <https://jira.mariadb.org/browse/MDEV-21264>.
(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")))
@ -846,10 +852,11 @@ (define-public mariadb
#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 "\"")))
@ -871,6 +878,14 @@ (define-public mariadb
(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)
@ -884,12 +899,11 @@ (define-public mariadb
("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
@ -931,14 +945,14 @@ (define-public mariadb/fixed-install-db
(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

4
gnu/packages/freedesktop.scm
View file

@ -155,14 +155,14 @@ (define-public xdg-utils
(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")

11
gnu/packages/gl.scm
View file

@ -230,7 +230,7 @@ (define libva-without-mesa
(define-public mesa
(package
(name "mesa")
(version "19.2.1")
(version "19.2.7")
(source
(origin
(method url-fetch)
@ -242,10 +242,9 @@ (define-public 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.
@ -605,7 +604,7 @@ (define (dynamic-link-substitute file lib input)
(define-public libepoxy
(package
(name "libepoxy")
(version "1.5.3")
(version "1.5.4")
(source (origin
(method url-fetch)
(uri (string-append
@ -613,7 +612,7 @@ (define-public libepoxy
version "/libepoxy-" version ".tar.xz"))
(sha256
(base32
"0ga3qjv50x37my6pw5xr14g5n6z78hy5s8s06kays8c3ab2mha80"))))
"1ll9fach4v30dsyd47s5ial4gaiwihzr2afb77vxxzzy3mlcrlhb"))))
(arguments
`(#:phases
(modify-phases %standard-phases

38
gnu/packages/gstreamer.scm
View file

@ -69,15 +69,14 @@ (define-module (gnu packages gstreamer)
(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
@ -107,7 +106,7 @@ (define-public orc
(define-public gstreamer
(package
(name "gstreamer")
(version "1.16.1")
(version "1.16.2")
(source
(origin
(method url-fetch)
@ -116,7 +115,7 @@ (define-public gstreamer
version ".tar.xz"))
(sha256
(base32
"0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"))))
"0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments
@ -155,7 +154,7 @@ (define-public gstreamer
(define-public gst-plugins-base
(package
(name "gst-plugins-base")
(version "1.16.1")
(version "1.16.2")
(source
(origin
(method url-fetch)
@ -163,7 +162,7 @@ (define-public gst-plugins-base
name "-" version ".tar.xz"))
(sha256
(base32
"0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"))))
"0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(propagated-inputs
@ -214,7 +213,7 @@ (define-public gst-plugins-base
(define-public gst-plugins-good
(package
(name "gst-plugins-good")
(version "1.16.1")
(version "1.16.2")
(source
(origin
(method url-fetch)
@ -223,7 +222,7 @@ (define-public gst-plugins-good
name "-" version ".tar.xz"))
(sha256
(base32
"07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"))))
"068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0"))))
(build-system gnu-build-system)
(inputs
`(("aalib" ,aalib)
@ -277,23 +276,18 @@ (define-public gst-plugins-good
(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")
@ -357,7 +351,7 @@ (define-public gst-plugins-bad
(define-public gst-plugins-ugly
(package
(name "gst-plugins-ugly")
(version "1.16.1")
(version "1.16.2")
(source
(origin
(method url-fetch)
@ -365,7 +359,7 @@ (define-public gst-plugins-ugly
name "/" name "-" version ".tar.xz"))
(sha256
(base32
"07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"))))
"1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m"))))
(build-system gnu-build-system)
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
@ -392,7 +386,7 @@ (define-public gst-plugins-ugly
(define-public gst-libav
(package
(name "gst-libav")
(version "1.16.1")
(version "1.16.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -400,7 +394,7 @@ (define-public gst-libav
name "-" version ".tar.xz"))
(sha256
(base32
"1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"))
"1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967"))
(modules '((guix build utils)))
(snippet
'(begin
@ -428,7 +422,7 @@ (define-public gst-libav
(define-public python-gst
(package
(name "python-gst")
(version "1.16.1")
(version "1.16.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -436,7 +430,7 @@ (define-public python-gst
"gst-python-" version ".tar.xz"))
(sha256
(base32
"12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl"))))
"1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)

16
gnu/packages/gtk.scm
View file

@ -89,7 +89,7 @@ (define-module (gnu packages gtk)
(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 @@ (define-public atk
name "-" version ".tar.xz"))
(sha256
(base32
"1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"))))
"1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))
(build-system meson-build-system)
(propagated-inputs `(("glib" ,glib))) ; required by atk.pc
(native-inputs
@ -552,7 +552,7 @@ (define-public gdk-pixbuf+svg
(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 @@ (define-public at-spi2-core
name "-" version ".tar.xz"))
(sha256
(base32
"0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"))))
"1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@ -621,7 +621,7 @@ (define-public at-spi2-core
(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 @@ (define-public at-spi2-atk
name "-" version ".tar.xz"))
(sha256
(base32
"0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"))))
"05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))))
(build-system meson-build-system)
(arguments
'(#:phases
@ -722,7 +722,7 @@ (define-public gtk+-2
(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 @@ (define-public gtk+
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"))

3
gnu/packages/image.scm
View file

@ -1128,7 +1128,8 @@ (define-public libwebp
(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

4
gnu/packages/imagemagick.scm
View file

@ -48,14 +48,14 @@ (define-public imagemagick
;; 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")

24
gnu/packages/linux.scm
View file

@ -1540,7 +1540,7 @@ (define-public ltrace
(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
@ -1548,8 +1548,12 @@ (define-public alsa-lib
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
@ -1560,14 +1564,14 @@ (define-public alsa-lib
(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.
@ -1614,14 +1618,14 @@ (define-public alsa-utils
(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.
@ -2644,7 +2648,7 @@ (define-public eudev
;; 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")
@ -2652,7 +2656,7 @@ (define-public eudev
(file-name (git-file-name name version))
(sha256
(base32
"1g95yzzx4qxm5qhhylbi930lrq4gsbz207n72018nkvswj6gmpjw"))
"1g9z3d33m0i3hmbhm0wxpvkzf6ac7xj1drwcfrhzlfhhi63sg9h7"))
(patches (search-patches "eudev-rules-directory.patch"))))
(build-system gnu-build-system)
(arguments
@ -3778,7 +3782,7 @@ (define-public sbc
(define-public bluez
(package
(name "bluez")
(version "5.51")
(version "5.52")
(source (origin
(method url-fetch)
(uri (string-append
@ -3786,7 +3790,7 @@ (define-public bluez
version ".tar.xz"))
(sha256
(base32
"1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb"))))
"02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

19
gnu/packages/nss.scm
View file

@ -34,7 +34,7 @@ (define-module (gnu packages nss)
(define-public nspr
(package
(name "nspr")
(version "4.22")
(version "4.24")
(source (origin
(method url-fetch)
(uri (string-append
@ -42,7 +42,7 @@ (define-public nspr
version "/src/nspr-" version ".tar.gz"))
(sha256
(base32
"0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69"))))
"1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
@ -70,8 +70,7 @@ (define-public nspr
(define-public nss
(package
(name "nss")
(version "3.46.1")
(replacement nss/fixed)
(version "3.48")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@ -82,7 +81,7 @@ (define-public nss
"nss-" version ".tar.gz")))
(sha256
(base32
"0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv"))
"1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch"
"nss-freebl-stubs.patch"
@ -131,7 +130,7 @@ (define-public nss
;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. 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"))
@ -184,11 +183,3 @@ (define-public nss
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))))))))

17
gnu/packages/patches/mesa-timespec-test-32bit.patch
View file

@ -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)

24
gnu/packages/patches/nss-CVE-2019-11745.patch
View file

@ -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:
<https://hg.mozilla.org/projects/nss/rev/1e22a0c93afe9f46545560c86caedef9dab6cfda>.
# HG changeset patch
# User Craig Disselkoen <cdisselk@cs.ucsd.edu>
# 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());

17
gnu/packages/patches/orc-typedef-enum.patch
View file

@ -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),

25
gnu/packages/patches/pcre2-fix-jit_match-crash.patch
View file

@ -1,25 +0,0 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 01 Aug 2019 21:12:52 +0200
Subject: [PATCH] gnu: pcre2: Fix jit_match crash.
Fixes <https://bugs.exim.org/show_bug.cgi?id=2421>, 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;

8
gnu/packages/pcre.scm
View file

@ -89,15 +89,14 @@ (define-public pcre
(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)
@ -109,7 +108,8 @@ (define-public pcre2
"--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

4
gnu/packages/pdf.scm
View file

@ -670,14 +670,14 @@ (define-public mupdf
(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

4
gnu/packages/statistics.scm
View file

@ -183,7 +183,7 @@ (define-public libxls
(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 @@ (define r-with-tests
version ".tar.gz"))
(sha256
(base32
"128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv"))))
"0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx"))))
(build-system gnu-build-system)
(arguments
`(#:disallowed-references (,tzdata-for-tests)

17
gnu/packages/xdisorg.scm
View file

@ -302,28 +302,31 @@ (define-public xclip
(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/")
@ -462,7 +465,7 @@ (define-public pixman
(define-public libdrm
(package
(name "libdrm")
(version "2.4.99")
(version "2.4.100")
(source
(origin
(method url-fetch)
@ -472,7 +475,7 @@ (define-public libdrm
".tar.bz2"))
(sha256
(base32
"0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd"))
"0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67"))
(patches (search-patches "libdrm-symbol-check.patch"))))
(build-system meson-build-system)
(arguments

12
gnu/packages/xiph.scm
View file

@ -69,6 +69,8 @@ (define libogg
(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
@ -93,7 +95,8 @@ (define libvorbis
"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
@ -119,6 +122,8 @@ (define libtheora
"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)))
@ -174,7 +179,8 @@ (define speexdsp
"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
'()))))
@ -352,6 +358,8 @@ (define opus
(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