Pullup ticket #6109 - requested by sevan

print/ghostscript-agpl: security fix

Revisions pulled up:
- print/ghostscript-agpl/Makefile                               1.49
- print/ghostscript-agpl/distinfo                               1.27
- print/ghostscript-agpl/patches/patch-Resource_Init_gs_ttf.ps  1.1

---
   Module Name:    pkgsrc
   Committed By:   sevan
   Date:           Fri Jan  3 23:56:09 UTC 2020

   Modified Files:
           pkgsrc/print/ghostscript-agpl: Makefile distinfo
   Added Files:
           pkgsrc/print/ghostscript-agpl/patches: patch-Resource_Init_gs_ttf.ps

   Log Message:
   Patch CVE-2019-14869

3 files changed, 48 insertions, 3 deletions

diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 5935fa3b232..91334a9499f 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2019/12/13 11:25:01 leot Exp $
+# $NetBSD: Makefile,v 1.48.4.1 2020/01/07 19:49:26 bsiegert Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ArtifexSoftware/}
 GITHUB_PROJECT=	ghostpdl-downloads
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index 299d561e2de..9562b9377ad 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.26 2019/12/10 10:44:09 leot Exp $
+$NetBSD: distinfo,v 1.26.4.1 2020/01/07 19:49:26 bsiegert Exp $
 
 SHA1 (ghostscript-9.50.tar.xz) = 3be5f36300e3031e68a28cd898b3eebc9151660b
 RMD160 (ghostscript-9.50.tar.xz) = 7ba4ac83bff4b2bb4b102002501cc6ee0a74ace2
 SHA512 (ghostscript-9.50.tar.xz) = 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee
 Size (ghostscript-9.50.tar.xz) = 34613344 bytes
+SHA1 (patch-Resource_Init_gs_ttf.ps) = 7a65887b86079836b44d77f69257c5d46c006503
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 96006928e0b5381e7101027372b6e6408f1c4a0b
diff --git a/print/ghostscript-agpl/patches/patch-Resource_Init_gs_ttf.ps b/print/ghostscript-agpl/patches/patch-Resource_Init_gs_ttf.ps
new file mode 100644
index 00000000000..90d758454f7
--- /dev/null
+++ b/print/ghostscript-agpl/patches/patch-Resource_Init_gs_ttf.ps
@@ -0,0 +1,44 @@
+$NetBSD: patch-Resource_Init_gs_ttf.ps,v 1.1.2.2 2020/01/07 19:49:27 bsiegert Exp $
+
+CVE-2019-14869
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=485904772c5f
+https://nvd.nist.gov/vuln/detail/CVE-2019-14869
+
+--- Resource/Init/gs_ttf.ps.orig	2020-01-03 16:02:12.889444420 +0000
++++ Resource/Init/gs_ttf.ps
+@@ -1304,7 +1304,7 @@ currentdict /.pickcmap_with_no_xlatmap .
+           TTFDEBUG { (\n1 setting alias: ) print dup ==only
+                 ( to be the same as  ) print 2 index //== exec } if
+ 
+-          7 index 2 index 3 -1 roll exch .forceput
++          7 index 2 index 3 -1 roll exch put
+         } forall
+         pop pop pop
+       }
+@@ -1322,7 +1322,7 @@ currentdict /.pickcmap_with_no_xlatmap .
+           exch pop
+           TTFDEBUG { (\n2 setting alias: ) print 1 index ==only
+                      ( to use glyph index: ) print dup //== exec } if
+-          5 index 3 1 roll .forceput
++          5 index 3 1 roll put
+           //false
+         }
+         {
+@@ -1339,7 +1339,7 @@ currentdict /.pickcmap_with_no_xlatmap .
+         {                            %  CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer)
+           TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only
+                 ( to be index: ) print dup //== exec } if
+-          exch pop 5 index 3 1 roll .forceput
++          exch pop 5 index 3 1 roll put
+         }
+         {
+           pop pop
+@@ -1369,7 +1369,7 @@ currentdict /.pickcmap_with_no_xlatmap .
+       } ifelse
+     ]
+   TTFDEBUG { (Encoding: ) print dup === flush } if
+-} .bind executeonly odef		% hides .forceput
++} .bind odef
+ 
+ % ---------------- CIDFontType 2 font loading ---------------- %
+