Upload to squeeze-security

If t->bottom is close to MIN_INT (probably invalid value), subtracting
top can lead to underflow which causes crashes.  Attached patch will
fix the issue.

This fixes bug 67484.

(cherry picked from commit 5e14da97f1)

debian/changelog

@@ -1,10 +1,9 @@
-pixman (0.16.4-2) UNRELEASED; urgency=low
+pixman (0.16.4-1+deb6u1) squeeze-security; urgency=high
 
-  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+  * pixman_trapezoid_valid(): Fix underflow when bottom is close to MIN_INT
-    good reason.  Thanks, Colin Watson!
+    Addresses CVE-2013-6425
-  * Remove myself from Uploaders
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:36 +0000
+ -- Julien Cristau <jcristau@debian.org>  Mon, 16 Dec 2013 18:44:45 +0100
 
 pixman (0.16.4-1) unstable; urgency=low
 

debian/control

@@ -2,7 +2,7 @@ Source: pixman
 Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>
 Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config, quilt
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/pixman

debian/rules

@@ -34,8 +34,8 @@ autogen-stamp: $(QUILT_STAMPFN)
 config: config-stamp
 config-stamp: autogen-stamp
 	dh_testdir
-	test -d build || mkdir build
+	test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
-	cd build && \
+	cd obj-$(DEB_BUILD_GNU_TYPE) && \
 	../configure \
 	  --prefix=/usr \
 	  --mandir=\$${prefix}/share/man \
@@ -48,7 +48,7 @@ config-stamp: autogen-stamp
 build: build-stamp
 build-stamp: config-stamp
 	dh_testdir
-	cd build && $(MAKE)
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 	
 	touch $@
 
@@ -61,7 +61,7 @@ clean: unpatch
 	rm -f */config.cache */config.log */config.status
 	rm -f conftest* */conftest*
 	rm -rf autom4te.cache */autom4te.cache
-	rm -rf build
+	rm -rf obj-*
 	rm -f $$(find -name Makefile.in)
 	rm -f compile config.guess config.sub configure depcomp install-sh
 	rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in
@@ -75,7 +75,7 @@ install-stamp: build-stamp
 	dh_clean -k
 	dh_installdirs
 
-	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	touch $@
 
 # Install architecture-dependent files here.

pixman/pixman.h

@@ -838,7 +838,7 @@ struct pixman_trapezoid
 #define pixman_trapezoid_valid(t)				   \
     ((t)->left.p1.y != (t)->left.p2.y &&			   \
      (t)->right.p1.y != (t)->right.p2.y &&			   \
-     (int) ((t)->bottom - (t)->top) > 0)
+     ((t)->bottom > (t)->top))
 
 struct pixman_span_fix
 {