diffstat of debian/ for libxml2_2.7.8.dfsg-7 libxml2_2.7.8.dfsg-4 debian/pycompat | 1 libxml2-2.7.8.dfsg/debian/changelog | 56 +++++++++++------------------------- libxml2-2.7.8.dfsg/debian/rules | 17 +++++----- 3 files changed, 27 insertions(+), 47 deletions(-) --- libxml2-2.7.8.dfsg/debian/rules +++ libxml2-2.7.8.dfsg/debian/rules @@ -5,13 +5,12 @@ # The current default version of python PYVER=$(shell pyversions -d) -CFLAGS = `dpkg-buildflags --get CFLAGS` -CFLAGS += -Wall -LDFLAGS = `dpkg-buildflags --get LDFLAGS` -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` +CFLAGS = -Wall -g -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -fno-strict-aliasing +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 -fno-strict-aliasing endif TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg) @@ -26,7 +25,7 @@ export DH_OPTIONS = -Nlibxml2-udeb endif -CONFIGURE_FLAGS := --with-history CC="$(CC) -Wl,--as-needed" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/build/config.cache" +CONFIGURE_FLAGS := --with-history CC="gcc -Wl,--as-needed" CFLAGS="$(CFLAGS)" --cache-file="$(CURDIR)/build/config.cache" override_dh_auto_configure: $(TARGETS:%=configure-%) @@ -122 +121 @@ - dh --with python2 $@ + dh $@ --- libxml2-2.7.8.dfsg/debian/control +++ libxml2-2.7.8.dfsg/debian/control @@ -3,8 +3,8 @@ Section: libs Maintainer: Debian XML/SGML Group Uploaders: Mike Hommey -Standards-Version: 3.9.2.0 -Build-Depends: debhelper (>= 7.0.50~), zlib1g-dev | libz-dev, python-all-dev (>= 2.6.6-3~), python-all-dbg, autotools-dev, libreadline-dev | libreadline5-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.14.9), perl +Standards-Version: 3.9.0.0 +Build-Depends: debhelper (>= 7.0.50~), zlib1g-dev | libz-dev, python-all-dev (>= 2.3.5-11), python-all-dbg, python-support (>= 0.3), autotools-dev, libreadline-dev | libreadline5-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.14.9), perl Homepage: http://xmlsoft.org/ Vcs-Git: git://git.debian.org/debian-xml-sgml/libxml2.git Vcs-Browser: http://git.debian.org/?p=debian-xml-sgml/libxml2.git @@ -95,6 +95,7 @@ Section: python Provides: ${python:Provides} Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings for the GNOME XML library XML is a metalanguage to let you design your own markup language. A regular markup language defines a way to describe information in @@ -112,6 +113,7 @@ Priority: extra Provides: ${python:Provides} Depends: python-dbg, python-libxml2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings for the GNOME XML library (debug extension) XML is a metalanguage to let you design your own markup language. A regular markup language defines a way to describe information in --- libxml2-2.7.8.dfsg/debian/changelog +++ libxml2-2.7.8.dfsg/debian/changelog @@ -1,57 +1,37 @@ -libxml2 (2.7.8.dfsg-7) unstable; urgency=low +libxml2 (2.7.8.dfsg-4) unstable; urgency=low - * Team upload. - * parser.c: Fix an allocation error when copying entities. - CVE-2011-3919. Closes: #656377. + * Sync'd with Debian 2.7.8.dfsg-2+squeeze3 - -- Andrew O. Shadura Fri, 20 Jan 2012 12:54:41 +0300 + -- Alan Baghumian Wed, 29 Feb 2012 05:55:51 +0000 -libxml2 (2.7.8.dfsg-6) unstable; urgency=low +libxml2 (2.7.8.dfsg-2+squeeze3) stable-security; urgency=high - * Team upload. - * Enabled hardened build flags (Closes: #654903). - * error.c: Fix __xmlRaiseError (Closes: #622358). + * Non-maintainer upload by the Security Team. + * Apply upstream patch to add randomization to hashing with large + dictionaries to mitigate hash DoS (CVE-2012-0841; Closes: #660846). - -- Andrew O. Shadura Thu, 12 Jan 2012 00:57:32 +0300 + -- Nico Golde Wed, 22 Feb 2012 11:17:27 +0000 -libxml2 (2.7.8.dfsg-5.1) unstable; urgency=high +libxml2 (2.7.8.dfsg-2+squeeze2) stable-security; urgency=high - * Non-maintainer upload. - * encoding.c: Fix off by one error. CVE-2011-0216. + * Security update. + * parser.c: Fix an allocation error when copying entities. + CVE-2011-3919. Closes: #656377. * parser.c: Make sure parser returns when getting a Stop order. CVE-2011-3905. - * Both closes: #652352. - - -- Luk Claes Fri, 30 Dec 2011 18:31:13 +0100 - -libxml2 (2.7.8.dfsg-5) unstable; urgency=low - - * xpath.c, xpointer.c, include/libxml/xpath.h: Hardening of XPath evaluation. - CVE-2011-2821. + * encoding.c: Fix off by one error. CVE-2011-0216. Closes: 652352. * xpath.c: Fix for undefined namespaces. CVE-2011-2834. - * Both closes: #643648. - - -- Mike Hommey Fri, 07 Oct 2011 09:31:14 +0200 - -libxml2 (2.7.8.dfsg-4) unstable; urgency=low - - * debian/rules: Add --with python2 to dh call. - * debian/control: - - Remove build dependency on python-support. - - Build depend on python-all-dev >= 2.6.6-3~. - - Remove XB-Python-Version header. - - Bump Standards-Version to 3.9.2.0. No changes required. - * debian/pycompat: Removed. With the above changes, closes: #631416. - Thanks Colin Watson. + * xpath.c, xpointer.c, include/libxml/xpath.h: + Hardening of XPath evaluation. CVE-2011-2821. Closes: 643648. - -- Mike Hommey Fri, 29 Jul 2011 12:33:08 +0200 + -- Aron Xu Tue, 24 Jan 2012 03:25:23 +0800 -libxml2 (2.7.8.dfsg-3) unstable; urgency=low +libxml2 (2.7.8.dfsg-2+squeeze1) stable-security; urgency=low * xpath.c: Fix some potential problems on reallocation failures. Closes: #628537. - -- Mike Hommey Sat, 04 Jun 2011 10:40:39 +0900 + -- Mike Hommey Sat, 04 Jun 2011 10:40:06 +0900 libxml2 (2.7.8.dfsg-2) unstable; urgency=low --- libxml2-2.7.8.dfsg.orig/debian/pycompat +++ libxml2-2.7.8.dfsg/debian/pycompat @@ -0,0 +1 @@ +2