Hello community,
here is the log from the commit of package cups
checked in at Fri Apr 25 16:01:35 CEST 2008.
--------
--- cups/cups.changes 2008-04-11 11:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups/cups.changes 2008-04-22 20:27:53.348789000 +0200
@@ -1,0 +2,15 @@
+Tue Apr 22 20:24:19 CEST 2008 - kssingvo@suse.de
+
+- new version of pdftops filter from svn extracted
+- changed the perror() calls in pdftops.c for cups-1.3.x compatibility
+- fixed the ghostscript call via new variable (unnecessary -> removed)
+- grabbed and applied the wait() fix for childs from cups STR
+
+-------------------------------------------------------------------
+Wed Apr 16 12:06:57 CEST 2008 - kssingvo@suse.de
+
+- fix for integer overflow in png filter CVE-2008-1722 (bugzilla#378335)
+- not affected: CVE-2008-1693 (bugzilla#377872)
+- added /usr/bin/pdftops to Requires:, and poppler-tools to Suggests:
+
+-------------------------------------------------------------------
Old:
----
cups-1.4svn-pdftops_wait_eintr.patch
New:
----
cups-1.3.7-filter_png_overflow.patch
cups-1.4svn-pdftops_dont_fail_on_cancel.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.q29252/_old 2008-04-25 15:59:13.000000000 +0200
+++ /var/tmp/diff_new_pack.q29252/_new 2008-04-25 15:59:13.000000000 +0200
@@ -22,10 +22,11 @@
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.7
-Release: 8
+Release: 11
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
-Requires: util-linux
+Requires: util-linux /usr/bin/pdftops
+Suggests: poppler-tools
Conflicts: plp lprold lprng
Source0: cups-%{version}-source.tar.bz2
Source1: poll_ppd_base.c
@@ -63,9 +64,10 @@
Patch16: cups-1.2.5-desktop_file.patch
Patch17: cups-1.3.3-testppd_none.patch
Patch18: cups-1.4svn-pdftops_as_filter.patch
-# next is found as http://www.cups.org/strfiles/2780/pdftops-wait-eintr.dpatch
-Patch19: cups-1.4svn-pdftops_wait_eintr.patch
-Patch20: cups-hardcode_pdftops.patch
+Patch19: cups-hardcode_pdftops.patch
+Patch20: cups-1.3.7-filter_png_overflow.patch
+# next is found as http://www.cups.org/strfiles/2808/str2808.patch
+Patch21: cups-1.4svn-pdftops_dont_fail_on_cancel.patch
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -146,7 +148,7 @@
%prep
%setup -n %{name}-%{version}
%{INSTALL_DATA} %{SOURCE22} filter/pdftops.c
-# just to make avoid misunderstandings...
+# just to avoid misunderstandings...
mv pdftops pdftos.use_filter_pdftops_c
%patch1 -p1
%patch2 -p1
@@ -163,8 +165,9 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
-%patch20
+%patch19
+%patch20 -p1
+%patch21 -p1
if [ -f /.buildenv ]; then
. /.buildenv
else
@@ -420,6 +423,15 @@
%{_datadir}/locale/*/cups_*
%changelog
+* Tue Apr 22 2008 kssingvo@suse.de
+- new version of pdftops filter from svn extracted
+- changed the perror() calls in pdftops.c for cups-1.3.x compatibility
+- fixed the ghostscript call via new variable (unnecessary -> removed)
+- grabbed and applied the wait() fix for childs from cups STR
+* Wed Apr 16 2008 kssingvo@suse.de
+- fix for integer overflow in png filter CVE-2008-1722 (bugzilla#378335)
+- not affected: CVE-2008-1693 (bugzilla#377872)
+- added /usr/bin/pdftops to Requires:, and poppler-tools to Suggests:
* Fri Apr 11 2008 ro@suse.de
- explicitly specify pdftops binary for configure to avoid
adding buildrequires just for a binary path
++++++ cups-1.3.7-filter_png_overflow.patch ++++++
--- cups-1.3.7/filter/image-png.c.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/filter/image-png.c 2008-04-16 12:04:14.000000000 +0200
@@ -170,16 +170,56 @@
* Interlaced images must be loaded all at once...
*/
+ size_t bufsize; /* Size of buffer */
+
+
if (color_type == PNG_COLOR_TYPE_GRAY ||
color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
- in = malloc(img->xsize * img->ysize);
+ {
+ bufsize = img->xsize * img->ysize;
+
+ if ((bufsize / img->ysize) != img->xsize)
+ {
+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
+ (unsigned)width, (unsigned)height);
+ fclose(fp);
+ return (1);
+ }
+ }
else
- in = malloc(img->xsize * img->ysize * 3);
+ {
+ bufsize = img->xsize * img->ysize * 3;
+
+ if ((bufsize / (img->ysize * 3)) != img->xsize)
+ {
+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
+ (unsigned)width, (unsigned)height);
+ fclose(fp);
+ return (1);
+ }
+ }
+
+ in = malloc(bufsize);
}
bpp = cupsImageGetDepth(img);
out = malloc(img->xsize * bpp);
+ if (!in || !out)
+ {
+ fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
+
+ if (in)
+ free(in);
+
+ if (out)
+ free(out);
+
+ fclose(fp);
+
+ return (1);
+ }
+
/*
* Read the image, interlacing as needed...
*/
++++++ cups-1.4svn-pdftops_as_filter.patch ++++++
--- /var/tmp/diff_new_pack.q29252/_old 2008-04-25 15:59:14.000000000 +0200
+++ /var/tmp/diff_new_pack.q29252/_new 2008-04-25 15:59:14.000000000 +0200
@@ -99,9 +99,20 @@
/*
* Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
---- cups-1.3.7/filter/pdftops.c.orig 2008-04-09 18:23:35.000000000 +0200
-+++ cups-1.3.7/filter/pdftops.c 2008-04-09 18:33:53.000000000 +0200
-@@ -115,7 +115,7 @@
+--- cups-1.3.7/Makefile.orig 2008-02-16 00:26:51.000000000 +0100
++++ cups-1.3.7/Makefile 2008-04-09 19:08:39.000000000 +0200
+@@ -20,7 +20,7 @@
+ #
+
+ DIRS = cups backend berkeley cgi-bin filter locale man monitor \
+- notifier $(PDFTOPS) scheduler systemv test \
++ notifier scheduler systemv test \
+ $(PHPDIR) \
+ conf data doc $(FONTS) ppd templates
+
+--- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:18:35.000000000 +0200
++++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:22:09.000000000 +0200
+@@ -126,7 +126,7 @@ main(int argc, /* I - Number of comm
if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
{
@@ -110,32 +121,39 @@
return (1);
}
-@@ -245,7 +245,7 @@
- */
+@@ -299,10 +299,10 @@ main(int argc, /* I - Number of comm
+ #ifdef HAVE_PDFTOPS
execv(CUPS_PDFTOPS, pdfargv);
-- _cupsLangPrintError(_("ERROR: Unable to execute pdftops filter"));
-+ perror(_("ERROR: Unable to execute pdftops filter"));
+- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
++ perror("ERROR: Unable to execute pdftops program");
+ #else
+ execv(CUPS_GHOSTSCRIPT, pdfargv);
+- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
++ perror("ERROR: Unable to execute gs program");
+ #endif /* HAVE_PDFTOPS */
+
exit(1);
- }
- else if (pdfpid < 0)
-@@ -254,7 +254,7 @@
- * Unable to fork!
+@@ -314,9 +314,9 @@ main(int argc, /* I - Number of comm
*/
-- _cupsLangPrintError(_("ERROR: Unable to execute pdftops filter"));
-+ perror(_("ERROR: Unable to execute pdftops filter"));
- pdfstatus = 1;
- }
- else
---- cups-1.3.7/Makefile.orig 2008-02-16 00:26:51.000000000 +0100
-+++ cups-1.3.7/Makefile 2008-04-09 19:08:39.000000000 +0200
-@@ -20,7 +20,7 @@
- #
+ #ifdef HAVE_PDFTOPS
+- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
++ perror("ERROR: Unable to execute pdftops program");
+ #else
+- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
++ perror("ERROR: Unable to execute gs program");
+ #endif /* HAVE_PDFTOPS */
- DIRS = cups backend berkeley cgi-bin filter locale man monitor \
-- notifier $(PDFTOPS) scheduler systemv test \
-+ notifier scheduler systemv test \
- $(PHPDIR) \
- conf data doc $(FONTS) ppd templates
+ pdfstatus = 1;
+--- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:24:15.000000000 +0200
++++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:26:20.000000000 +0200
+@@ -301,7 +301,7 @@ main(int argc, /* I - Number of comm
+ execv(CUPS_PDFTOPS, pdfargv);
+ perror("ERROR: Unable to execute pdftops program");
+ #else
+- execv(CUPS_GHOSTSCRIPT, pdfargv);
++ execv("/bin/sgs", pdfargv);
+ perror("ERROR: Unable to execute gs program");
+ #endif /* HAVE_PDFTOPS */
++++++ cups-1.4svn-pdftops.c ++++++
--- cups/cups-1.4svn-pdftops.c 2008-03-21 22:24:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/cups/cups-1.4svn-pdftops.c 2008-04-14 20:27:53.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: pdftops.c 7391 2008-03-21 21:24:18Z mike $"
+ * "$Id: pdftops.c 7449 2008-04-14 18:27:53Z mike $"
*
* PDF to PostScript filter front-end for the Common UNIX Printing
* System (CUPS).
@@ -28,6 +28,7 @@
#include