From 94e10cf4bd384cbda5d8c9dd37a0c13a6e9549f0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 8 Jun 2017 22:55:24 -0400 Subject: gnu: Add libgxps. * gnu/packages/gnome.scm (libgxps): New variable. --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ea3bb07a5..4667e7455d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -288,6 +288,38 @@ (define-public libgdata access the common Google services, and has full asynchronous support.") (license license:lgpl2.1+))) +(define-public libgxps + (package + (name "libgxps") + (version "0.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "184r06s8g20cfigg7m169n42jjsc9wmzzlycr4g1fxxhr72r8x9y")))) + (build-system gnu-build-system) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("glib" ,glib) + ("libarchive" ,libarchive) + ("libjpeg" ,libjpeg) + ("lcms" ,lcms) + ("libtiff" ,libtiff) + ("nettle" ,nettle))) + (home-page "https://wiki.gnome.org/Projects/libgxps") + (synopsis "GObject-based library for handling and rendering XPS documents") + (description + "libgxps is a GObject-based library for handling and rendering XPS +documents. This package also contains binaries that can convert XPS documents +to other formats.") + (license license:lgpl2.1+))) + (define-public gnome-common (package (name "gnome-common") -- cgit v1.2.3 From 9a0968816f831ee6bc2343c3aca254bbbf9958cc Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 9 Jun 2017 13:42:34 -0400 Subject: gnu: evince: Enable XPS document support. * gnu/packages/gnome.scm (evince)[inputs]: Add libarchive and libgxps. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4667e7455d..293df870e0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -625,13 +625,14 @@ (define-public evince (("gtk-update-icon-cache") "true")) #t))))) (inputs - `(("libspectre" ,libspectre) + `(("libarchive" ,libarchive) + ("libgxps" ,libgxps) + ("libspectre" ,libspectre) ("djvulibre" ,djvulibre) ("ghostscript" ,ghostscript) ("poppler" ,poppler) ("libtiff" ,libtiff) ;; TODO: - ;; Add libgxps for XPS support. ;; Build libkpathsea as a shared library for DVI support. ;; ("libkpathsea" ,texlive-bin) ("gnome-desktop" ,gnome-desktop) -- cgit v1.2.3 From afd9ed5c0c3ae562c3a2a7d752f2d6c8c637c6dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Jun 2017 23:32:02 +0300 Subject: gnu: avidemux: Limit supported architectures. * gnu/packages/video.scm (avidemux)[supported-systems]: New field, limit to x86_64, i686 and armhf. --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8a91a97017..702704ed46 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1449,6 +1449,7 @@ (define-public avidemux DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities.") + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; Software with various licenses is included, see License.txt. (license license:gpl2+))) -- cgit v1.2.3 From 7f10628ca8e7693cd421d2a3f3ae67e864b67998 Mon Sep 17 00:00:00 2001 From: djwj Date: Sat, 10 Jun 2017 18:01:05 +0100 Subject: gnu: libgxps: Add "/" before name in source URL. * gnu/packages/gnome.scm (libgxps)[source]: Add "/". Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 293df870e0..d3f7344508 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -294,7 +294,7 @@ (define-public libgxps (version "0.2.5") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources" name "/" + (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 -- cgit v1.2.3 From d0306208b155168ebc1565d32b003acfbc1ebec1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 10 Jun 2017 14:08:28 +0200 Subject: gnu: wine: Update to 2.10. * gnu/packages/wine.scm (wine): Update to 2.10. Signed-off-by: Danny Milosavljevic --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 34f145b89b..72700ef3df 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -55,14 +55,14 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "2.9") + (version "2.10") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/2.x" "/wine-" version ".tar.xz")) (sha256 (base32 - "0pslhs3kwjimlz5ad6vzzdw7lgbfpwl8vyg4jmf17p61pfxzfimc")))) + "0ygiaayi2mv6jl450d03i4x2gd2bg3mwk3s2pxas87g8sbzzg3a8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 4eadc8b90de8434a6f367308405e1839c473c916 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 10 Jun 2017 23:48:50 +0200 Subject: gnu: Add python-swagger-spec-validator. * gnu/packages/python.scm (python-swagger-spec-validator, python2-swagger-spec-validator): New variables. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 44adcba01e..03e6bb6567 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -15298,3 +15298,28 @@ (define-public python-flasgger (define-public python2-flasgger (package-with-python2 python-flasgger)) + +(define-public python-swagger-spec-validator + (package + (name "python-swagger-spec-validator") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "swagger-spec-validator" version)) + (sha256 + (base32 + "13hkpn2lycwr0468yqhjb3kwszqf7hjwlq61w7vdxq1caz31k4nw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jsonschema" ,python-jsonschema) + ("python-six" ,python-six))) + (home-page + "http://github.com/Yelp/swagger_spec_validator") + (synopsis "Validation of Swagger specifications") + (description "@code{swagger_spec_validator} provides a library for +validating Swagger API specifications.") + (license license:asl2.0))) + +(define-public python2-swagger-spec-validator + (package-with-python2 python-swagger-spec-validator)) -- cgit v1.2.3 From 01614de1c325b219f20af8feb243d5a83ca6e6b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Jun 2017 00:39:51 +0200 Subject: gnu: slop: Update to 6.3.45. * gnu/packages/xdisorg.scm (slop): Update to 6.3.45. [inputs]: Add ICU4C. --- gnu/packages/xdisorg.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index aaa961bb2b..48f8af1709 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -55,6 +55,7 @@ (define-module (gnu packages xdisorg) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages icu4c) #:use-module (gnu packages maths) #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) @@ -449,7 +450,7 @@ (define-public scrot (define-public slop (package (name "slop") - (version "6.3.43") + (version "6.3.45") (source (origin (method url-fetch) (uri (string-append @@ -458,12 +459,13 @@ (define-public slop (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kazcnnarc61d3rjysaym9vadf31wisfd3sn076rsjnsldm4y66h")))) + "0lzyjcg6yff1vzlsda45i57khajp56yrmcjfa5faw3i60fnqqiy7")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target (inputs `(("glm" ,glm) + ("icu4c" ,icu4c) ("libxext" ,libxext) ("libxrender" ,libxrender) ("mesa" ,mesa))) -- cgit v1.2.3 From e35dc5e75ea0fe98f9777f48715584b38b4cc302 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Jun 2017 00:34:24 +0200 Subject: gnu: tor: Update to 0.3.0.8 [security fixes]. Fixes CVE-2017-0375 and CVE-2017-0376, among other things. https://blog.torproject.org/blog/tor-0308-released-fix-hidden-services-also-are-02429-02514-02612-0278-02814-and-02911 * gnu/packages/tor.scm (tor): Update to 0.3.0.8. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b31b58a26f..819092cb72 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -43,14 +43,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.3.0.7") + (version "0.3.0.8") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "00kxa83bn0axh7479fynp6r8znq5wy26kvb8ghixgjpkir2c8h4n")))) + "0j0dhq1zp6w6zy7y4kiw7zg1imbgv8nsl7imlzwc0951p2kknfk6")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-expensive-hardening" -- cgit v1.2.3 From 88e2511e217f2c23c6048d6cf104df99be3fef63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Jun 2017 15:47:00 +0200 Subject: gnu: gnutls: Replace with 3.5.13. This update addresses the following security advisories: GNUTLS-SA-2017-3 (aka CVE-2017-7869) and GNUTLS-SA-2017-4. See and . * gnu/packages/patches/gnutls-skip-pkgconfig-test.patch, gnu/packages/patches/gnutls-skip-trust-store-test.patch: New files. * gnu/local.mk (dist_patch_DATA): Register patches. * gnu/packages/tls.scm (gnutls)[replacement]: New field. (gnutls-3.5.13): New variable. (gnutls/guile-2.2)[replacement]: New field. Set #f. [source]: Inherit from GNUTLS-3.5.13. --- gnu/local.mk | 2 ++ .../patches/gnutls-skip-pkgconfig-test.patch | 24 ++++++++++++++++++++++ .../patches/gnutls-skip-trust-store-test.patch | 15 ++++++++++++++ gnu/packages/tls.scm | 24 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 gnu/packages/patches/gnutls-skip-pkgconfig-test.patch create mode 100644 gnu/packages/patches/gnutls-skip-trust-store-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 686c3c6396..70b4a44a13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -640,6 +640,8 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ + %D%/packages/patches/gnutls-skip-trust-store-test.patch \ + %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch b/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch new file mode 100644 index 0000000000..1fad7c14e3 --- /dev/null +++ b/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch @@ -0,0 +1,24 @@ +FIXME: The static test fails with an error such as: + +/tmp/guix-build-gnutls-3.5.13.drv-0/ccOnGPmc.o: In function `main': +c.29617.tmp.c:(.text+0x5): undefined reference to `gnutls_global_init' +collect2: error: ld returned 1 exit status +FAIL pkgconfig.sh (exit status: 1) + +diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh +index 6bd4e62f9..05aab8278 100755 +--- a/tests/pkgconfig.sh ++++ b/tests/pkgconfig.sh +@@ -57,11 +57,7 @@ echo "Trying dynamic linking with:" + echo " * flags: $(${PKGCONFIG} --libs gnutls)" + echo " * common: ${COMMON}" + echo " * lib: ${CFLAGS}" +-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} +- +-echo "" +-echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)" +-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} ++gcc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} + + rm -f ${TMPFILE} ${TMPFILE_O} + diff --git a/gnu/packages/patches/gnutls-skip-trust-store-test.patch b/gnu/packages/patches/gnutls-skip-trust-store-test.patch new file mode 100644 index 0000000000..e0536712a5 --- /dev/null +++ b/gnu/packages/patches/gnutls-skip-trust-store-test.patch @@ -0,0 +1,15 @@ +Version 3.5.11 added a test to check that the default trust store is readable. +It does not exist in the build environment, so pretend everything is fine. + +diff a/tests/trust-store.c b/tests/trust-store.c +--- a/tests/trust-store.c ++++ b/tests/trust-store.c +@@ -61,7 +61,7 @@ + } else if (ret < 0) { + fail("error loading system trust store: %s\n", gnutls_strerror(ret)); + } else if (ret == 0) { +- fail("no certificates were found in system trust store!\n"); ++ success("no trust store in the Guix build environment!\n"); + } + + gnutls_certificate_free_credentials(x509_cred); diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8964abb2f2..bba95eb9bc 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,6 +143,7 @@ (define-public p11-kit (define-public gnutls (package (name "gnutls") + (replacement gnutls-3.5.13) (version "3.5.9") (source (origin (method url-fetch) @@ -214,10 +216,32 @@ (define-public gnutls (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +(define gnutls-3.5.13 ;GNUTLS-SA-2017-{3,4} + (package + (inherit gnutls) + ;; We use 'D' instead of '13' here to keep the store file name at + ;; the same length. See . + (version "3.5.D") + (replacement #f) + (source (origin + (method url-fetch) + (uri + (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-3.5.13.tar.xz")) + (patches + (search-patches "gnutls-skip-trust-store-test.patch" + "gnutls-skip-pkgconfig-test.patch")) + (sha256 + (base32 + "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr")))))) + (define-public gnutls/guile-2.2 ;; GnuTLS for Guile 2.2. This is supported by GnuTLS >= 3.5.5. (package (inherit gnutls) + (replacement #f) + (source (package-source gnutls-3.5.13)) (name "guile2.2-gnutls") (arguments ;; Remove '--with-guile-site-dir=…/2.0'. -- cgit v1.2.3 From 31baa864483d487b69eecd8fe30977b22612797b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Jun 2017 01:40:00 +0200 Subject: gnu: alsa-utils: Update to 1.1.4. * gnu/packages/linux.scm (alsa-utils): Update to 1.1.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2bbc3b6ef6..204e70a3bf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -900,14 +900,14 @@ (define-public alsa-lib (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "0z0nnqp1707bm02dys2d16m88lsg5nd26bqaf14rl3za9sjifwhj")))) + "17cxih9ibjp1193dyd79j50pyfa9dvrs6r9kpwrvzicjvr2110x7")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. -- cgit v1.2.3 From 20d87dfb453cf27f95c5ef3858e8d096278e1702 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Jun 2017 01:40:57 +0200 Subject: gnu: alsa-plugins: Update to 1.1.4. * gnu/packages/linux.scm (alsa-plugins): Update to 1.1.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 204e70a3bf..1573d9c8d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -947,14 +947,14 @@ (define-public alsa-utils (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.1") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "1w81z5jlwqhd1l2m7qrq69lc4k9dnrg1wn52jsl2hrf3hbhd394f")))) + "12hsvm6rpinjkg06pa9hzndkdrbfw6wk6yk00cm8y1gbv8xiq3ak")))) (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