pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/ghostscript/patches To-be-deleted file existed, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/be50ec13aa87
branches: trunk
changeset: 609664:be50ec13aa87
user: mef <mef%pkgsrc.org@localhost>
date: Mon Oct 08 05:40:11 2012 +0000
description:
To-be-deleted file existed, sorry, cvs delete them
diffstat:
print/ghostscript/patches/patch-aa | 13 --
print/ghostscript/patches/patch-ab | 13 --
print/ghostscript/patches/patch-ac | 30 -----
print/ghostscript/patches/patch-ad | 31 -----
print/ghostscript/patches/patch-ae | 214 -------------------------------------
print/ghostscript/patches/patch-ag | 13 --
print/ghostscript/patches/patch-ak | 196 ---------------------------------
print/ghostscript/patches/patch-am | 13 --
print/ghostscript/patches/patch-ba | 47 --------
print/ghostscript/patches/patch-bb | 50 --------
print/ghostscript/patches/patch-bc | 42 -------
print/ghostscript/patches/patch-bd | 98 ----------------
12 files changed, 0 insertions(+), 760 deletions(-)
diffs (truncated from 808 to 300 lines):
diff -r a14bfbde1b1d -r be50ec13aa87 print/ghostscript/patches/patch-aa
--- a/print/ghostscript/patches/patch-aa Mon Oct 08 01:58:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2010/03/04 11:16:27 tnn Exp $
-
---- base/gsnogc.c.orig 2009-11-25 19:59:11.000000000 +0000
-+++ base/gsnogc.c
-@@ -32,7 +32,7 @@ nogc_alloc_string(gs_memory_t * mem, uin
- static void
- nogc_free_string(gs_memory_t * mem, byte * str, uint size, client_name_t cname)
- {
-- return gs_free_object(mem, str, cname);
-+ gs_free_object(mem, str, cname);
- }
-
- static byte *
diff -r a14bfbde1b1d -r be50ec13aa87 print/ghostscript/patches/patch-ab
--- a/print/ghostscript/patches/patch-ab Mon Oct 08 01:58:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/02/12 19:51:08 drochner Exp $
-
---- base/unixinst.mak.orig 2007-08-14 22:48:29.000000000 +0200
-+++ base/unixinst.mak
-@@ -151,7 +151,7 @@ install-man: $(PSMANDIR)/gs.1
- ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
- done ;\
- fi ;\
-- if ( test -f $$man1dir/ps2lp.$(man1ext) ) ;\
-+ if ( test -f $$man1dir/gslp.$(man1ext) ) ;\
- then for f in $(MAN1_LINKS_GSLP) ;\
- do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\
- ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\
diff -r a14bfbde1b1d -r be50ec13aa87 print/ghostscript/patches/patch-ac
--- a/print/ghostscript/patches/patch-ac Mon Oct 08 01:58:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2010/03/04 11:16:27 tnn Exp $
-
---- base/gdevpx.c.orig 2009-12-12 03:45:55.000000000 +0000
-+++ base/gdevpx.c
-@@ -730,8 +730,10 @@ pclxl_write_image_data_DeltaRow(gx_devic
- "pclxl_write_image_data_DeltaRow(buf)");
- prow = gs_alloc_bytes(xdev->v_memory, width_bytes, "pclxl_write_image_data_DeltaRow(prow)");
- /* the RLE routine can write uncompressed without extra-allocation */
-- if ((buf == 0) || (prow == 0))
-- return pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
-+ if ((buf == 0) || (prow == 0)) {
-+ pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
-+ return;
-+ }
- /* initialize the seed row */
- memset(prow, 0, width_bytes);
- cdata = buf;
-@@ -760,8 +762,10 @@ pclxl_write_image_data(gx_device_pclxl *
- uint raster, uint width_bits, int y, int height)
- {
- /* If we only have 1 line, it does not make sense to do DeltaRow */
-- if (height < 2)
-- return pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
-+ if (height < 2) {
-+ pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
-+ return;
-+ }
-
- switch(xdev->CompressMode){
- case eDeltaRowCompression:
diff -r a14bfbde1b1d -r be50ec13aa87 print/ghostscript/patches/patch-ad
--- a/print/ghostscript/patches/patch-ad Mon Oct 08 01:58:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/08/08 17:32:07 joerg Exp $
-
---- lib/pv.sh.orig 2007-07-05 12:41:52.000000000 +0200
-+++ lib/pv.sh
-@@ -30,21 +30,13 @@ fi
- # executable name set in the makefile
- GS_EXECUTABLE=gs
-
--TEMPDIR=.
- PAGE=$1
- shift
- FILE="$1"
-+TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
- shift
--if test -z "$TEMPDIR"; then
-- TEMPDIR=/tmp
--fi
--if which mktemp >/dev/null 2>/dev/null; then
-- tmpfile="`mktemp $TEMPDIR/\"$FILE\".pv.XXXXXX`"
--else
-- tmpfile="$TEMPDIR/$FILE.$$.pv"
--fi
--trap "rm -rf $tmpfile" 0 1 2 15
--#dvips -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
--dvips -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
--$GS_EXECUTABLE $tmpfile
-+trap "rm -rf $TEMPFILE" 0 1 2 15
-+#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+gs $TEMPFILE
- exit 0
diff -r a14bfbde1b1d -r be50ec13aa87 print/ghostscript/patches/patch-ae
--- a/print/ghostscript/patches/patch-ae Mon Oct 08 01:58:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2010/11/23 11:10:16 tron Exp $
-
-Security patch for CVE-2010-2055 by Dr. Werner Fink taken from here:
-
-http://bugs.ghostscript.com/attachment.cgi?id=6449
-
---- psi/zfile.c.orig 2009-10-04 13:42:07.000000000 +0100
-+++ psi/zfile.c 2010-11-23 11:03:52.000000000 +0000
-@@ -902,6 +902,90 @@
- return 0;
- }
-
-+/* return zero for success, -ve for error, +1 for continue */
-+static int
-+lib_file_open_search_with_no_combine(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx_p,
-+ const char *fname, uint flen, char *buffer, int blen, uint *pclen, ref *pfile,
-+ gx_io_device *iodev, bool starting_arg_file, char *fmode)
-+{
-+ stream *s;
-+ uint blen1 = blen;
-+ if (gp_file_name_reduce(fname, flen, buffer, &blen1) != gp_combine_success)
-+ goto skip;
-+ if (iodev_os_open_file(iodev, (const char *)buffer, blen1,
-+ (const char *)fmode, &s, (gs_memory_t *)mem) == 0) {
-+ if (starting_arg_file ||
-+ check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-+ *pclen = blen1;
-+ make_stream_file(pfile, s, "r");
-+ return 0;
-+ }
-+ sclose(s);
-+ return_error(e_invalidfileaccess);
-+ }
-+ skip:;
-+ return 1;
-+}
-+
-+/* return zero for success, -ve for error, +1 for continue */
-+static int
-+lib_file_open_search_with_combine(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx_p,
-+ const char *fname, uint flen, char *buffer, int blen, uint *pclen, ref *pfile,
-+ gx_io_device *iodev, bool starting_arg_file, char *fmode)
-+{
-+ stream *s;
-+ const gs_file_path *pfpath = lib_path;
-+ uint pi;
-+
-+ for (pi = 0; pi < r_size(&pfpath->list); ++pi) {
-+ const ref *prdir = pfpath->list.value.refs + pi;
-+ const char *pstr = (const char *)prdir->value.const_bytes;
-+ uint plen = r_size(prdir), blen1 = blen;
-+ gs_parsed_file_name_t pname;
-+ gp_file_name_combine_result r;
-+
-+ /* We need to concatenate and parse the file name here
-+ * if this path has a %device% prefix. */
-+ if (pstr[0] == '%') {
-+ int code;
-+
-+ /* We concatenate directly since gp_file_name_combine_*
-+ * rules are not correct for other devices such as %rom% */
-+ code = gs_parse_file_name(&pname, pstr, plen);
-+ if (code < 0)
-+ continue;
-+ memcpy(buffer, pname.fname, pname.len);
-+ memcpy(buffer+pname.len, fname, flen);
-+ code = pname.iodev->procs.open_file(pname.iodev, buffer, pname.len + flen, fmode,
-+ &s, (gs_memory_t *)mem);
-+ if (code < 0)
-+ continue;
-+ make_stream_file(pfile, s, "r");
-+ /* fill in the buffer with the device concatenated */
-+ memcpy(buffer, pstr, plen);
-+ memcpy(buffer+plen, fname, flen);
-+ *pclen = plen + flen;
-+ return 0;
-+ } else {
-+ r = gp_file_name_combine(pstr, plen,
-+ fname, flen, false, buffer, &blen1);
-+ if (r != gp_combine_success)
-+ continue;
-+ if (iodev_os_open_file(iodev, (const char *)buffer, blen1, (const char *)fmode,
-+ &s, (gs_memory_t *)mem) == 0) {
-+ if (starting_arg_file ||
-+ check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-+ *pclen = blen1;
-+ make_stream_file(pfile, s, "r");
-+ return 0;
-+ }
-+ sclose(s);
-+ return_error(e_invalidfileaccess);
-+ }
-+ }
-+ }
-+ return 1;
-+}
-
- /* Return a file object of of the file searched for using the search paths. */
- /* The fname cannot contain a device part (%...%) but the lib paths might. */
-@@ -919,6 +1003,8 @@
- char fmode[4] = { 'r', 0, 0, 0 }; /* room for binary suffix */
- stream *s;
- gx_io_device *iodev = iodev_default;
-+ gs_main_instance *minst = get_minst_from_memory(mem);
-+ int code;
-
- /* when starting arg files (@ files) iodev_default is not yet set */
- if (iodev == 0)
-@@ -932,75 +1018,36 @@
- search_with_no_combine = starting_arg_file;
- search_with_combine = true;
- }
-- if (search_with_no_combine) {
-- uint blen1 = blen;
--
-- if (gp_file_name_reduce(fname, flen, buffer, &blen1) != gp_combine_success)
-- goto skip;
-- if (iodev_os_open_file(iodev, (const char *)buffer, blen1,
-- (const char *)fmode, &s, (gs_memory_t *)mem) == 0) {
-- if (starting_arg_file ||
-- check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-- *pclen = blen1;
-- make_stream_file(pfile, s, "r");
-- return 0;
-- }
-- sclose(s);
-- return_error(e_invalidfileaccess);
-- }
-- skip:;
-- }
-- if (search_with_combine) {
-- const gs_file_path *pfpath = lib_path;
-- uint pi;
--
-- for (pi = 0; pi < r_size(&pfpath->list); ++pi) {
-- const ref *prdir = pfpath->list.value.refs + pi;
-- const char *pstr = (const char *)prdir->value.const_bytes;
-- uint plen = r_size(prdir), blen1 = blen;
-- gs_parsed_file_name_t pname;
-- gp_file_name_combine_result r;
--
-- /* We need to concatenate and parse the file name here
-- * if this path has a %device% prefix. */
-- if (pstr[0] == '%') {
-- int code;
--
-- /* We concatenate directly since gp_file_name_combine_*
-- * rules are not correct for other devices such as %rom% */
-- code = gs_parse_file_name(&pname, pstr, plen);
-- if (code < 0)
-- continue;
-- memcpy(buffer, pname.fname, pname.len);
-- memcpy(buffer+pname.len, fname, flen);
-- code = pname.iodev->procs.open_file(pname.iodev, buffer, pname.len + flen, fmode,
-- &s, (gs_memory_t *)mem);
-- if (code < 0)
-- continue;
-- make_stream_file(pfile, s, "r");
-- /* fill in the buffer with the device concatenated */
-- memcpy(buffer, pstr, plen);
-- memcpy(buffer+plen, fname, flen);
-- *pclen = plen + flen;
-- return 0;
-- } else {
-- r = gp_file_name_combine(pstr, plen,
-- fname, flen, false, buffer, &blen1);
-- if (r != gp_combine_success)
-- continue;
-- if (iodev_os_open_file(iodev, (const char *)buffer, blen1, (const char *)fmode,
-- &s, (gs_memory_t *)mem) == 0) {
-- if (starting_arg_file ||
-- check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-- *pclen = blen1;
-- make_stream_file(pfile, s, "r");
-- return 0;
-- }
-- sclose(s);
-- return_error(e_invalidfileaccess);
-- }
-- }
-- }
-+ if (minst->search_here_first) {
-+ if (search_with_no_combine) {
-+ code = lib_file_open_search_with_no_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
-+ if (code <= 0) /* +ve means continue continue */
-+ return code;
-+ }
-+ if (search_with_combine) {
-+ code = lib_file_open_search_with_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
Home |
Main Index |
Thread Index |
Old Index