Merge branch 'f13' into f14
This commit is contained in:
Tim Waugh
commit
447e220937
318
ghostscript-SEARCH_HERE_FIRST.patch
Normal file
318
ghostscript-SEARCH_HERE_FIRST.patch
Normal file
@ -0,0 +1,318 @@
|
|||||||
|
diff -up ghostscript-8.71/base/bcwin32.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/bcwin32.mak
|
||||||
|
--- ghostscript-8.71/base/bcwin32.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/bcwin32.mak 2010-08-25 14:00:12.290019965 +0100
|
||||||
|
@@ -78,13 +78,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
!ifndef SEARCH_HERE_FIRST
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
!endif
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
diff -up ghostscript-8.71/base/macos-mcp.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/macos-mcp.mak
|
||||||
|
--- ghostscript-8.71/base/macos-mcp.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/macos-mcp.mak 2010-08-25 14:00:12.297143504 +0100
|
||||||
|
@@ -53,12 +53,9 @@ GS_DOCDIR=:doc
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/macosx.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/macosx.mak
|
||||||
|
--- ghostscript-8.71/base/macosx.mak.SEARCH_HERE_FIRST 2008-10-02 20:33:22.000000000 +0100
|
||||||
|
+++ ghostscript-8.71/base/macosx.mak 2010-08-25 14:00:12.327017571 +0100
|
||||||
|
@@ -78,12 +78,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/Makefile.in.SEARCH_HERE_FIRST ghostscript-8.71/base/Makefile.in
|
||||||
|
--- ghostscript-8.71/base/Makefile.in.SEARCH_HERE_FIRST 2009-12-18 07:04:10.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/Makefile.in 2010-08-25 14:00:12.335142758 +0100
|
||||||
|
@@ -96,12 +96,9 @@ GS_CACHE_DIR="~/.ghostscript/cache/"
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/msvclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/msvclib.mak
|
||||||
|
--- ghostscript-8.71/base/msvclib.mak.SEARCH_HERE_FIRST 2010-01-07 10:53:36.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/msvclib.mak 2010-08-25 14:00:12.359017810 +0100
|
||||||
|
@@ -49,13 +49,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
!ifndef SEARCH_HERE_FIRST
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
!endif
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
diff -up ghostscript-8.71/base/openvms.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/openvms.mak
|
||||||
|
--- ghostscript-8.71/base/openvms.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/openvms.mak 2010-08-25 14:00:12.382018536 +0100
|
||||||
|
@@ -68,12 +68,9 @@ GS_LIB_DEFAULT=GS_ROOT:[RESOURCE.INIT],G
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/openvms.mmk.SEARCH_HERE_FIRST ghostscript-8.71/base/openvms.mmk
|
||||||
|
--- ghostscript-8.71/base/openvms.mmk.SEARCH_HERE_FIRST 2009-01-08 09:17:18.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/openvms.mmk 2010-08-25 14:00:12.408142641 +0100
|
||||||
|
@@ -73,12 +73,9 @@ GS_LIB_DEFAULT=GS_LIB
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/ugcclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/ugcclib.mak
|
||||||
|
--- ghostscript-8.71/base/ugcclib.mak.SEARCH_HERE_FIRST 2008-11-05 20:41:22.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/ugcclib.mak 2010-08-25 14:00:12.446144216 +0100
|
||||||
|
@@ -30,7 +30,7 @@ gsdir = /usr/local/share/ghostscript
|
||||||
|
gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
|
||||||
|
GS_DOCDIR=$(gsdatadir)/doc
|
||||||
|
GS_LIB_DEFAULT=$(gsdatadir)/Resource/Init:$(gsdatadir)/lib:$(gsdatadir)/Resource/Font
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
GS_INIT=gs_init.ps
|
||||||
|
|
||||||
|
#GENOPT=-DDEBUG
|
||||||
|
diff -up ghostscript-8.71/base/unixansi.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/unixansi.mak
|
||||||
|
--- ghostscript-8.71/base/unixansi.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/unixansi.mak 2010-08-25 14:00:12.485143635 +0100
|
||||||
|
@@ -73,12 +73,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/unix-gcc.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/unix-gcc.mak
|
||||||
|
--- ghostscript-8.71/base/unix-gcc.mak.SEARCH_HERE_FIRST 2009-11-11 15:50:28.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/unix-gcc.mak 2010-08-25 14:00:12.501143978 +0100
|
||||||
|
@@ -77,12 +77,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/base/watclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/watclib.mak
|
||||||
|
--- ghostscript-8.71/base/watclib.mak.SEARCH_HERE_FIRST 2009-01-08 09:17:18.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/watclib.mak 2010-08-25 14:00:12.509143140 +0100
|
||||||
|
@@ -20,7 +20,7 @@ AROOTDIR=c:/gs
|
||||||
|
GSROOTDIR=$(AROOTDIR)/gs$(GS_DOT_VERSION)
|
||||||
|
GS_DOCDIR=$(GSROOTDIR)/doc
|
||||||
|
GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Init\;$(GSROOTDIR)/lib\;$(GSROOTDIR)/Resource/Font\;$(AROOTDIR)/fonts
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
GS_INIT=gs_init.ps
|
||||||
|
|
||||||
|
!ifndef DEBUG
|
||||||
|
diff -up ghostscript-8.71/base/watcw32.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/watcw32.mak
|
||||||
|
--- ghostscript-8.71/base/watcw32.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/base/watcw32.mak 2010-08-25 14:00:12.525143422 +0100
|
||||||
|
@@ -54,11 +54,8 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/doc/Use.htm.SEARCH_HERE_FIRST ghostscript-8.71/doc/Use.htm
|
||||||
|
--- ghostscript-8.71/doc/Use.htm.SEARCH_HERE_FIRST 2010-02-10 18:17:48.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/doc/Use.htm 2010-08-25 14:00:12.552143446 +0100
|
||||||
|
@@ -823,8 +823,8 @@ file name specifies an absolute path.
|
||||||
|
using the name given. Otherwise it tries directories in this order:
|
||||||
|
|
||||||
|
<ol>
|
||||||
|
-<li>The current directory (unless disabled by the
|
||||||
|
-<a href="#P-_switch"><code>-P-</code> switch</a>);
|
||||||
|
+<li>The current directory if enabled by the
|
||||||
|
+<a href="#P-_switch"><code>-P</code> switch</a>;
|
||||||
|
|
||||||
|
<li>The directories specified by <a href="#I_switch"><code>-I</code>
|
||||||
|
switches</a> in the command line, if any;
|
||||||
|
@@ -847,13 +847,10 @@ into the executable ;
|
||||||
|
directory or a list of directories separated by a character appropriate for
|
||||||
|
the operating system ("<code>:</code>" on Unix systems,
|
||||||
|
"<code>,</code>" on VMS systems, and
|
||||||
|
-"<code>;</code>" on MS Windows systems). We think that trying
|
||||||
|
-the current directory first is a very bad idea -- it opens serious security
|
||||||
|
-loopholes and can lead to very confusing errors if one has more than one
|
||||||
|
-version of Ghostscript in one's environment -- but when we attempted to
|
||||||
|
-change it, users insisted that we change it back. You can disable looking
|
||||||
|
-in the current directory first by using the
|
||||||
|
-<a href="#P_switch"><code>-P-</code> switch</a>.
|
||||||
|
+"<code>;</code>" on MS Windows systems).
|
||||||
|
+By default, Ghostscript no longer searches the current directory first
|
||||||
|
+but provides <a href="#P_switch"><code>-P</code> switch</a> for a degree
|
||||||
|
+of backward compatibility.
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Note that Ghostscript does not use this file searching algorithm for the
|
||||||
|
@@ -2061,14 +2058,14 @@ for library files.
|
||||||
|
<dl>
|
||||||
|
<dt><a name="P_switch"></a><code>-P</code>
|
||||||
|
<dd>Makes Ghostscript look first in the current directory for library
|
||||||
|
-files. This is currently the default.
|
||||||
|
+files.
|
||||||
|
</dl>
|
||||||
|
|
||||||
|
<dl>
|
||||||
|
<dt><a name="P-_switch"></a><code>-P-</code>
|
||||||
|
<dd>Makes Ghostscript <b><em>not</em></b> look first in the current
|
||||||
|
directory for library files (unless, of course, the first explicitly
|
||||||
|
-supplied directory is "<code>.</code>").
|
||||||
|
+supplied directory is "<code>.</code>"). This is now the default.
|
||||||
|
</dl>
|
||||||
|
|
||||||
|
<h4><a name="Parameters"></a>Setting parameters</h4>
|
||||||
|
diff -up ghostscript-8.71/man/gs.1.SEARCH_HERE_FIRST ghostscript-8.71/man/gs.1
|
||||||
|
--- ghostscript-8.71/man/gs.1.SEARCH_HERE_FIRST 2010-02-10 18:17:48.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/man/gs.1 2010-08-25 14:00:12.562143368 +0100
|
||||||
|
@@ -208,6 +208,12 @@ whereas \fB\-sname=35\fR is equivalent t
|
||||||
|
.br
|
||||||
|
/name (35) def
|
||||||
|
.TP
|
||||||
|
+.B \-P
|
||||||
|
+Makes Ghostscript to look first in the current directory for library files.
|
||||||
|
+By default, Ghostscript no longer looks in the current directory,
|
||||||
|
+unless, of course, the first explicitly supplied directory is "." in \fB-I\fR.
|
||||||
|
+See also the \fBINITIALIZATION FILES\fR section below, and bundled
|
||||||
|
+\fBUse.htm\fR for detailed discussion on search paths and how Ghostcript finds files.
|
||||||
|
.B \-q
|
||||||
|
Quiet startup: suppress normal startup messages, and also do the
|
||||||
|
equivalent of \fB\-dQUIET\fR.
|
||||||
|
diff -up ghostscript-8.71/psi/msvc32.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/msvc32.mak
|
||||||
|
--- ghostscript-8.71/psi/msvc32.mak.SEARCH_HERE_FIRST 2010-02-02 18:14:37.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/psi/msvc32.mak 2010-08-25 14:00:12.594142799 +0100
|
||||||
|
@@ -100,13 +100,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
!ifndef SEARCH_HERE_FIRST
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
!endif
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
diff -up ghostscript-8.71/psi/os2.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/os2.mak
|
||||||
|
--- ghostscript-8.71/psi/os2.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/psi/os2.mak 2010-08-25 14:00:12.621143319 +0100
|
||||||
|
@@ -54,12 +54,9 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini
|
||||||
|
|
||||||
|
# Define whether or not searching for initialization files should always
|
||||||
|
# look in the current directory first. This leads to well-known security
|
||||||
|
-# and confusion problems, but users insist on it.
|
||||||
|
-# NOTE: this also affects searching for files named on the command line:
|
||||||
|
-# see the "File searching" section of Use.htm for full details.
|
||||||
|
-# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
|
||||||
|
+# and confusion problems, but may be convenient sometimes.
|
||||||
|
|
||||||
|
-SEARCH_HERE_FIRST=1
|
||||||
|
+SEARCH_HERE_FIRST=0
|
||||||
|
|
||||||
|
# Define the name of the interpreter initialization file.
|
||||||
|
# (There is no reason to change this.)
|
||||||
|
diff -up ghostscript-8.71/toolbin/msvcxml.bat.SEARCH_HERE_FIRST ghostscript-8.71/toolbin/msvcxml.bat
|
||||||
|
--- ghostscript-8.71/toolbin/msvcxml.bat.SEARCH_HERE_FIRST 2009-01-26 17:16:47.000000000 +0000
|
||||||
|
+++ ghostscript-8.71/toolbin/msvcxml.bat 2010-08-25 14:00:12.631143783 +0100
|
||||||
|
@@ -1428,7 +1428,7 @@ echo ^<UserMacro Name="GS_DOCDIR" Valu
|
||||||
|
echo ^<UserMacro Name="GS_INIT" Value="gs_init.ps" /^>
|
||||||
|
echo ^<UserMacro Name="GS_LIB_DEFAULT" Value="$(GSROOTDIR)/lib;$(GSROOTDIR)/Resource/Font;$(AROOTDIR)/fonts" /^>
|
||||||
|
echo ^<UserMacro Name="GS_REVISION" Value="$(GS_VERSION)" /^>
|
||||||
|
-echo ^<UserMacro Name="SEARCH_HERE_FIRST" Value="1" /^>
|
||||||
|
+echo ^<UserMacro Name="SEARCH_HERE_FIRST" Value="0" /^>
|
||||||
|
echo ^</VisualStudioPropertySheet^>
|
||||||
|
goto end
|
||||||
|
|
||||||
@ -1,361 +0,0 @@
|
|||||||
diff -up ghostscript-8.70/lib/bdftops.gs-executable ghostscript-8.70/lib/bdftops
|
|
||||||
--- ghostscript-8.70/lib/bdftops.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/bdftops 2009-08-03 17:53:20.569875831 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
|
|
||||||
+exec "$gs" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/dumphint.gs-executable ghostscript-8.70/lib/dumphint
|
|
||||||
--- ghostscript-8.70/lib/dumphint.gs-executable 2009-01-04 20:11:57.000000000 +0000
|
|
||||||
+++ ghostscript-8.70/lib/dumphint 2009-08-03 17:53:20.570875283 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONS="-dSAFER -dDELAYSAFER"
|
|
||||||
@@ -27,4 +26,4 @@ if [ $# -ne 1 ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
|
|
||||||
+exec "$gs" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
|
|
||||||
diff -up ghostscript-8.70/lib/eps2eps.gs-executable ghostscript-8.70/lib/eps2eps
|
|
||||||
--- ghostscript-8.70/lib/eps2eps.gs-executable 2009-01-10 22:11:18.000000000 +0000
|
|
||||||
+++ ghostscript-8.70/lib/eps2eps 2009-08-03 17:53:20.573877995 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
OPTIONS="-dDEVICEWIDTH=250000 -dDEVICEHEIGHT=250000"
|
|
||||||
while true
|
|
||||||
@@ -26,4 +25,4 @@ if [ $# -ne 2 ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
|
|
||||||
+exec "$gs" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
|
|
||||||
diff -up ghostscript-8.70/lib/font2c.gs-executable ghostscript-8.70/lib/font2c
|
|
||||||
--- ghostscript-8.70/lib/font2c.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/font2c 2009-08-03 17:53:20.576874823 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gsbj.gs-executable ghostscript-8.70/lib/gsbj
|
|
||||||
--- ghostscript-8.70/lib/gsbj.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gsbj 2009-08-03 17:53:20.579874829 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
+exec "$gs" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gsdj500.gs-executable ghostscript-8.70/lib/gsdj500
|
|
||||||
--- ghostscript-8.70/lib/gsdj500.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gsdj500 2009-08-03 17:53:20.582874574 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
+exec "$gs" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gsdj.gs-executable ghostscript-8.70/lib/gsdj
|
|
||||||
--- ghostscript-8.70/lib/gsdj.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gsdj 2009-08-03 17:53:20.585875161 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
+exec "$gs" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gslj.gs-executable ghostscript-8.70/lib/gslj
|
|
||||||
--- ghostscript-8.70/lib/gslj.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gslj 2009-08-03 17:53:20.588874966 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
+exec "$gs" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gslp.gs-executable ghostscript-8.70/lib/gslp
|
|
||||||
--- ghostscript-8.70/lib/gslp.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gslp 2009-08-03 17:53:20.591874666 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
+exec "$gs" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/gsnd.gs-executable ghostscript-8.70/lib/gsnd
|
|
||||||
--- ghostscript-8.70/lib/gsnd.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/gsnd 2009-08-03 17:53:20.594874682 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -dNODISPLAY "$@"
|
|
||||||
+exec "$gs" -dNODISPLAY "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/pdf2dsc.gs-executable ghostscript-8.70/lib/pdf2dsc
|
|
||||||
--- ghostscript-8.70/lib/pdf2dsc.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pdf2dsc 2009-08-03 17:53:20.597874954 +0100
|
|
||||||
@@ -11,9 +11,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
me=`basename $0`
|
|
||||||
|
|
||||||
@@ -31,5 +30,5 @@ pdffile=$1
|
|
||||||
dscfile=$2
|
|
||||||
: ${dscfile:=`echo $pdffile | sed 's,\.[^/.]*,,'`.dsc}
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
|
|
||||||
+exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
|
|
||||||
-sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
|
|
||||||
diff -up ghostscript-8.70/lib/pdf2ps.gs-executable ghostscript-8.70/lib/pdf2ps
|
|
||||||
--- ghostscript-8.70/lib/pdf2ps.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pdf2ps 2009-08-03 17:53:20.601874677 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
OPTIONS=""
|
|
||||||
while true
|
|
||||||
@@ -35,4 +34,4 @@ fi
|
|
||||||
# Doing an initial 'save' helps keep fonts from being flushed between pages.
|
|
||||||
# We have to include the options twice because -I only takes effect if it
|
|
||||||
# appears before other options.
|
|
||||||
-exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
|
|
||||||
+exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
|
|
||||||
diff -up ghostscript-8.70/lib/pdfopt.gs-executable ghostscript-8.70/lib/pdfopt
|
|
||||||
--- ghostscript-8.70/lib/pdfopt.gs-executable 2008-05-25 03:17:14.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pdfopt 2009-08-03 17:53:20.604874898 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
OPTIONS="-dSAFER -dDELAYSAFER"
|
|
||||||
while true
|
|
||||||
@@ -26,4 +25,4 @@ if [ $# -ne 2 ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
|
|
||||||
+exec "$gs" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
|
|
||||||
diff -up ghostscript-8.70/lib/pf2afm.gs-executable ghostscript-8.70/lib/pf2afm
|
|
||||||
--- ghostscript-8.70/lib/pf2afm.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pf2afm 2009-08-03 17:53:20.608874740 +0100
|
|
||||||
@@ -10,8 +10,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER -- pf2afm.ps "$@"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER -- pf2afm.ps "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/pfbtopfa.gs-executable ghostscript-8.70/lib/pfbtopfa
|
|
||||||
--- ghostscript-8.70/lib/pfbtopfa.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pfbtopfa 2009-08-03 17:53:20.612874691 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
if [ $# -eq 2 ]
|
|
||||||
then
|
|
||||||
@@ -22,4 +21,4 @@ else
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
|
|
||||||
diff -up ghostscript-8.70/lib/pphs.gs-executable ghostscript-8.70/lib/pphs
|
|
||||||
--- ghostscript-8.70/lib/pphs.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/pphs 2009-08-03 17:53:20.616874647 +0100
|
|
||||||
@@ -9,8 +9,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pphs.ps "$@"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -- pphs.ps "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/printafm.gs-executable ghostscript-8.70/lib/printafm
|
|
||||||
--- ghostscript-8.70/lib/printafm.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/printafm 2009-08-03 17:53:20.619874766 +0100
|
|
||||||
@@ -9,8 +9,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- printafm.ps "$@"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -- printafm.ps "$@"
|
|
||||||
diff -up ghostscript-8.70/lib/ps2epsi.gs-executable ghostscript-8.70/lib/ps2epsi
|
|
||||||
--- ghostscript-8.70/lib/ps2epsi.gs-executable 2009-04-07 11:20:02.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/ps2epsi 2009-08-03 17:54:48.355750266 +0100
|
|
||||||
@@ -6,9 +6,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
# try to create a temporary file securely
|
|
||||||
if test -z "$TMPDIR"; then
|
|
||||||
@@ -50,7 +49,7 @@ else
|
|
||||||
outfile=$2
|
|
||||||
fi
|
|
||||||
|
|
||||||
-"$GS_EXECUTABLE" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
|
|
||||||
+"$gs" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
|
|
||||||
|
|
||||||
ls -l "${infile}" |
|
|
||||||
awk 'F==1 {
|
|
||||||
@@ -92,7 +91,7 @@ awk 'F==1 {
|
|
||||||
}
|
|
||||||
' F=1 - F=2 "${outfile}" >>"$tmpfile"
|
|
||||||
|
|
||||||
-"$GS_EXECUTABLE" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
|
|
||||||
+"$gs" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
|
|
||||||
rm -f "$tmpfile"
|
|
||||||
rm -rf "$tmpdir"
|
|
||||||
|
|
||||||
diff -up ghostscript-8.70/lib/ps2pdfwr.gs-executable ghostscript-8.70/lib/ps2pdfwr
|
|
||||||
--- ghostscript-8.70/lib/ps2pdfwr.gs-executable 2009-01-10 22:11:18.000000000 +0000
|
|
||||||
+++ ghostscript-8.70/lib/ps2pdfwr 2009-08-03 17:53:20.626874926 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
OPTIONS="-dSAFER"
|
|
||||||
while true
|
|
||||||
@@ -42,4 +41,4 @@ fi
|
|
||||||
|
|
||||||
# We have to include the options twice because -I only takes effect if it
|
|
||||||
# appears before other options.
|
|
||||||
-exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
|
|
||||||
+exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
|
|
||||||
diff -up ghostscript-8.70/lib/ps2ps.gs-executable ghostscript-8.70/lib/ps2ps
|
|
||||||
--- ghostscript-8.70/lib/ps2ps.gs-executable 2009-01-10 22:11:18.000000000 +0000
|
|
||||||
+++ ghostscript-8.70/lib/ps2ps 2009-08-03 17:53:20.630875037 +0100
|
|
||||||
@@ -7,9 +7,8 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
OPTIONS="-dSAFER"
|
|
||||||
while true
|
|
||||||
@@ -27,4 +26,4 @@ if [ $# -ne 2 ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
|
|
||||||
+exec "$gs" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
|
|
||||||
diff -up ghostscript-8.70/lib/wftopfa.gs-executable ghostscript-8.70/lib/wftopfa
|
|
||||||
--- ghostscript-8.70/lib/wftopfa.gs-executable 2007-07-05 20:04:29.000000000 +0100
|
|
||||||
+++ ghostscript-8.70/lib/wftopfa 2009-08-03 17:53:20.633874780 +0100
|
|
||||||
@@ -6,8 +6,7 @@
|
|
||||||
GS_EXECUTABLE=gs
|
|
||||||
gs="`dirname $0`/$GS_EXECUTABLE"
|
|
||||||
if test ! -x "$gs"; then
|
|
||||||
- gs="$GS_EXECUTABLE"
|
|
||||||
+ gs="$gs"
|
|
||||||
fi
|
|
||||||
-GS_EXECUTABLE="$gs"
|
|
||||||
|
|
||||||
-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- wftopfa.ps "$@"
|
|
||||||
+exec "$gs" -q -dNODISPLAY -- wftopfa.ps "$@"
|
|
||||||
@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
|
|||||||
Name: ghostscript
|
Name: ghostscript
|
||||||
Version: %{gs_ver}
|
Version: %{gs_ver}
|
||||||
|
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
|
|
||||||
# Included CMap data is Redistributable, no modification permitted,
|
# Included CMap data is Redistributable, no modification permitted,
|
||||||
# see http://bugzilla.redhat.com/487510
|
# see http://bugzilla.redhat.com/487510
|
||||||
@ -24,7 +24,6 @@ Patch5: ghostscript-runlibfileifexists.patch
|
|||||||
Patch6: ghostscript-system-jasper.patch
|
Patch6: ghostscript-system-jasper.patch
|
||||||
Patch7: ghostscript-pksmraw.patch
|
Patch7: ghostscript-pksmraw.patch
|
||||||
Patch8: ghostscript-jbig2dec-nullderef.patch
|
Patch8: ghostscript-jbig2dec-nullderef.patch
|
||||||
Patch9: ghostscript-gs-executable.patch
|
|
||||||
Patch10: ghostscript-cups-filters.patch
|
Patch10: ghostscript-cups-filters.patch
|
||||||
Patch11: ghostscript-CVE-2009-4270.patch
|
Patch11: ghostscript-CVE-2009-4270.patch
|
||||||
Patch12: ghostscript-vsnprintf.patch
|
Patch12: ghostscript-vsnprintf.patch
|
||||||
@ -37,6 +36,7 @@ Patch18: ghostscript-tiff-default-strip-size.patch
|
|||||||
Patch19: ghostscript-tiff-fixes.patch
|
Patch19: ghostscript-tiff-fixes.patch
|
||||||
Patch20: ghostscript-CVE-2010-1628.patch
|
Patch20: ghostscript-CVE-2010-1628.patch
|
||||||
Patch21: ghostscript-jbig2-image-refcount.patch
|
Patch21: ghostscript-jbig2-image-refcount.patch
|
||||||
|
Patch22: ghostscript-SEARCH_HERE_FIRST.patch
|
||||||
|
|
||||||
Requires: urw-fonts >= 1.1, ghostscript-fonts
|
Requires: urw-fonts >= 1.1, ghostscript-fonts
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
@ -135,9 +135,6 @@ rm -rf libpng zlib jpeg jasper
|
|||||||
# Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
|
# Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
|
||||||
%patch8 -p1 -b .jbig2dec-nullderef
|
%patch8 -p1 -b .jbig2dec-nullderef
|
||||||
|
|
||||||
# Fix scripts so they don't get broken on install (bug #502550).
|
|
||||||
%patch9 -p1 -b .gs-executable
|
|
||||||
|
|
||||||
# Install CUPS filter convs files in the correct place.
|
# Install CUPS filter convs files in the correct place.
|
||||||
%patch10 -p1 -b .cups-filters
|
%patch10 -p1 -b .cups-filters
|
||||||
|
|
||||||
@ -175,6 +172,10 @@ rm -rf libpng zlib jpeg jasper
|
|||||||
# Avoid another NULL pointer dereference in jbig2 code (bug #621569).
|
# Avoid another NULL pointer dereference in jbig2 code (bug #621569).
|
||||||
%patch21 -p1 -b .jbig2-image-refcount
|
%patch21 -p1 -b .jbig2-image-refcount
|
||||||
|
|
||||||
|
# Change SEARCH_HERE_FIRST default to make -P- default instead of -P
|
||||||
|
# (bug #599564).
|
||||||
|
%patch22 -p1 -b .SEARCH_HERE_FIRST
|
||||||
|
|
||||||
# Convert manual pages to UTF-8
|
# Convert manual pages to UTF-8
|
||||||
from8859_1() {
|
from8859_1() {
|
||||||
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
|
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
|
||||||
@ -354,6 +355,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libgs.so
|
%{_libdir}/libgs.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 25 2010 Tim Waugh <twaugh@redhat.com> 8.71-9
|
||||||
|
- Change SEARCH_HERE_FIRST default to make -P- default instead of -P
|
||||||
|
(bug #599564).
|
||||||
|
- Removed redundant gs-executable patch (bug #502550).
|
||||||
|
|
||||||
* Thu Aug 5 2010 Tim Waugh <twaugh@redhat.com> 8.71-11
|
* Thu Aug 5 2010 Tim Waugh <twaugh@redhat.com> 8.71-11
|
||||||
- Avoid another NULL pointer dereference in jbig2 code (bug #621569).
|
- Avoid another NULL pointer dereference in jbig2 code (bug #621569).
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user