[Pkg-gmagick-svn-commit] r73 - in trunk/debian: . patches

[naoliv at alioth.debian.org]

Author: naoliv
Date: 2008-12-21 18:22:11 +0000 (Sun, 21 Dec 2008)
New Revision: 73

Added:
   trunk/debian/patches/CVE-2008-1096.patch
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/imagemagick.docs
   trunk/debian/patches/series
   trunk/debian/rules
Log:
Merge latest release from testing and unstable


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-12-21 17:43:57 UTC (rev 72)
+++ trunk/debian/changelog	2008-12-21 18:22:11 UTC (rev 73)
@@ -1,12 +1,28 @@
-imagemagick (7:6.3.7.9.dfsg1-3) UNRELEASED; urgency=low
+imagemagick (7:6.3.7.9.dfsg1-3~lenny1) testing-proposed-updates; urgency=low
 
-  * Fix ImageMagick's README.txt encoding (Closes: #465717)
-  * debian/control:
-    - replace build-depends libz-dev -> zlib1g-dev;
-    - remove versioned build-depends on libpng12-dev.
+  * Upload to testing-proposed-updates.
 
- -- Nelson A. de Oliveira <naoliv at debian.org>  Fri, 07 Mar 2008 17:25:06 -0300
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Wed, 10 Dec 2008 20:30:02 -0200
 
+imagemagick (7:6.3.7.9.dfsg1-3) unstable; urgency=low
+
+  * Include missing config files (LP: #303477).
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Wed, 10 Dec 2008 08:12:08 -0200
+
+imagemagick (7:6.3.7.9.dfsg1-2.1+lenny1) testing-proposed-updates; urgency=high
+
+  * Reupload to tpu
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Wed, 12 Nov 2008 00:07:36 +0100
+
+imagemagick (7:6.3.7.9.dfsg1-2.1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team:
+  * Fix CVE-2008-1096 (patch taken from Red Hat)
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Sat, 11 Oct 2008 00:17:21 +0200
+
 imagemagick (7:6.3.7.9.dfsg1-2) unstable; urgency=low
 
   * Upload to unstable;

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-12-21 17:43:57 UTC (rev 72)
+++ trunk/debian/control	2008-12-21 18:22:11 UTC (rev 73)
@@ -4,7 +4,7 @@
 Maintainer: Luciano Bello <luciano at debian.org>
 Uploaders: Daniel Kobras <kobras at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
 Standards-Version: 3.7.3
-Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, zlib1g-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper (>= 5), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev, ghostscript, pkg-config, quilt
+Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, libz-dev, libpng12-dev (<= 1.2.8rel-7) | libpng12-dev (>= 1.2.15~beta5-0), libx11-dev, libxt-dev, libxext-dev, debhelper (>= 5), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev, ghostscript, pkg-config, quilt
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gmagick/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gmagick/
 Homepage: http://www.imagemagick.org/

Modified: trunk/debian/imagemagick.docs
===================================================================
--- trunk/debian/imagemagick.docs	2008-12-21 17:43:57 UTC (rev 72)
+++ trunk/debian/imagemagick.docs	2008-12-21 18:22:11 UTC (rev 73)
@@ -1 +1,2 @@
+QuickStart.txt
 README.txt

Added: trunk/debian/patches/CVE-2008-1096.patch
===================================================================
--- trunk/debian/patches/CVE-2008-1096.patch	                        (rev 0)
+++ trunk/debian/patches/CVE-2008-1096.patch	2008-12-21 18:22:11 UTC (rev 73)
@@ -0,0 +1,11 @@
+--- imagemagick-6.3.7.9.dfsg1/coders/xcf.c	2008-01-29 12:08:30.000000000 +1000
++++ imagemagick-6.3.7.9.dfsg1/coders/xcf.c	2008-02-07 15:06:49.000000000 +1000
+@@ -556,6 +558,8 @@ static int load_level (Image* image, XCF
+                       /* 1.5 is probably more
+                          than we need to allow */
+ 
++      if (offset2-offset >  (MagickOffsetType) (TILE_WIDTH * TILE_WIDTH * 4* 1.5))
++	ThrowBinaryException(CorruptImageError,"CorruptImage",image->filename);
+       /* seek to the tile offset */
+       (void) SeekBlob(image, offset, SEEK_SET);
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2008-12-21 17:43:57 UTC (rev 72)
+++ trunk/debian/patches/series	2008-12-21 18:22:11 UTC (rev 73)
@@ -1,3 +1,3 @@
 add_dfsg_free_logo.patch
 manpages.patch
-readme-utf8.patch
+CVE-2008-1096.patch
\ No newline at end of file

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-12-21 17:43:57 UTC (rev 72)
+++ trunk/debian/rules	2008-12-21 18:22:11 UTC (rev 73)
@@ -111,7 +111,7 @@
 	-find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
 
 	# These files are already included in the doc dir.
-	-rm -r "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)
+	-rm "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)/*
 
 # Use x-terninal emulator for editing (Bug #132947)	
 #
@@ -138,8 +138,8 @@
 
 clean-tarball: 
 	# Nuke logo binaries
-	rm -f images/configure.jpg images/logo.jpg images/logo.eps \
-		images/examples.jpg images/t-shirt.png www/Magick++/ImageMagick.png
+	rm -f images/configure.jpg images/logo.jpg images/logo.eps images/examples.jpg \
+		www/Magick++/ImageMagick.png
 	# Nuke the LogoImage define
 	perl -pi -e 'BEGIN{undef $$/;} s/LogoImage\[\]\s+=\s+\{[^\}]+\}/LogoImage[] = {}/s' \
 		coders/magick.c