pixman: Changes to 'debian-squeeze'
debian/changelog | 9 ++++-----
debian/control | 2 +-
debian/rules | 10 +++++-----
debian/watch | 1 -
pixman/pixman.h | 2 +-
5 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 8b2eecfdff76a082b507ff4f0105c0b3cd872351
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 16 18:44:55 2013 +0100
Upload to squeeze-security
diff --git a/debian/changelog b/debian/changelog
index edf5ec6..91b42af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.16.4-1+deb6u1) squeeze-security; urgency=high
+
+ * pixman_trapezoid_valid(): Fix underflow when bottom is close to MIN_INT
+ Addresses CVE-2013-6425
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Dec 2013 18:44:45 +0100
+
pixman (0.16.4-1) unstable; urgency=low
* New upstream release.
commit 3740f56289c3b81ace1b748518b07e7cd46387fb
Author: Ritesh Khadgaray <khadgaray@gmail.com>
Date: Wed Oct 23 17:29:07 2013 -0400
pixman_trapezoid_valid(): Fix underflow when bottom is close to MIN_INT
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 5e14da97f16e421d084a9e735be21b1025150f0c)
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 5b90a0c..61a95c0 100644
--- a/pixman/pixman.h
+++ b/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
{
commit b2b9eac52cc8a009250839fb2666c17f4aac522f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 16 18:43:34 2013 +0100
Revert "Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!"
This reverts commit 57810f4228da7ac20e066369b0e0fdca5665be97.
diff --git a/debian/changelog b/debian/changelog
index 6cc8a9c..edf5ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-pixman (0.16.4-2) UNRELEASED; urgency=low
-
- * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
- good reason. Thanks, Colin Watson!
-
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:36 +0000
-
pixman (0.16.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 8319e0e..88ea93d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ autogen-stamp: $(QUILT_STAMPFN)
config: config-stamp
config-stamp: autogen-stamp
dh_testdir
- test -d build || mkdir build
- cd build && \
+ test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ 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.
commit 5a9ca107304a8f5667cd1d8a0cf564e3a7403bd0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 16 18:43:31 2013 +0100
Revert "Remove myself from Uploaders"
This reverts commit 1861775e1d470f0535cfd5fa5dc96634ca699fc9.
diff --git a/debian/changelog b/debian/changelog
index bbccbd1..6cc8a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ pixman (0.16.4-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
- * Remove myself from Uploaders
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:36 +0000
diff --git a/debian/control b/debian/control
index 5060e7a..55a80c9 100644
--- a/debian/control
+++ b/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
commit 93ededfcd213445049b3aef4effbf465e253c152
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 16 18:43:21 2013 +0100
Revert "Mention upstream git URL in a comment."
This reverts commit cae07cb0a6f7920a5b03d11824278ec8bf8ffce6.
diff --git a/debian/watch b/debian/watch
index 282b677..b83209f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-#git=git://anongit.freedesktop.org/pixman
version=3
http://xorg.freedesktop.org/releases/individual/lib/ pixman-(.*)\.tar\.gz
Reply to: