[Reproducible-commits] [ghostscript] 03/06: Add patch cherry-picked upstream to fix /typecheck error in /findfont

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository ghostscript.

commit 90292dd4ca5baef03ec8721bc3a1c1ad8cd8351a
Author: Didier Raboud <odyx at debian.org>
Date:   Wed Jan 7 08:27:41 2015 +0100

    Add patch cherry-picked upstream to fix /typecheck error in /findfont
    
    Amend the upstream patch to mention the explicit copyright exception from the upstream author.
    
    Closes: #732440
---
 debian/patches/020140211~f4584b0.patch | 64 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 65 insertions(+)

diff --git a/debian/patches/020140211~f4584b0.patch b/debian/patches/020140211~f4584b0.patch
new file mode 100644
index 0000000..c8e6780
--- /dev/null
+++ b/debian/patches/020140211~f4584b0.patch
@@ -0,0 +1,64 @@
+From: Chris Liddell <chris.liddell at artifex.com>
+Date: Tue, 11 Feb 2014 15:15:56 +0000 (+0000)
+Subject: Bug 695031: don't assume we can read a font file
+X-Git-Tag: ghostpdl-9.12rc1~50
+X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=f4584b0e162a96ec143f0057de63c116e649e02b
+Bug-Debian: https://bugs.debian.org/732440
+
+Bug 695031: don't assume we can read a font file
+
+When we scan system fonts, we were assuming fonts found would be in a format
+Ghostscript understands. This is not necessarily the case.
+
+So put the minimal parsing call to get the font's name in a stopped context,
+so we can skip the file it's not an understandable format. And clean up the
+stack in the event we try such a file.
+
+No cluster differences.
+
+Debian-Comment: This patch is part of Ghostscript > 9.07, which is
+ distributed under the GNU Affero General Public License (AGPL).
+ This patch was explicitely considered by its author to be "too small to be
+ copyright-protected", from
+ https://lists.debian.org/54AE3261.8000903@artifex.com :
+ > We'd have no problem with you patching an older, non-AGPL release with
+ > that - we'd regard it as being covered by your "a" case above. It's also
+ > a sufficiently obvious solution that any competent Postscript programmer
+ > would almost certainly come up with the same solution, which would make
+ > copyright enforcement decidedly questionable, too.
+ .
+ Where the "a" case was:
+ > a) consider your patch as too small to be copyright-protected. This
+ >     would allow us to include is in GPL'd ghostscript 9.06. It'd be nice
+ >     to have your confirmation on this though.
+---
+
+--- a/Resource/Init/gs_fonts.ps
++++ b/Resource/Init/gs_fonts.ps
+@@ -385,12 +385,20 @@
+         pop pop pop
+       }{
+         % we could open the font file
+-        .findfontname
+-        not { dup 0 get } if  % stack: (newname) [ (name) (path) ]
+-        % DEBUG { (  found ) print dup print (\n) print flush } if
+-        % add entry to the fontmap
+-        1 index exch 0 exch dup type /nametype ne {cvn} if put
+-        aload pop .definefontmap
++        mark 2 1 roll
++        {.findfontname} stopped
++        {
++          cleartomark
++          pop pop
++        }
++        {
++          3 -1 roll pop
++          not { dup 0 get } if  % stack: (newname) [ (name) (path) ]
++          % DEBUG { (  found ) print dup print (\n) print flush } if
++          % add entry to the fontmap
++          1 index exch 0 exch dup type /nametype ne {cvn} if put
++          aload pop .definefontmap
++        } ifelse
+       } ifelse
+     } forall
+   } if
diff --git a/debian/patches/series b/debian/patches/series
index f1a2181..9510883 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 020121130~a3d00da.patch
 020130619~1b87b82.patch
 020130619~daceba6.patch
+020140211~f4584b0.patch
 1001_document_inkcov_device.patch
 2001_docdir_fix_for_debian.patch
 2002_gs_man_fix_debian.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/ghostscript.git