diff --git a/.gitignore b/.gitignore index 071881a..de53ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ ghostscript-8.71.tar.xz /ghostscript-9.26.tar.xz /ghostscript-9.27.tar.xz /ghostscript-9.50.tar.xz +/ghostscript-9.52.tar.xz diff --git a/0001-Bug-701969-Fix-fontconfig-path-permissions-handling.patch b/0001-Bug-701969-Fix-fontconfig-path-permissions-handling.patch deleted file mode 100644 index c95bbf2..0000000 --- a/0001-Bug-701969-Fix-fontconfig-path-permissions-handling.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 53ab3ecee8a60d412c2bf1406340bf9cb228e106 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Wed, 4 Dec 2019 12:23:02 +0000 -Subject: [PATCH] Bug 701969: Fix fontconfig path permissions handling - -The paths from fontconfig to be added to the permit file reading list was not -having the trailing directory separator added to indicate we want to allow -the directory to be read. - -Also, tweak the path/filename splitting (for the permit file read list) when -parsing the cidfmap so it matches the improved version in gs_fonts.ps ---- - Resource/Init/gs_cidfm.ps | 4 ++-- - base/gp_unix.c | 6 +++++- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Resource/Init/gs_cidfm.ps b/Resource/Init/gs_cidfm.ps -index cd9ed883f..e123bfc1c 100644 ---- a/Resource/Init/gs_cidfm.ps -+++ b/Resource/Init/gs_cidfm.ps -@@ -141,7 +141,7 @@ currentdict end def - % .basename - /.splitdirname { - (/) rsearch { //true } { (\\) rsearch } ifelse -- {3 -2 roll pop pop //true}{//false} ifelse -+ {exch concatstrings exch pop //true}{//false} ifelse - } bind def - - % .addcidfmappath - -@@ -214,7 +214,7 @@ currentdict end def - } loop - } forall - currentdict end -- {exch pop (/) concatstrings /PermitFileReading exch .addcontrolpath} forall -+ {exch pop /PermitFileReading exch .addcontrolpath} forall - - % Checks for vicious substitution cycles. - dup length dict copy % <> -diff --git a/base/gp_unix.c b/base/gp_unix.c -index 6d2b8b163..ecf0e8a63 100644 ---- a/base/gp_unix.c -+++ b/base/gp_unix.c -@@ -356,7 +356,11 @@ void *gp_enumerate_fonts_init(gs_memory_t *mem) - */ - code = 0; - while ((dirstr = FcStrListNext(fdirlist)) != NULL && code >= 0) { -- code = gs_add_control_path(mem, gs_permit_file_reading, (char *)dirstr); -+ char dirstr2[gp_file_name_sizeof]; -+ dirstr2[0] = '\0'; -+ strncat(dirstr2, (char *)dirstr, gp_file_name_sizeof - 1); -+ strncat(dirstr2, "/", gp_file_name_sizeof); -+ code = gs_add_control_path(mem, gs_permit_file_reading, (char *)dirstr2); - } - FcStrListDone(fdirlist); - if (code < 0) { --- -2.24.1 - diff --git a/ghostscript-9.23-100-run-dvipdf-securely.patch b/ghostscript-9.23-100-run-dvipdf-securely.patch index 46b8573..3a91b80 100644 --- a/ghostscript-9.23-100-run-dvipdf-securely.patch +++ b/ghostscript-9.23-100-run-dvipdf-securely.patch @@ -1,10 +1,10 @@ diff --git a/lib/dvipdf b/lib/dvipdf -index f643087..078292b 100755 +index 13e1985..078292b 100755 --- a/lib/dvipdf +++ b/lib/dvipdf @@ -43,4 +43,4 @@ fi # We have to include the options twice because -I only takes effect if it # appears before other options. --exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS +-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS - +exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS - diff --git a/ghostscript.spec b/ghostscript.spec index a7dedc0..4bd5757 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -42,7 +42,7 @@ Name: ghostscript Summary: Interpreter for PostScript language & PDF -Version: 9.50 +Version: 9.52 Release: 1%{?dist} License: AGPLv3+ @@ -93,8 +93,7 @@ BuildRequires: libXt-devel # Upstream patches -- official upstream patches released by upstream since the # ---------------- last rebase that are necessary for any reason: #Patch000: example000.patch -Patch000: 0001-Bug-701969-Fix-fontconfig-path-permissions-handling.patch -Patch001: ghostscript-9.50-enumerate-all-fonts.patch +Patch000: ghostscript-9.50-enumerate-all-fonts.patch # Downstream patches -- these should be always included when doing rebase: @@ -460,6 +459,9 @@ done # ============================================================================= %changelog +* Thu Apr 02 2020 Zdenek Dohnal - 9.52-1 +- 9.52 + * Wed Mar 11 2020 Zdenek Dohnal - 9.50-1 - 9.50 diff --git a/sources b/sources index f0fe730..0106481 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghostscript-9.50.tar.xz) = 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee +SHA512 (ghostscript-9.52.tar.xz) = 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67