[Pkg-cups-devel] r737 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Tue Apr  1 23:11:46 2008
New Revision: 737

Log:
new upstream release 1.3.7

Removed:
   cupsys/trunk/debian/patches/cgiCompileSearch_buffer_overflow.dpatch
   cupsys/trunk/debian/patches/pbmprint.dpatch
   cupsys/trunk/debian/patches/testsuite-exit-code.dpatch
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Apr  1 23:11:46 2008
@@ -1,3 +1,15 @@
+cupsys (1.3.7-1) UNRELEASED; urgency=low
+
+  * 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
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 02 Apr 2008 00:42:25 +0200
+
 cupsys (1.3.6-3) unstable; urgency=high
 
   [ Till Kamppeter ]

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Tue Apr  1 23:11:46 2008
@@ -1,4 +1,3 @@
-cgiCompileSearch_buffer_overflow
 freebsd.dpatch
 removecvstag.dpatch
 pam.dpatch
@@ -14,8 +13,6 @@
 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
+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/trunk/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	(original)
+++ cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	Tue Apr  1 23:11:46 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$"
@@ -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
+ #