From ba49ab606cb10ae2b9b9900fd361bf264988261c Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Wed, 15 Dec 2010 21:21:32 +0100 Subject: foomatic-filters 4.0.6-0ubuntu1 --- debian/changelog | 17 ++++++ debian/patches/series | 2 - debian/patches/strncpy-tochar-use-isempty.patch | 69 ------------------------- debian/patches/unhtmlify-segfault.patch | 56 -------------------- 4 files changed, 17 insertions(+), 127 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/strncpy-tochar-use-isempty.patch delete mode 100644 debian/patches/unhtmlify-segfault.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b100e16..7b8068a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +foomatic-filters (4.0.6-0ubuntu1) natty; urgency=low + + * New upstream release + - Allow length limitations for the job parameter strings inserted for + the special entities "&job;", "&user;", "&host;", "&title;", and + "&options;" in code snippets for the renderer command line. + - Make foomatic-rip determine correctly whether the input is PostScript + or PDF also if the input is preceded by PJL. + - Non-CUPS use: Do not blindly use the text filter requested by the + configuration file, check whether it is supported. + - Fixed several segfaults. + * debian/patches/strncpy-tochar-use-isempty.patch, + debian/patches/unhtmlify-segfault.patch: Removed patches with fixes + backported from upstream. + + -- Till Kamppeter Wed, 15 Dec 2010 20:49:03 +0100 + foomatic-filters (4.0.5-6) unstable; urgency=low [ Till Kamppeter ] diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 07477d4..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -strncpy-tochar-use-isempty.patch -unhtmlify-segfault.patch diff --git a/debian/patches/strncpy-tochar-use-isempty.patch b/debian/patches/strncpy-tochar-use-isempty.patch deleted file mode 100644 index 7fb83ac..0000000 --- a/debian/patches/strncpy-tochar-use-isempty.patch +++ /dev/null @@ -1,69 +0,0 @@ -=== modified file 'ChangeLog' ---- foomatic-filters/ChangeLog 2010-08-10 10:06:19 +0000 -+++ foomatic-filters/ChangeLog 2010-08-27 18:01:04 +0000 -@@ -1,3 +1,8 @@ -+2010-08-27 Till Kamppeter -+ -+ * util.c: In strncpy_tochar() use the isempty() function to check -+ whether the input string is empty (bug #514). -+ - 2010-08-10 Till Kamppeter - - * Tagged branch for release 4.0.5. -@@ -10,34 +15,36 @@ - page size in the prototype string for the custom page size - working. Before, only substitution of %0 and %1 worked reliably. - Thanks to Lutz Sammer (johns98 at web dot de) for reporting this -- problem. -+ problem (see also bug 514, comment #1). - - * options.c: Make custom page size settings also work if the custom - size is set via embedded PostScript code and the comment to mark - the selected option setting is only "%% FoomaticRIPOptionSetting: - PageSize=Custom", without the size and unit parameters. Thanks to -- Lutz Sammer for reporting this problem. -+ Lutz Sammer for reporting this problem (see also bug 514, comment #1). - - 2010-07-02 Till Kamppeter - - * spooler.c: Config file for the default printer in spooler-less - (direct) printing mode was not read correctly. Thanks to Lutz -- Sammer (johns98 at web dot de) for reporting this problem. -+ Sammer (johns98 at web dot de) for reporting this problem (see -+ also bug 514, comment #1). - - * spooler.c: Fixed error message output if a printer's PPD is missing - in spooler-less mode. There was a segfault due to the printer name - not specified in the _log() function call. Thanks to Lutz Sammer -- for reporting this problem. -+ for reporting this problem (see also bug 514, comment #1). - - * util.c: The isempty() function did not consider NULL as an empty - string. This caused segfaults when a string is considered non-empty - but in fact it is NULL. Thanks to Lutz Sammer for reporting this -- problem. -+ problem (see also bug 514, comment #1). - - * util.c: strncpy_tochar() did not check whether the input string - is empty and returned a pointer one character beyond the input - string, leading to segfaults in the code calling this function. -- Thanks to Lutz Sammer for reporting this problem. -+ Thanks to Lutz Sammer for reporting this problem (see also bug 514, -+ comment #1). - - 2010-06-08 Till Kamppeter - - -=== modified file 'util.c' ---- foomatic-filters/util.c 2010-07-02 15:57:09 +0000 -+++ foomatic-filters/util.c 2010-08-27 18:01:04 +0000 -@@ -272,7 +272,7 @@ - { - const char *psrc = src; - char *pdest = dest; -- if (!*psrc) { -+ if (isempty(psrc)) { - return NULL; - } - while (*psrc && --max > 0 && !strchr(stopchars, *psrc)) { - diff --git a/debian/patches/unhtmlify-segfault.patch b/debian/patches/unhtmlify-segfault.patch deleted file mode 100644 index c30875d..0000000 --- a/debian/patches/unhtmlify-segfault.patch +++ /dev/null @@ -1,56 +0,0 @@ -=== modified file 'ChangeLog' ---- foomatic-filters/ChangeLog 2010-08-27 18:01:04 +0000 -+++ foomatic-filters/ChangeLog 2010-08-27 23:41:04 +0000 -@@ -1,5 +1,10 @@ - 2010-08-27 Till Kamppeter - -+ * options.c: Made sure that the unhtmlify() function does not write -+ the zero byte to mark the string end beyond the buffer. Also use a -+ much larger buffer for parsing "*FoomaticRIPOptionPrototype:" in -+ the PPD file (bug #515). -+ - * util.c: In strncpy_tochar() use the isempty() function to check - whether the input string is empty (bug #514). - - -=== modified file 'options.c' ---- foomatic-filters/options.c 2010-07-07 21:49:47 +0000 -+++ foomatic-filters/options.c 2010-08-27 23:41:04 +0000 -@@ -1088,8 +1088,9 @@ - const char *repl; - struct tm *t = localtime(&job->time); - char tmpstr[10]; -+ size_t s; - -- while (*psrc && pdest - dest < size) { -+ while (*psrc && pdest - dest < size - 1) { - - if (*psrc == '&') { - psrc++; -@@ -1154,8 +1155,12 @@ - } - - if (repl) { -- strncpy(pdest, repl, size - (pdest - dest)); -- pdest += strlen(repl); -+ s = size - (pdest - dest) - 1; -+ strncpy(pdest, repl, s); -+ if (s < strlen(repl)) -+ pdest += s; -+ else -+ pdest += strlen(repl); - psrc = strchr(psrc, ';') +1; - } - else { -@@ -1601,8 +1606,8 @@ - /* "*FoomaticRIPOptionPrototype