From 96a01073a92f40aff6f30474c54ed2cc4fbb89e5 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 10 Apr 2013 15:34:02 +0000 Subject: update to 4.0.17 changes: bugfixes pkgsrc note: The namespace problem fixed by patch-b* was reported upstream: https://bugs.linuxfoundation.org/show_bug.cgi?id=1095 --- print/foomatic4-filters/Makefile | 5 ++--- print/foomatic4-filters/distinfo | 14 ++++++++----- print/foomatic4-filters/patches/patch-ac | 32 ++++++++++++++++++++++++---- print/foomatic4-filters/patches/patch-ba | 32 ++++++++++++++++++++++++++++ print/foomatic4-filters/patches/patch-bb | 36 ++++++++++++++++++++++++++++++++ print/foomatic4-filters/patches/patch-bc | 13 ++++++++++++ print/foomatic4-filters/patches/patch-bd | 17 +++++++++++++++ 7 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 print/foomatic4-filters/patches/patch-ba create mode 100644 print/foomatic4-filters/patches/patch-bb create mode 100644 print/foomatic4-filters/patches/patch-bc create mode 100644 print/foomatic4-filters/patches/patch-bd (limited to 'print') diff --git a/print/foomatic4-filters/Makefile b/print/foomatic4-filters/Makefile index c2e2def44a2..bbc4ddac325 100644 --- a/print/foomatic4-filters/Makefile +++ b/print/foomatic4-filters/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2013/02/16 11:24:09 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2013/04/10 15:34:02 drochner Exp $ -DISTNAME= foomatic-filters-4.0.9 -PKGREVISION= 5 +DISTNAME= foomatic-filters-4.0.17 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/foomatic/ diff --git a/print/foomatic4-filters/distinfo b/print/foomatic4-filters/distinfo index 0aa0d1dcfab..06d1e6fe42e 100644 --- a/print/foomatic4-filters/distinfo +++ b/print/foomatic4-filters/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.5 2012/01/26 11:49:23 drochner Exp $ +$NetBSD: distinfo,v 1.6 2013/04/10 15:34:02 drochner Exp $ -SHA1 (foomatic-filters-4.0.9.tar.gz) = 8cf45fc32becbd7bc25ba72dc23032a019eaa29a -RMD160 (foomatic-filters-4.0.9.tar.gz) = 456230e48494a2f0f2161d0af3d45e1a5db26192 -Size (foomatic-filters-4.0.9.tar.gz) = 254831 bytes -SHA1 (patch-ac) = 5d1b3803fdf5fe0937c77114049f3728f6064ab3 +SHA1 (foomatic-filters-4.0.17.tar.gz) = bde0cf8bcc61cb1e7c894b7125348fb95efa8c60 +RMD160 (foomatic-filters-4.0.17.tar.gz) = e875ac0cd3c0ba0ba018499f4289c2044e6f52d4 +Size (foomatic-filters-4.0.17.tar.gz) = 266276 bytes +SHA1 (patch-ac) = 2d716c7ea045a0726e18d2283c210b7be0bd465f SHA1 (patch-ad) = 40f620a2f26d0872f87a2e332dd45853634ca5dc +SHA1 (patch-ba) = cad8b0f0e02ea8dce625484736d56e4f8a23c68e +SHA1 (patch-bb) = 53bb0db34e544a226a102d55a5e2d9171ed67575 +SHA1 (patch-bc) = 900567f02b574d24cdd539e68ae91ad7474b8c40 +SHA1 (patch-bd) = f7f2b611b2f3063d3a0ba5bb26fa00633431719a diff --git a/print/foomatic4-filters/patches/patch-ac b/print/foomatic4-filters/patches/patch-ac index 792b80f38c5..bd3af47b740 100644 --- a/print/foomatic4-filters/patches/patch-ac +++ b/print/foomatic4-filters/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2012/01/26 11:49:23 drochner Exp $ +$NetBSD: patch-ac,v 1.4 2013/04/10 15:34:02 drochner Exp $ ---- foomaticrip.c.orig 2011-07-25 21:29:09.000000000 +0000 +--- foomaticrip.c.orig 2012-07-02 14:50:46.000000000 +0000 +++ foomaticrip.c @@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo "/opt/cups/filter:" @@ -11,7 +11,31 @@ $NetBSD: patch-ac,v 1.3 2012/01/26 11:49:23 drochner Exp $ void config_set_option(const char *key, const char *value) { -@@ -1068,6 +1068,7 @@ int print_file(const char *filename, int +@@ -1014,7 +1014,7 @@ int print_file(const char *filename, int + + if (!ppd_supports_pdf()) + { +- char pdf2ps_cmd[PATH_MAX]; ++ char pdf2ps_cmd[FM_CMDLINE_MAX]; + FILE *out, *in; + int renderer_pid; + char tmpfilename[PATH_MAX] = ""; +@@ -1060,12 +1060,12 @@ int print_file(const char *filename, int + We give priority to Ghostscript here and use Poppler if + Ghostscript is not available. */ + if (spooler == SPOOLER_CUPS) +- snprintf(pdf2ps_cmd, PATH_MAX, ++ snprintf(pdf2ps_cmd, FM_CMDLINE_MAX, + "pdftops '%s' '%s' '%s' '%s' '%s' '%s'", + job->id, job->user, job->title, "1", job->optstr->data, + filename); + else +- snprintf(pdf2ps_cmd, PATH_MAX, ++ snprintf(pdf2ps_cmd, FM_CMDLINE_MAX, + "gs -q -sstdout=%%stderr -sDEVICE=ps2write -sOutputFile=- " + "-dBATCH -dNOPAUSE -dPARANOIDSAFER -dNOINTERPOLATE %s 2>/dev/null || " + "pdftops -level2 -origpagesizes %s - 2>/dev/null", +@@ -1076,6 +1076,7 @@ int print_file(const char *filename, int if (dup2(fileno(out), fileno(stdin)) < 0) rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS, "Couldn't dup stdout of pdf-to-ps\n"); @@ -19,7 +43,7 @@ $NetBSD: patch-ac,v 1.3 2012/01/26 11:49:23 drochner Exp $ ret = print_file("", 0); -@@ -1099,6 +1100,7 @@ int print_file(const char *filename, int +@@ -1107,6 +1108,7 @@ int print_file(const char *filename, int /* Read further data from the file converter and not from STDIN */ if (dup2(fileno(fchandle), fileno(stdin)) < 0) rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS, "Couldn't dup fileconverterhandle\n"); diff --git a/print/foomatic4-filters/patches/patch-ba b/print/foomatic4-filters/patches/patch-ba new file mode 100644 index 00000000000..77716e96cb7 --- /dev/null +++ b/print/foomatic4-filters/patches/patch-ba @@ -0,0 +1,32 @@ +$NetBSD: patch-ba,v 1.1 2013/04/10 15:34:02 drochner Exp $ + +avoid namespace problems + +--- foomaticrip.h.orig 2012-07-02 14:50:46.000000000 +0000 ++++ foomaticrip.h +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + /* This is the location of the debug logfile (and also the copy of the + * processed PostScript data) in case you have enabled debugging above. +@@ -93,7 +94,7 @@ + extern int spooler; + + +-#define PATH_MAX 65536 ++#define FM_CMDLINE_MAX 65536 + + typedef struct { + char printer[256]; +@@ -123,7 +124,7 @@ extern struct dstr *jclappend; + extern char **jclprepend; + extern int jobhasjcl; + extern const char *accounting_prolog; +-extern char fileconverter[PATH_MAX]; ++extern char fileconverter[FM_CMDLINE_MAX]; + extern char cupsfilterpath[PATH_MAX]; + extern int debug; + extern int do_docs; diff --git a/print/foomatic4-filters/patches/patch-bb b/print/foomatic4-filters/patches/patch-bb new file mode 100644 index 00000000000..a3ff8407423 --- /dev/null +++ b/print/foomatic4-filters/patches/patch-bb @@ -0,0 +1,36 @@ +$NetBSD: patch-bb,v 1.1 2013/04/10 15:34:02 drochner Exp $ + +--- fileconverter.c.orig 2012-07-02 14:50:46.000000000 +0000 ++++ fileconverter.c +@@ -43,19 +43,19 @@ const char *fileconverters[][2] = { + { NULL, NULL } + }; + +-char fileconverter[PATH_MAX] = ""; ++char fileconverter[FM_CMDLINE_MAX] = ""; + + void set_fileconverter(const char *fc) + { + int i; + for (i = 0; fileconverters[i][0]; i++) { + if (!strcmp(fc, fileconverters[i][0])) { +- strlcpy(fileconverter, fileconverters[i][1], PATH_MAX); ++ strlcpy(fileconverter, fileconverters[i][1], FM_CMDLINE_MAX); + break; + } + } + if (!fileconverters[i][0]) +- strlcpy(fileconverter, fc, PATH_MAX); ++ strlcpy(fileconverter, fc, FM_CMDLINE_MAX); + } + + int guess_fileconverter() +@@ -63,7 +63,7 @@ int guess_fileconverter() + int i; + for (i = 0; fileconverters[i][0]; i++) { + if (find_in_path(fileconverters[i][0], getenv("PATH"), NULL)) { +- strlcpy(fileconverter, fileconverters[i][1], PATH_MAX); ++ strlcpy(fileconverter, fileconverters[i][1], FM_CMDLINE_MAX); + return 1; + } + } diff --git a/print/foomatic4-filters/patches/patch-bc b/print/foomatic4-filters/patches/patch-bc new file mode 100644 index 00000000000..7a62c623a79 --- /dev/null +++ b/print/foomatic4-filters/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1 2013/04/10 15:34:02 drochner Exp $ + +--- spooler.c.orig 2012-07-02 14:50:46.000000000 +0000 ++++ spooler.c +@@ -308,7 +308,7 @@ void init_cups(list_t *arglist, dstr_t * + * PostScript by CUPS). */ + if (isempty(fileconverter)) { + if (find_in_path("texttops", cupsfilterpath, texttopspath)) { +- snprintf(fileconverter, PATH_MAX, "%s/texttops '%s' '%s' '%s' '%s' " ++ snprintf(fileconverter, FM_CMDLINE_MAX, "%s/texttops '%s' '%s' '%s' '%s' " + "page-top=36 page-bottom=36 page-left=36 page-right=36 " + "nolandscape cpi=12 lpi=7 columns=1 wrap %s'" + "| %s/pstops '%s' '%s' '%s' '%s' '%s'", diff --git a/print/foomatic4-filters/patches/patch-bd b/print/foomatic4-filters/patches/patch-bd new file mode 100644 index 00000000000..ee3e41e3c29 --- /dev/null +++ b/print/foomatic4-filters/patches/patch-bd @@ -0,0 +1,17 @@ +$NetBSD: patch-bd,v 1.1 2013/04/10 15:34:02 drochner Exp $ + +--- renderer.c.orig 2012-07-02 14:50:46.000000000 +0000 ++++ renderer.c +@@ -39,10 +39,10 @@ + */ + int test_gs_output_redirection() + { +- char gstestcommand[PATH_MAX]; ++ char gstestcommand[FM_CMDLINE_MAX]; + char output[10] = ""; + +- snprintf(gstestcommand, PATH_MAX, "%s -dQUIET -dPARANOIDSAFER -dNOPAUSE " ++ snprintf(gstestcommand, FM_CMDLINE_MAX, "%s -dQUIET -dPARANOIDSAFER -dNOPAUSE " + "-dBATCH -dNOMEDIAATTRS -sDEVICE=ps2write -sstdout=%%stderr " + "-sOutputFile=/dev/null -c '(hello\n) print flush' 2>&1", gspath); + -- cgit v1.2.3