diffstat of debian/ for libxml2_2.7.8.dfsg-5.1 libxml2_2.7.8.dfsg-5.1ubuntu4 changelog | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ compat | 2 +- control | 24 ++++++++++++++++++++++-- libxml2-dev.install | 8 ++++---- libxml2-udeb.install | 2 +- libxml2.install | 2 +- rules | 10 +++++++--- 7 files changed, 86 insertions(+), 12 deletions(-) diff -u libxml2-2.7.8.dfsg/debian/libxml2.install libxml2-2.7.8.dfsg/debian/libxml2.install --- libxml2-2.7.8.dfsg/debian/libxml2.install +++ libxml2-2.7.8.dfsg/debian/libxml2.install @@ -1 +1 @@ -usr/lib/libxml2.so.* +usr/lib/*/libxml2.so.* diff -u libxml2-2.7.8.dfsg/debian/rules libxml2-2.7.8.dfsg/debian/rules --- libxml2-2.7.8.dfsg/debian/rules +++ libxml2-2.7.8.dfsg/debian/rules @@ -45,7 +45,8 @@ build-python%: BUILD_DIR=build/main/$* build-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)' -build-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib" CFLAGS="-Wall -g -O0" +build-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \ + LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" CFLAGS="-Wall -g -O0" override_dh_auto_clean: rm -rf build debian/tmp-dbg @@ -102,7 +103,10 @@ dh_install -Npython-libxml2-dbg -Nlibxml2-udeb dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg dh_install -plibxml2-udeb --sourcedir=debian/tmp-udeb - sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la + sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxml2.la > \ + debian/libxml2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libxml2.la + # for multiarch xml2-config needs to be identical on all archs + sed -i -e 's,/usr/lib/$(DEB_HOST_MULTIARCH),/usr/lib,' debian/libxml2-dev/usr/bin/xml2-config override_dh_strip: dh_strip -a --dbg-package=libxml2-dbg -Npython-libxml2 -Npython-libxml2-dbg @@ -121 +125 @@ - dh --with python2 $@ + dh $@ --with python2 diff -u libxml2-2.7.8.dfsg/debian/libxml2-dev.install libxml2-2.7.8.dfsg/debian/libxml2-dev.install --- libxml2-2.7.8.dfsg/debian/libxml2-dev.install +++ libxml2-2.7.8.dfsg/debian/libxml2-dev.install @@ -1,7 +1,7 @@ usr/bin/xml2-config -usr/lib/libxml2.so -usr/lib/libxml2.a -usr/lib/xml2Conf.sh +usr/lib/*/libxml2.so +usr/lib/*/libxml2.a +usr/lib/*/xml2Conf.sh usr/share/aclocal -usr/lib/pkgconfig +usr/lib/*/pkgconfig usr/include/libxml2 diff -u libxml2-2.7.8.dfsg/debian/compat libxml2-2.7.8.dfsg/debian/compat --- libxml2-2.7.8.dfsg/debian/compat +++ libxml2-2.7.8.dfsg/debian/compat @@ -1 +1 @@ -7 +9 diff -u libxml2-2.7.8.dfsg/debian/control libxml2-2.7.8.dfsg/debian/control --- libxml2-2.7.8.dfsg/debian/control +++ libxml2-2.7.8.dfsg/debian/control @@ -1,10 +1,11 @@ Source: libxml2 Priority: optional Section: libs -Maintainer: Debian XML/SGML Group +Maintainer: Ubuntu Developers +XSBC-Original-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 +Build-Depends: debhelper (>= 8.1.3), 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), 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 @@ -15,6 +16,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xml-core +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: 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 @@ -30,6 +33,7 @@ Architecture: any Section: text Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign Description: XML utilities XML is a metalanguage to let you design your own markup language. A regular markup language defines a way to describe information in @@ -46,6 +50,7 @@ Architecture: any Section: libdevel Depends: libxml2 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Development files 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 @@ -125,0 +131,15 @@ +Package: libxml2-udeb +XC-Package-Type: udeb +Architecture: any +Section: debian-installer +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GNOME XML library - minimal runtime + XML is a metalanguage to let you design your own markup language. + A regular markup language defines a way to describe information in + a certain class of documents (eg HTML). XML lets you define your + own customized markup languages for many classes of document. It + can do this because it's written in SGML, the international standard + metalanguage for markup languages. + . + This is a minimal package for use in debian-installer that yields a + library providing an extensive API to handle such XML data files. diff -u libxml2-2.7.8.dfsg/debian/changelog libxml2-2.7.8.dfsg/debian/changelog --- libxml2-2.7.8.dfsg/debian/changelog +++ libxml2-2.7.8.dfsg/debian/changelog @@ -1,3 +1,44 @@ +libxml2 (2.7.8.dfsg-5.1ubuntu4) precise; urgency=low + + * SECURITY UPDATE: add randomization to dictionaries with hash tables + help prevent denial of service via hash algorithm collision + - configure.in: lookup for rand, srand and time + - dict.c: add randomization to dictionaries hash tables + - hash.c: add randomization to normal hash tables + - 8973d58b7498fa5100a876815476b81fd1a2412a + - CVE-2012-0841 + + -- Jamie Strandboge Tue, 28 Feb 2012 07:20:11 -0600 + +libxml2 (2.7.8.dfsg-5.1ubuntu3) precise; urgency=low + + * various fixes for __xmlRaiseError (LP: #686363). This can be dropped in + 2.7.8.dfsg-6 + - 111d705c282e03e7202723c6c7e4499f8582bd4f + - 1b9128bae737fa559f5e2c191d6679a856efbad9 + - 241d4a1069e6bedd0ee2295d7b43858109c1c6d1 + - c2a0fdc4e6d106690d7fd8fa1677e133c94e155d + + -- Jamie Strandboge Thu, 19 Jan 2012 11:59:30 -0600 + +libxml2 (2.7.8.dfsg-5.1ubuntu2) precise; urgency=low + + * SECURITY UPDATE: denial of service via buffer overflow + - parser.c: fix an allocation error when copying entities + - 5bd3c061823a8499b27422aee04ea20aae24f03e + - CVE-2011-3919 + + -- Jamie Strandboge Wed, 18 Jan 2012 13:03:04 -0600 + +libxml2 (2.7.8.dfsg-5.1ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - Build for multiarch. + - Use debhelper compat 9 instead of hardcoding --libdir. + - Move the udeb contents back into /usr/lib. + + -- Steve Langasek Thu, 12 Jan 2012 09:18:30 +0100 + libxml2 (2.7.8.dfsg-5.1) unstable; urgency=high * Non-maintainer upload. @@ -8,6 +49,15 @@ -- Luk Claes Fri, 30 Dec 2011 18:31:13 +0100 +libxml2 (2.7.8.dfsg-5ubuntu1) precise; urgency=low + + * Build for multiarch; thanks to Riku Voipio for the patch. + Closes: #643026. + * Use debhelper compat 9 instead of hardcoding --libdir. + * Move the udeb contents back into /usr/lib. + + -- Steve Langasek Wed, 19 Oct 2011 22:00:20 -0700 + libxml2 (2.7.8.dfsg-5) unstable; urgency=low * xpath.c, xpointer.c, include/libxml/xpath.h: Hardening of XPath evaluation. diff -u libxml2-2.7.8.dfsg/debian/libxml2-udeb.install libxml2-2.7.8.dfsg/debian/libxml2-udeb.install --- libxml2-2.7.8.dfsg/debian/libxml2-udeb.install +++ libxml2-2.7.8.dfsg/debian/libxml2-udeb.install @@ -1 +1 @@ -usr/lib/libxml2.so.* +usr/lib/*/libxml2.so.* usr/lib