diffstat of debian/ for libxml2_2.9.1+dfsg1-3 libxml2_2.9.1+dfsg1-3ubuntu4 changelog | 82 +++++++++++++++++++++++ control | 22 +++++- patches/0006-fix-python-multiarch-includes.patch | 33 +++++++++ patches/series | 2 patches/xmllint_pretty.patch | 21 +++++ rules | 20 +++-- 6 files changed, 172 insertions(+), 8 deletions(-) diff -Nru libxml2-2.9.1+dfsg1/debian/changelog libxml2-2.9.1+dfsg1/debian/changelog --- libxml2-2.9.1+dfsg1/debian/changelog 2013-08-05 03:04:19.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/changelog 2014-02-23 13:48:26.000000000 +0000 @@ -1,3 +1,33 @@ +libxml2 (2.9.1+dfsg1-3ubuntu4) trusty; urgency=medium + + * Rebuild to drop files installed into /usr/share/pyshared. + + -- Matthias Klose Sun, 23 Feb 2014 13:48:26 +0000 + +libxml2 (2.9.1+dfsg1-3ubuntu3) trusty; urgency=low + + * Actually run dh_autoreconf, which the old/new mixed rules file misses. + + -- Adam Conrad Sun, 08 Dec 2013 02:23:52 -0700 + +libxml2 (2.9.1+dfsg1-3ubuntu2) saucy; urgency=low + + [ Tim Galeckas ] + * Fix SIGSEGV when --pretty is specified. LP: #923691 + + -- Dmitrijs Ledkovs Thu, 22 Aug 2013 21:34:37 +0100 + +libxml2 (2.9.1+dfsg1-3ubuntu1) saucy; urgency=low + + * Merge with Debian; remaining changes: + - Fix python multi-arch includes issues. + - Allow the package to cross-build. + - Set PYTHON_LIBS for cross builds. + - Remove explicit build dependency on binutils. + - Configure the udeb --without-python. + + -- Matthias Klose Sat, 17 Aug 2013 10:43:21 +0200 + libxml2 (2.9.1+dfsg1-3) unstable; urgency=low * debian/patches/0007-Fix-XPath-optimization-with-predicates.patch: @@ -5,6 +35,20 @@ -- Aron Xu Mon, 05 Aug 2013 11:02:43 +0800 +libxml2 (2.9.1+dfsg1-2ubuntu1) saucy; urgency=low + + * Merged from Debian unstable. Remaining changes: + - Fix python multi-arch includes issues. + - Allow the package to cross-build. + - Set PYTHON_LIBS for cross builds. + - Remove explicit build dependency on binutils. + - Configure the udeb --without-python. + * Dropped patches: + - CVE-2013-0338.patch: upstream + - CVE-2013-1969.patch: upstream + + -- Marc Deslauriers Thu, 11 Jul 2013 09:31:50 -0400 + libxml2 (2.9.1+dfsg1-2) unstable; urgency=low * Upload to unstable. @@ -24,6 +68,44 @@ -- Aron Xu Sun, 09 Jun 2013 00:34:16 +0800 +libxml2 (2.9.0+dfsg1-4ubuntu5) saucy; urgency=low + + * SECURITY UPDATE: multiple use after free issues + - debian/patches/CVE-2013-1969.patch: properly reset pointers in + HTMLparser.c, parser.c. + - CVE-2013-1969 + + -- Marc Deslauriers Tue, 07 May 2013 08:28:15 -0400 + +libxml2 (2.9.0+dfsg1-4ubuntu4) raring; urgency=low + + * SECURITY UPDATE: denial of service via entity expansion + - debian/patches/CVE-2013-0338.patch: limit number of entity expansions + in include/libxml/parser.h, parser.c, parserInternals.c. + - CVE-2013-0338 + + -- Marc Deslauriers Tue, 26 Mar 2013 10:04:58 -0400 + +libxml2 (2.9.0+dfsg1-4ubuntu3) raring; urgency=low + + * Set PYTHON_LIBS for cross builds. + * Remove explicit build dependency on binutils. + * Configure the udeb --without-python. + + -- Matthias Klose Thu, 07 Mar 2013 17:03:45 +0800 + +libxml2 (2.9.0+dfsg1-4ubuntu2) raring; urgency=low + + * Allow the package to cross-build. + + -- Matthias Klose Thu, 07 Mar 2013 15:46:38 +0800 + +libxml2 (2.9.0+dfsg1-4ubuntu1) raring; urgency=low + + * Fix python multi-arch includes issues. + + -- Chris J Arges Fri, 11 Jan 2013 13:10:08 -0600 + libxml2 (2.9.0+dfsg1-4) experimental; urgency=low [ Daniel Veillard ] diff -Nru libxml2-2.9.1+dfsg1/debian/control libxml2-2.9.1+dfsg1/debian/control --- libxml2-2.9.1+dfsg1/debian/control 2013-07-14 15:58:19.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/control 2013-08-17 08:47:23.000000000 +0000 @@ -1,11 +1,13 @@ Source: libxml2 Priority: optional Section: libs -Maintainer: Debian XML/SGML Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian XML/SGML Group Uploaders: Aron Xu , YunQiang Su Standards-Version: 3.9.4 Build-Depends: debhelper (>= 9), perl, dh-autoreconf, autotools-dev, - binutils (>= 2.14.90.0.7), python-all-dev (>= 2.6.6-3~), python-all-dbg, + libpython-all-dev (>= 2.6.6-3~), libpython-all-dbg, + python-all-dev:any (>= 2.6.6-3~), python-all-dbg:any, zlib1g-dev | libz-dev, liblzma-dev, libreadline-dev | libreadline6-dev Homepage: http://xmlsoft.org/ Vcs-Git: git://anonscm.debian.org/debian-xml-sgml/libxml2.git @@ -145,3 +147,19 @@ . This package contains the files needed to use the GNOME XML library in Python programs for use with the Python debug interpreter. + +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 -Nru libxml2-2.9.1+dfsg1/debian/patches/0006-fix-python-multiarch-includes.patch libxml2-2.9.1+dfsg1/debian/patches/0006-fix-python-multiarch-includes.patch --- libxml2-2.9.1+dfsg1/debian/patches/0006-fix-python-multiarch-includes.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/patches/0006-fix-python-multiarch-includes.patch 2013-08-17 08:47:23.000000000 +0000 @@ -0,0 +1,33 @@ +Description: fix python multi-arch include issues. + . + libxml2 (2.9.0+dfsg1-4ubuntu1) raring; urgency=low + . + * Fix python multi-arch includes issues. +Author: Chris J Arges + +Index: libxml2-2.9.1+dfsg1/python/Makefile.am +=================================================================== +--- libxml2-2.9.1+dfsg1.orig/python/Makefile.am 2013-07-11 10:00:34.032015469 -0400 ++++ libxml2-2.9.1+dfsg1/python/Makefile.am 2013-07-11 10:00:34.028015468 -0400 +@@ -19,7 +19,7 @@ + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ $(PYTHON_INCLUDES) + + python_LTLIBRARIES = libxml2mod.la + +Index: libxml2-2.9.1+dfsg1/python/Makefile.in +=================================================================== +--- libxml2-2.9.1+dfsg1.orig/python/Makefile.in 2013-07-11 10:00:34.032015469 -0400 ++++ libxml2-2.9.1+dfsg1/python/Makefile.in 2013-07-11 10:00:34.028015468 -0400 +@@ -430,7 +430,7 @@ + @WITH_PYTHON_TRUE@AM_CPPFLAGS = \ + @WITH_PYTHON_TRUE@ -I$(top_builddir)/include \ + @WITH_PYTHON_TRUE@ -I$(top_srcdir)/include \ +-@WITH_PYTHON_TRUE@ -I$(PYTHON_INCLUDES) ++@WITH_PYTHON_TRUE@ $(PYTHON_INCLUDES) + + @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la + @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c diff -Nru libxml2-2.9.1+dfsg1/debian/patches/series libxml2-2.9.1+dfsg1/debian/patches/series --- libxml2-2.9.1+dfsg1/debian/patches/series 2013-08-05 03:02:10.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/patches/series 2013-08-22 20:33:13.000000000 +0000 @@ -5,3 +5,5 @@ 0005-properly-quote-the-namespace-uris-written-out-during.patch 0006-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch 0007-Fix-XPath-optimization-with-predicates.patch +0006-fix-python-multiarch-includes.patch +xmllint_pretty.patch diff -Nru libxml2-2.9.1+dfsg1/debian/patches/xmllint_pretty.patch libxml2-2.9.1+dfsg1/debian/patches/xmllint_pretty.patch --- libxml2-2.9.1+dfsg1/debian/patches/xmllint_pretty.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/patches/xmllint_pretty.patch 2013-08-22 20:33:19.000000000 +0000 @@ -0,0 +1,21 @@ +--- a/xmllint.c ++++ b/xmllint.c +@@ -3375,11 +3375,13 @@ + (!strcmp(argv[i], "--pretty"))) { + i++; + #ifdef LIBXML_OUTPUT_ENABLED +- format = atoi(argv[i]); +- if (format == 1) { +- noblanks++; +- xmlKeepBlanksDefault(0); +- } ++ if (argv[i] != NULL) { ++ format = atoi(argv[i]); ++ if (format == 1) { ++ noblanks++; ++ xmlKeepBlanksDefault(0); ++ } ++ } + #endif /* LIBXML_OUTPUT_ENABLED */ + } + #ifdef LIBXML_READER_ENABLED diff -Nru libxml2-2.9.1+dfsg1/debian/rules libxml2-2.9.1+dfsg1/debian/rules --- libxml2-2.9.1+dfsg1/debian/rules 2013-07-14 15:58:19.000000000 +0000 +++ libxml2-2.9.1+dfsg1/debian/rules 2013-12-08 09:30:59.000000000 +0000 @@ -7,8 +7,10 @@ PYVER=$(shell pyversions -d) export DEB_BUILD_MAINT_OPTIONS=hardening=+all +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +CC = $(DEB_HOST_GNU_TYPE)-gcc CFLAGS = `dpkg-buildflags --get CFLAGS` -Wall LDFLAGS = `dpkg-buildflags --get LDFLAGS` -Wl,--as-needed CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` @@ -29,13 +31,16 @@ override_dh_auto_configure: $(TARGETS:%=doconfigure-%) -doconfigure-%: +debian/autoreconf.after: + dh_autoreconf + +doconfigure-%: debian/autoreconf.after dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS) doconfigure-main: CONFIGURE_FLAGS += --without-python doconfigure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$* -#doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output -doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-tree --with-output +#doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output --without-python +doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-tree --with-output --without-python override_dh_auto_build: $(TARGETS:%=dobuild-%) @@ -45,8 +50,11 @@ dh_auto_build --builddirectory=$(BUILD_DIR) -- $(BUILD_FLAGS) dobuild-python%: BUILD_DIR=builddir/main/$* -dobuild-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)' -dobuild-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \ +dobuild-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)' \ + PYTHON_INCLUDES="$(shell $(DEB_HOST_GNU_TYPE)-python-config --includes)" \ + PYTHON_LIBS="$(shell $(DEB_HOST_GNU_TYPE)-python-config --ldflags)" +dobuild-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES="$(shell $(DEB_HOST_GNU_TYPE)-python-dbg-config --includes)" \ + PYTHON_LIBS="$(shell $(DEB_HOST_GNU_TYPE)-python-dbg-config --ldflags)" \ CFLAGS="$(CFLAGS) -Wall -g -O0" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) \ -L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" build-arch: $(TARGETS:%=dobuild-%) @@ -82,7 +90,7 @@ doinstall-python%-dbg: $(MAKE) -C builddir/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES - prename 's/(?