[Pkg-cups-devel] r750 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/patches
Martin Pitt
mpitt at alioth.debian.org
Sun Apr 6 15:37:48 UTC 2008
Author: mpitt
Date: Sun Apr 6 15:37:48 2008
New Revision: 750
Log:
merge to trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-wait-eintr.dpatch (contents, props changed)
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/patches/cgiCompileSearch_buffer_overflow.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/pbmprint.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/testsuite-exit-code.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/ (props changed)
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/control
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.files
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Sun Apr 6 15:37:48 2008
@@ -1,3 +1,36 @@
+cupsys (1.3.7-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge new upstream bug fix release from unstable.
+ - Fixes CUPS GIF image filter overflow [CVE-2008-1373]. (LP: #210718)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 02 Apr 2008 11:16:39 +0200
+
+cupsys (1.3.7-1) unstable; urgency=medium
+
+ * Urgency medium due to security fix.
+ * New upstream bugfix/security update release. For a detailled list of
+ changes see http://www.cups.org/articles.php?L537.
+ - CUPS GIF image filter overflow [CVE-2008-1373, STR #2765].
+ * Drop patches which are now upstream:
+ - cgiCompileSearch_buffer_overflow.dpatch
+ - testsuite-exit-code.dpatch
+ - pbmprint.dpatch
+ * search_mime_files_in_usr_share.dpatch: Drop log message about missing
+ /usr/share/cups/mime/ from error to info, since it is not really an
+ error, and causing the test suite to fail due to error log count mismatch.
+ * pdftops-cups-1.4.dpatch: Apply r7391 from SVN head to fix missing error
+ message newlines (STR #2743).
+ * debian/rules: Remove cleaning of test suite HTML reports in test/, they
+ are written to /tmp now.
+ * Add pdftops-wait-eintr.dpatch: Handle EINTR in pdftops' wait() call.
+ (Caught by test suite.)
+ * debian/libcupsys2-dev.files: Drop i18n.h, it's an internal interface and
+ not installed by upstream any more.
+ * debian/control: Add poppler-utils | xpdf-utils build dependency, so that
+ the test suite works during build.
+
+ -- Martin Pitt <mpitt at debian.org> Wed, 02 Apr 2008 11:03:37 +0200
+
cupsys (1.3.6-3ubuntu1) hardy; urgency=low
* Merge recent bug fixes and security fix from Debian unstable.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control Sun Apr 6 15:37:48 2008
@@ -4,7 +4,7 @@
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
Standards-Version: 3.7.3
-Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev | heimdal-dev, libavahi-compat-libdnssd-dev
+Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev | heimdal-dev, libavahi-compat-libdnssd-dev, poppler-utils | xpdf-utils
Uploaders: Kenshi Muto <kmuto at debian.org>, Martin Pitt <mpitt at debian.org>, Roger Leigh <rleigh at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Masayuki Hatta (mhatta) <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>
Vcs-Svn: svn://svn.debian.org/svn/pkg-cups/cupsys/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cups/cupsys/trunk
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.files
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.files (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.files Sun Apr 6 15:37:48 2008
@@ -12,5 +12,4 @@
usr/include/cups/ppd.h
usr/include/cups/transcode.h
usr/include/cups/adminutil.h
-usr/include/cups/i18n.h
usr/share/man/man1/cups-config.1.gz
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Sun Apr 6 15:37:48 2008
@@ -1,4 +1,3 @@
-cgiCompileSearch_buffer_overflow
freebsd.dpatch
removecvstag.dpatch
pam.dpatch
@@ -14,8 +13,7 @@
include_krb5_h_in_job_h.dpatch
search_mime_files_in_usr_share.dpatch
pdftops-cups-1.4.dpatch
-pbmprint.dpatch
-testsuite-exit-code.dpatch
+pdftops-wait-eintr.dpatch
+ppd-poll-with-client-conf.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-default-error-policy-retry-job.dpatch
-ppd-poll-with-client-conf.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch Sun Apr 6 15:37:48 2008
@@ -9,7 +9,7 @@
@DPATCH@
diff -urNad trunk~/filter/Makefile trunk/filter/Makefile
--- trunk~/filter/Makefile 2007-07-20 01:27:49.000000000 +0200
-+++ trunk/filter/Makefile 2008-03-16 20:18:42.000000000 +0100
++++ trunk/filter/Makefile 2008-04-02 00:52:41.000000000 +0200
@@ -19,7 +19,7 @@
@@ -40,7 +40,7 @@
# rastertolabel
diff -urNad trunk~/filter/pdftops.c trunk/filter/pdftops.c
--- trunk~/filter/pdftops.c 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/filter/pdftops.c 2008-03-16 20:18:42.000000000 +0100
++++ trunk/filter/pdftops.c 2008-04-02 00:52:41.000000000 +0200
@@ -0,0 +1,314 @@
+/*
+ * "$Id$"
@@ -317,7 +317,7 @@
+ pdfstatus = WEXITSTATUS(pdfstatus);
+
+ fprintf(stderr,
-+ _("ERROR: pdftops filter exited with status %d!"),
++ _("ERROR: pdftops filter exited with status %d!\n"),
+ pdfstatus);
+ }
+ else
@@ -325,7 +325,7 @@
+ pdfstatus = WTERMSIG(pdfstatus);
+
+ fprintf(stderr,
-+ _("ERROR: pdftops filter crashed on signal %d!"),
++ _("ERROR: pdftops filter crashed on signal %d!\n"),
+ pdfstatus);
+ }
+ }
@@ -357,14 +357,14 @@
+ * End of "$Id$".
+ */
diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
---- trunk~/test/run-stp-tests.sh 2008-03-16 20:18:42.000000000 +0100
-+++ trunk/test/run-stp-tests.sh 2008-03-16 20:18:50.000000000 +0100
-@@ -238,7 +238,7 @@
- ln -s $root/filter/rastertoepson /tmp/cups-$user/bin/filter
- ln -s $root/filter/rastertohp /tmp/cups-$user/bin/filter
- ln -s $root/filter/texttops /tmp/cups-$user/bin/filter
--ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
-+ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
+--- trunk~/test/run-stp-tests.sh 2008-04-02 00:52:38.000000000 +0200
++++ trunk/test/run-stp-tests.sh 2008-04-02 00:53:23.000000000 +0200
+@@ -273,7 +273,7 @@
+ else
+ ln -s $root/filter/imagetops /tmp/cups-$user/bin/filter
+ ln -s $root/filter/imagetoraster /tmp/cups-$user/bin/filter
+- ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
++ ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
+ fi
- ln -s $root/data/classified /tmp/cups-$user/share/banners
- ln -s $root/data/confidential /tmp/cups-$user/share/banners
+ #
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-wait-eintr.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-wait-eintr.dpatch Sun Apr 6 15:37:48 2008
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pdftops-wait-eintr.dpatch by <mpitt at debian.org>
+##
+## DP: Handle EINTR in pdftops' wait() call.
+## DP: Forwarded upstream to http://www.cups.org/str.php?L2780.
+
+ at DPATCH@
+diff -urNad trunk~/filter/pdftops.c trunk/filter/pdftops.c
+--- trunk~/filter/pdftops.c 2008-04-02 02:54:45.000000000 +0200
++++ trunk/filter/pdftops.c 2008-04-02 02:54:59.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <cups/i18n.h>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <errno.h>
+
+
+ /*
+@@ -62,6 +63,7 @@
+ char *pdfargv[100], /* Arguments for pdftops */
+ pdfwidth[255], /* Paper width */
+ pdfheight[255]; /* Paper height */
++ pid_t child; /* wait() result */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+ struct sigaction action; /* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+@@ -260,8 +262,13 @@
+ /*
+ * Parent comes here...
+ */
++
++ do
++ {
++ child = wait(&pdfstatus);
++ } while (child < 0 && errno == EINTR);
+
+- if (wait(&pdfstatus) != pdfpid)
++ if (child != pdfpid)
+ {
+ kill(pdfpid, SIGTERM);
+ pdfstatus = 1;
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch Sun Apr 6 15:37:48 2008
@@ -31,7 +31,7 @@
+ MimeDatabase = mimeLoad(temp2, temp);
+ if (!MimeDatabase)
+ {
-+ cupsdLogMessage(CUPSD_LOG_ERROR,
++ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Unable to load MIME database from \'%s\'!", temp2);
+ }
+
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Sun Apr 6 15:37:48 2008
@@ -41,7 +41,6 @@
clean::
rm -f man/client.conf.man packaging/cups.list
rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
- rm -f test/cups-str*.html
common-install-prehook-impl::
(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
More information about the Pkg-cups-devel
mailing list