From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: mupdf, cups-filters: Incorporated grafted changes. Date: Wed, 25 Jan 2017 13:51:21 -0500 Message-ID: <44868c9c2b40bbd95d4ccd59a1977445d5e27d01.1485370255.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWSfO-0008RH-Qg for guix-devel@gnu.org; Wed, 25 Jan 2017 13:51:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWSfL-0003Be-OH for guix-devel@gnu.org; Wed, 25 Jan 2017 13:51:34 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58190) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cWSfL-0003B9-Fx for guix-devel@gnu.org; Wed, 25 Jan 2017 13:51:31 -0500 Received: from localhost.localdomain (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 30D992443E for ; Wed, 25 Jan 2017 13:51:30 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/pdf.scm (mupdf)[replacement]: Remove field. [source]: Add 'mupdf-mujs-CVE-2016-10132.patch' and 'mupdf-mujs-CVE-2016-10133.patch'. (mupdf/fixed): Remove variable. * gnu/packages/cups.scm (cups-filters)[replacement]: Remove field. (mupdf/fixed-instead-of-mupdf),(cups-filters/fixed): Remove variables. --- gnu/packages/cups.scm | 8 -------- gnu/packages/pdf.scm | 17 +++-------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 39ab41c19..94f8e91f1 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -52,7 +52,6 @@ (define-public cups-filters (package (name "cups-filters") - (replacement cups-filters/fixed) (version "1.13.1") (source(origin (method url-fetch) @@ -135,13 +134,6 @@ 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. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 2ea48e599..d449b72ee 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -481,7 +481,6 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (replacement mupdf/fixed) (version "1.10a") (source (origin @@ -491,7 +490,9 @@ extracting content or merging files.") (sha256 (base32 "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a")) - (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch")) + (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch" + "mupdf-mujs-CVE-2016-10132.patch" + "mupdf-mujs-CVE-2016-10133.patch")) (modules '((guix build utils))) (snippet ;; Delete all the bundled libraries except for mujs, which is @@ -540,18 +541,6 @@ line tools for batch rendering (pdfdraw), rewriting files (pdfclean), and examining the file structure (pdfshow).") (license license:agpl3+))) -(define mupdf/fixed - (package - (inherit mupdf) - (source - (origin - (inherit (package-source mupdf)) - (patches - (append - (origin-patches (package-source mupdf)) - (search-patches "mupdf-mujs-CVE-2016-10132.patch" - "mupdf-mujs-CVE-2016-10133.patch"))))))) - (define-public qpdf (package (name "qpdf") -- 2.11.0