From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Subject: bug#27563: [PATCH v4 3/3] gnu: ghostscript: Make "/CreationDate", "/ModDate" optoinal, depending on environment variable. Date: Mon, 10 Jul 2017 17:25:14 +0200 Message-ID: <871spo48md.fsf@gnu.org> References: <20170709234012.26064-1-dannym@scratchpost.org> <20170709234644.24682-1-dannym@scratchpost.org> <20170709234644.24682-3-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUaZb-0002LH-GM for bug-guix@gnu.org; Mon, 10 Jul 2017 11:26:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUaZW-0005iQ-Hg for bug-guix@gnu.org; Mon, 10 Jul 2017 11:26:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUaZW-0005iK-Dn for bug-guix@gnu.org; Mon, 10 Jul 2017 11:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dUaZW-0002iA-8G for bug-guix@gnu.org; Mon, 10 Jul 2017 11:26:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20170709234644.24682-3-dannym@scratchpost.org> (Danny Milosavljevic's message of "Mon, 10 Jul 2017 01:46:44 +0200") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Danny Milosavljevic Cc: 27563@debbugs.gnu.org Danny Milosavljevic skribis: > * gnu/packages/patches/ghostscript-no-header-creationdate.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/ghostscript.scm (ghostscript): Use it. > --- > gnu/local.mk | 1 + > gnu/packages/ghostscript.scm | 10 ++-------- > .../patches/ghostscript-no-header-creationdate.patch | 16 ++++++++++= ++++++ > 3 files changed, 19 insertions(+), 8 deletions(-) > create mode 100644 gnu/packages/patches/ghostscript-no-header-creationda= te.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 9cf4648aa..0880de038 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -621,6 +621,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/ghostscript-CVE-2017-8291.patch \ > %D%/packages/patches/ghostscript-no-header-id.patch \ > %D%/packages/patches/ghostscript-no-header-uuid.patch \ > + %D%/packages/patches/ghostscript-no-header-creationdate.patch \ > %D%/packages/patches/ghostscript-runpath.patch \ > %D%/packages/patches/glib-networking-ssl-cert-file.patch \ > %D%/packages/patches/glib-tests-timer.patch \ > diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm > index 3a84db3e4..b15b032a7 100644 > --- a/gnu/packages/ghostscript.scm > +++ b/gnu/packages/ghostscript.scm > @@ -144,6 +144,7 @@ printing, and psresize, for adjusting page sizes.") > "0lyhjcrkmd5fcmh8h56bs4xr9k4jasmikv5vsix1hd4ai0ad1q9b")) > (patches (search-patches "ghostscript-runpath.patch" > "ghostscript-CVE-2017-8291.patch" > + "ghostscript-no-header-creationdate.pat= ch" > "ghostscript-no-header-id.patch" > "ghostscript-no-header-uuid.patch")) > (modules '((guix build utils))) > @@ -154,14 +155,7 @@ printing, and psresize, for adjusting page sizes.") > '(begin > (for-each delete-file-recursively '("freetype" "jbig2dec" "j= peg" > "lcms2" "libpng" > - "tiff" "zlib")) > - ;; Get rid of timestamps (remove /CreationDate and /ModDate). > - (substitute* "devices/vector/gdevpdf.c" > - ((", but we do the same") > - (string-append "*/ " > - "if (!getenv(\"GS_GENERATE_UUIDS\") || " > - "(strcmp(getenv(\"GS_GENERATE_UUIDS\"), \"0= \") !=3D 0 && " > - "strcmp(getenv(\"GS_GENERATE_UUIDS\"), \"no= \") !=3D 0)) /*"))))))) > + "tiff" "zlib")))))) Hmm, what is this patch against? Was it generated against a previous WIP tree? Ludo=E2=80=99.