From f8489f160b08deb4501ddc5e9cde911f6167ab1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 25 Dec 2016 06:50:57 +0200 Subject: gnu: cups-filters: Update to 1.13.1. * gnu/packages/cups.scm (cups-filters): Update to 1.13.1. [inputs]: Switch libjpeg-8 to libjpeg. [arguments]: Disable driverless printing, set location for bash shell. --- gnu/packages/cups.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index baa77f7aac..ca16958352 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -51,7 +51,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.11.5") + (version "1.13.1") (source(origin (method url-fetch) (uri @@ -59,7 +59,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1hcp1cfx1a71aa6fyayajjh7vw1ia7zya6981gz73vsy2pdb23qf")) + "0s7hylp2lcvc1vrqpywpv7lspkrh4xf7cyi4nbg10cf38rshj474")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output @@ -85,12 +85,16 @@ (arguments `(#:make-flags (list (string-append "PREFIX=" %output)) #:configure-flags - `(,(string-append "--with-test-font-path=" + `("--disable-driverless" ; TODO: enable this + ,(string-append "--with-test-font-path=" (assoc-ref %build-inputs "font-dejavu") "/share/fonts/truetype/DejaVuSans.ttf") ,(string-append "--with-gs-path=" (assoc-ref %build-inputs "ghostscript") "/bin/gsc") + ,(string-append "--with-shell=" + (assoc-ref %build-inputs "bash") + "/bin/bash") ,(string-append "--with-rcdir=" (assoc-ref %outputs "out") "/etc/rc.d")))) (native-inputs @@ -100,12 +104,12 @@ `(("avahi" ,avahi) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("font-dejavu" ,font-dejavu) ;needed by test suite + ("font-dejavu" ,font-dejavu) ; also needed by test suite ("ghostscript" ,(force ghostscript/cups)) ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) - ("libjpeg-8" ,libjpeg-8) + ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) ("mupdf" ,mupdf) -- cgit v1.2.3 From 8afabb2eca954af6fbba8c6ae37e8f0bc3047840 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Jan 2017 13:38:48 -0500 Subject: gnu: cups-filters: Fix CVE-2016-{10132,10133} in statically linked mupdf. The vulnerabilities are in the MuJS that is bundled with MuPDF. * gnu/packages/cups.scm (cups-filters)[replacement]: New field. (mupdf/fixed-instead-of-mupdf), (cups-filters/fixed): New variables. --- gnu/packages/cups.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index ca16958352..39ab41c192 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ (define-public cups-filters (package (name "cups-filters") + (replacement cups-filters/fixed) (version "1.13.1") (source(origin (method url-fetch) @@ -133,6 +135,13 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") license:lgpl2.0+ license:expat)))) +(define mupdf/fixed-instead-of-mupdf + (package-input-rewriting `((,mupdf . ,(@@ (gnu packages pdf) mupdf/fixed))))) + +;;; Fix CVE-2016-10132 and CVE-2016-10133. See mupdf/fixed for more information. +(define cups-filters/fixed + (mupdf/fixed-instead-of-mupdf cups-filters)) + ;; CUPS on non-MacOS systems requires cups-filters. Since cups-filters also ;; depends on CUPS libraries and binaries, cups-minimal has been added to ;; satisfy this dependency. -- cgit v1.2.3 From 58a7bbc5fe52f20910fb0fe7fddb9012f2049034 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Jan 2017 16:44:45 +0100 Subject: gnu: cups-filters: Disable mutool integration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (cups-filters)[arguments]: Add ‘--disable-mutool’ to #:configure-flags. [inputs]: Remove mupdf. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 39ab41c192..adf94a5128 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -88,6 +88,7 @@ `(#:make-flags (list (string-append "PREFIX=" %output)) #:configure-flags `("--disable-driverless" ; TODO: enable this + "--disable-mutool" ; depends on yet another PDF library (mupdf) ,(string-append "--with-test-font-path=" (assoc-ref %build-inputs "font-dejavu") "/share/fonts/truetype/DejaVuSans.ttf") @@ -114,7 +115,6 @@ ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("mupdf" ,mupdf) ("glib" ,glib) ("qpdf" ,qpdf) ("poppler" ,poppler) -- cgit v1.2.3 From 46076d08edb3eec1b98d3ae978c93d6db7c84eb2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 17 Jan 2017 15:12:53 -0500 Subject: Revert "gnu: cups-filters: Disable mutool integration." This change would cause 594 packages to be rebuilt, so it was moved to the staging branch. This reverts commit 58a7bbc5fe52f20910fb0fe7fddb9012f2049034. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index adf94a5128..39ab41c192 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -88,7 +88,6 @@ `(#:make-flags (list (string-append "PREFIX=" %output)) #:configure-flags `("--disable-driverless" ; TODO: enable this - "--disable-mutool" ; depends on yet another PDF library (mupdf) ,(string-append "--with-test-font-path=" (assoc-ref %build-inputs "font-dejavu") "/share/fonts/truetype/DejaVuSans.ttf") @@ -115,6 +114,7 @@ ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) + ("mupdf" ,mupdf) ("glib" ,glib) ("qpdf" ,qpdf) ("poppler" ,poppler) -- cgit v1.2.3