diff options
63 files changed, 3756 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..29b4b7f --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,12 @@ +Notes about libxml2 +------------------- +While libxml2 is trying to fit at best the XML, XPath, XIncludes, etc. +standards, it is likely to contain implementation bugs which tend to +disappear with newer versions. +For this reason, if you are using libxml2 libraries or tools for standard +conforming development, it's suggested to upgrade libxml2 with newer +packages from either testing or unstable Debian repositories. +If you're using libxml2 in Gnome context, or similar case (ie. xml usage +not requiring heavy standards compliance), you don't need such upgrade. + +-- Mike Hommey <glandium@debian.org>, Sat Oct 16 14:29:43 JST 2004 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a2f9950 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,1725 @@ +libxml2 (2.9.1+dfsg1-4) unstable; urgency=low + + [ Christian Svensson ] + * Do not build-depend on readline (Closes: #742350) + + [ Daniel Schepler ] + * Patch to bootstrap without python (Closes: #738080) + + [ Helmut Grohne ] + * Drop unneeded B-D on perl and binutils (Closes: #753005) + + [ Adam Conrad ] + * Actually run dh_autoreconf, which the old/new mixed rules file misses. + + [ Matthias Klose ] + * Add patch to fix python multiarch issue + * Allow the package to cross-build by tweaking B-Ds on python + * Set PYTHON_LIBS for cross builds + + [ Aron Xu ] + * Use correct $CC + * Configure udeb without python + * New round of cherry-picking upstream fixes + - Includes fixes for CVE-2014-0191 (Closes: #747309). + * Call prename with -vf + * Require python-all-dev (>= 2.7.5-5~) + * Bump std-ver: 3.9.4 -> 3.9.5, no change + + -- Aron Xu <aron@debian.org> Wed, 09 Jul 2014 05:40:15 +0800 + +libxml2 (2.9.1+dfsg1-3) unstable; urgency=low + + * debian/patches/0007-Fix-XPath-optimization-with-predicates.patch: + - Upstream patch to fix XPath evaluation issue. (Closes: #713146) + + -- Aron Xu <aron@debian.org> Mon, 05 Aug 2013 11:02:43 +0800 + +libxml2 (2.9.1+dfsg1-2) unstable; urgency=low + + * Upload to unstable. + * debian/patches/000[2-6]-*.patch: + - cherry-picking upstream post-release fixes. + + -- Aron Xu <aron@debian.org> Mon, 17 Jun 2013 23:24:07 +0800 + +libxml2 (2.9.1+dfsg1-1) experimental; urgency=low + + * New upstream release (Closes: #696300, #705722). + * Add -llzma for static linking (Closes: #697382). + * Update symbols. + * Update debian/watch, thanks to Bart Martens. + * Use canonical Vcs-* fields. + * Mark python-libxml2-dbg as "Multi-Arch: same". + + -- Aron Xu <aron@debian.org> Sun, 09 Jun 2013 00:34:16 +0800 + +libxml2 (2.9.0+dfsg1-4) experimental; urgency=low + + [ Daniel Veillard ] + * Fix potential out of bound access + CVE-2012-5134, Closes: #694521. + + -- Aron Xu <aron@debian.org> Wed, 28 Nov 2012 22:34:15 +0800 + +libxml2 (2.9.0+dfsg1-3) experimental; urgency=low + + [ Aron Xu ] + * Remove -L/usr/lib from xml2-config, advise to use pkg-config + in man, and add pkg-config to Suggests. (Closes: #689168) + + [ YunQiang Su ] + * Fix python-libxml2 undefined symbol (Closes: #689191) + + [ Daniel Holbach ] + * Add simple autopkgtest to the package (Closes: #690047) + + -- Aron Xu <aron@debian.org> Sun, 28 Oct 2012 03:59:43 +0800 + +libxml2 (2.9.0+dfsg1-2) experimental; urgency=low + + * Fix a thread portability problem by cherry-picking upstream + patch (Closes: #688473). + + -- Aron Xu <aron@debian.org> Sun, 23 Sep 2012 16:50:12 +0800 + +libxml2 (2.9.0+dfsg1-1) experimental; urgency=low + + * New upstream release. + * Remove old patches applied upstream, cherry-pick one + upstream post release patch. + * Update symbols. + * Update std-ver 3.9.3 -> 3.9.4, no change required. + + -- Aron Xu <aron@debian.org> Fri, 21 Sep 2012 00:21:42 +0800 + +libxml2 (2.8.0+dfsg1-5) unstable; urgency=low + + [ Daniel Veillard ] + * Fix parser local buffers size problems + * Fix entities local buffers size problems + CVE-2012-2807, Closes: #679280. + + -- Aron Xu <aron@debian.org> Thu, 19 Jul 2012 17:11:09 +0800 + +libxml2 (2.8.0+dfsg1-4) unstable; urgency=low + + * Sanitize the output of `xml2-config --libs`. + + -- Aron Xu <aron@debian.org> Thu, 19 Jul 2012 17:10:06 +0800 + +libxml2 (2.8.0+dfsg1-3) unstable; urgency=low + + * Remove odd output of xml2-config --libs (Closes: #675682). + * Mark libxml2-dev "M-A: same" again, fixed xml2-config + (Closes: #674474). + + -- Aron Xu <aron@debian.org> Tue, 05 Jun 2012 01:44:14 +0800 + +libxml2 (2.8.0+dfsg1-2) unstable; urgency=low + + * debian/control: + - Remove "M-A: same" from libxml2-dev (Closes: #674474). + - Add "M-A: foreign" to libxml2-doc. + * debian/rules: + - Style change on calling dh using --with. + - Enable all hardening features. + - The sed command for removing DEB_HOST_MULTIARCH is not reverted + because it's generally a good idea to avoid it here. + * lintian-overrides: + - libxml2: package-name-doesnt-match-sonames + - python-libxml2-dbg: hardening-no-fortify-functions + + -- Aron Xu <aron@debian.org> Sat, 02 Jun 2012 15:09:37 +0800 + +libxml2 (2.8.0+dfsg1-1) unstable; urgency=low + + * New upstream release. (Closes: #148220, #590934) + * Adjust changelog of previous NMU (Closes: #674739). + * Try to avoid useless space in /usr/bin/xml-config (Closes: #674474). + + -- Aron Xu <aron@debian.org> Fri, 25 May 2012 04:06:35 +0000 + +libxml2 (2.7.8.dfsg-9.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix CVE-2011-3102: off by one pointer access in xpointer.c + (Closes: #674191). + + -- Michael Gilbert <mgilbert@debian.org> Wed, 23 May 2012 13:48:52 -0400 + +libxml2 (2.7.8.dfsg-9) unstable; urgency=low + + * Multi-Arch ready. (Closes: #643026) + - M-A:same packages are libxml2, libxml2-dev and libxml2-dbg. + - M-A:foreign package is libxml2-utils, others are not M-A. + - Library files in udeb are still placed under usr/lib directly. + * New binary: libxml2-utils-dbg. + Move debuggings symbols of libxml2-utils binaries to another package + in favor of marking libxml2-dbg as M-A: same. Descriptions of related + binary packages are slightly modified. + * Enable hardening for Python modules. (Closes: #664107) + * Add support for build-arch and build target, essentially make the + package not FTBFS anymore. (Closes: #668672) + * Use dh compat 9. Not hardcoding libdir in debian/rules. + * Port to source format 3.0 to ease future maintenance of patches. + - Old patches are stored in 01_historical_changes.patch + - Do not patch Makefile.in directly, use dh_autoreconf with patches to + configure.in and Makefile.am instead. This will not actually make + bootstraping a new architecture more difficult since we already have + gettext and autoconf in deep B-D, porters need to break it anyway. + - Store doc/examples/index.html in patch to avoid ciculate B-D with + xsltproc, we should not B-D on it. + * debian/*.dirs: removed, useless. + + -- Aron Xu <aron@debian.org> Sun, 22 Apr 2012 00:16:37 +0800 + +libxml2 (2.7.8.dfsg-8) unstable; urgency=high + + * New maintainer (Closes: #654176). + * Apply upstream patch to add randomization to hashing with large + dictionaries to mitigate hash DoS (CVE-2012-0841; Closes: #660846) + * Bump std-ver to 3.9.3, no change needed. + + -- Aron Xu <aron@debian.org> Thu, 12 Apr 2012 09:19:04 +0800 + +libxml2 (2.7.8.dfsg-7) unstable; urgency=low + + * Team upload. + * parser.c: Fix an allocation error when copying entities. + CVE-2011-3919. Closes: #656377. + + -- Andrew O. Shadura <bugzilla@tut.by> Fri, 20 Jan 2012 12:54:41 +0300 + +libxml2 (2.7.8.dfsg-6) unstable; urgency=low + + * Team upload. + * Enabled hardened build flags (Closes: #654903). + * error.c: Fix __xmlRaiseError (Closes: #622358). + + -- Andrew O. Shadura <bugzilla@tut.by> Thu, 12 Jan 2012 00:57:32 +0300 + +libxml2 (2.7.8.dfsg-5.1) unstable; urgency=high + + * Non-maintainer upload. + * encoding.c: Fix off by one error. CVE-2011-0216. + * parser.c: Make sure parser returns when getting a Stop order. + CVE-2011-3905. + * Both closes: #652352. + + -- Luk Claes <luk@debian.org> 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. + * xpath.c: Fix for undefined namespaces. CVE-2011-2834. + * Both closes: #643648. + + -- Mike Hommey <glandium@debian.org> 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. + + -- Mike Hommey <glandium@debian.org> Fri, 29 Jul 2011 12:33:08 +0200 + +libxml2 (2.7.8.dfsg-3) unstable; urgency=low + + * xpath.c: Fix some potential problems on reallocation failures. + Closes: #628537. + + -- Mike Hommey <glandium@debian.org> Sat, 04 Jun 2011 10:40:39 +0900 + +libxml2 (2.7.8.dfsg-2) unstable; urgency=low + + * xpath.c: Fix a double-freeing error in XPath processing code. + (CVE-2010-4494). Closes: #607922. + + -- Mike Hommey <glandium@debian.org> Sat, 25 Dec 2010 10:48:27 +0100 + +libxml2 (2.7.8.dfsg-1) unstable; urgency=low + + * New upstream release. + * configure.in: Applied upstream fix to reactivate symbol versioning script. + + -- Mike Hommey <glandium@debian.org> Fri, 05 Nov 2010 08:23:58 +0100 + +libxml2 (2.7.7.dfsg-4) unstable; urgency=low + + * debian/rules: + - Use a variable to express which sub-targets to invoke for + configure/build/install. + - Refactor configure-% and build-% rules. + - Avoid possible renaming of _d.so files to _d_d.so files in the + install-python%-dbg rules. + * debian/control, debian/control.udeb, debian/libxml2-udeb.install, + debian/rules: Add an udeb package when building for Ubuntu. + Closes: #583767. + * debian/control: + - Remove old Conflicts/Replaces for packages that have disappeared before + etch. + - Bump Standards-Version to 3.9.0.0. + + -- Mike Hommey <glandium@debian.org> Tue, 29 Jun 2010 12:42:35 +0200 + +libxml2 (2.7.7.dfsg-3) unstable; urgency=low + + * debian/rules: Use build_python* instead of build-python* as build + directory when configuring python modules. build-python$* would get + matched by make as an existing file and would prevent evaluation of the + corresponding build rule. Thanks Loïc Minier. + * debian/python-libxml2.install: Don't hardcode site-/dist-packages in + .install. Cope with builds which don't have any dist-packages (or + site-packages) based python versions. Thanks Loïc Minier. + * debian/rules, debian/python-libxml2-dbg.install, debian/control: + Add a python-libxml2-dbg package. Closes: #583582. + * debian/rules: Don't link against libpython. + * python-libxml2-dbg.preinst: Remove /usr/share/doc/python-libxml2-dbg + symlink when it exists (which is the case with older Ubuntu packages). + + -- Mike Hommey <glandium@debian.org> Wed, 23 Jun 2010 18:52:51 +0200 + +libxml2 (2.7.7.dfsg-2) unstable; urgency=low + + * debian/libxml2-dbg.preinst, debian/libxml2-dev.preinst, + debian/libxml2-utils.preinst: Remove /usr/share/doc symbolic links on + upgrade. They will then be replaced by directories by dpkg. + Closes: #577025. + + -- Mike Hommey <glandium@debian.org> Fri, 09 Apr 2010 10:21:02 +0200 + +libxml2 (2.7.7.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Bump Standards-Version to 3.8.4.0. + + Depend on a version of debhelper that provides dh and supports + overrides. + * debian/compat: Bump to 7. + * debian/rules: + + Don't avoid to build in example/. There is no reason to do so anymore. + + Remove remains of WORKAROUND_MODIFIED_FILES, that was removed 2 years + ago. + + Change the way python libs are built. We now use configure to set + different environment with and without python, and arrange things so + that we don't have to build the base libxml2 library several times. + + Deduplicate in /usr/lib/pyshared, not + /usr/lib/python-support/python-libxml2. + + Remove old source and diff rules that only displayed a message + inviting to use dpkg-source -b. + + Force -Wl,--as-needed at the beginning of the gcc command line. + + Simplify rules by switching to dh. + + Don't refresh COPYING during clean target, it appears not to be + necessary anymore. + + Use a common cache for main and python configure passes. + * debian/python-libxml2.install: Install python files from + /usr/lib/python*/dist-packages. + * python/generator.py: Sort python generated stubs so that libxml2.py + doesn't differ between python 2.5 and 2.6. + * doc/devhelp/Makefile.{am,in}: Properly install devhelp files when + builddir != srcdir. + + -- Mike Hommey <glandium@debian.org> Sun, 21 Mar 2010 09:51:17 +0100 + +libxml2 (2.7.6.dfsg-2) unstable; urgency=low + + * Cherry-picks from upstream git: + + globals.c: fix the initialization of the mutex. + + xmlIO.c: remove an abuse of zlib API and use a clean interface + available in zlib >= 1.2.3. Closes: #565683, #565823. + * debian/control: + + Put libreadline-dev before libreadline5-dev in Build-Deps. + Closes: #553803. + + Add misc:Depends dependencies where they are missing. + + -- Mike Hommey <glandium@debian.org> Tue, 19 Jan 2010 18:41:49 +0100 + +libxml2 (2.7.6.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Bump Standards-Version to 3.8.3.0. + + Set libxml2 package priority to standard to match override. + + -- Mike Hommey <glandium@debian.org> Sat, 10 Oct 2009 23:55:41 +0200 + +libxml2 (2.7.5.dfsg-1) unstable; urgency=low + + * New upstream release. + + Fixed a RelaxNG bug introduced in 2.7.4. Closes: #546442. + + -- Mike Hommey <glandium@debian.org> Fri, 25 Sep 2009 22:28:53 +0200 + +libxml2 (2.7.4.dfsg-2) unstable; urgency=low + + * debian/libxml2.symbols: Force binaries that use versioned symbols to + depend on version 2.7.4 at least. + * parser.c: Fix a parsing problem with little data at startup. + Cherry-picked from upstream git. Closes: #546254, #546488. + + -- Mike Hommey <glandium@debian.org> Wed, 16 Sep 2009 00:12:50 +0200 + +libxml2 (2.7.4.dfsg-1) unstable; urgency=low + + * New upstream release. + * Revert old change to entities.c. + * debian/copyright: Change upstream url. Closes: #541082. + * debian/libxml2.symbols: Change symbols file to use newly introduced + symbol versioning + * debian/rules: bump shlibs to current version. + + -- Mike Hommey <glandium@debian.org> Thu, 10 Sep 2009 23:04:35 +0200 + +libxml2 (2.7.3.dfsg-2.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team (Closes: #540865). + * Fix multiple use-after-free flaws when parsing notation and + enumeration attribute types (CVE-2009-2416). + * Fix stack overflow when parsing root XML document element DTD + definition (CVE-2009-2414). + + -- Nico Golde <nion@debian.org> Sun, 16 Aug 2009 17:45:17 +0200 + +libxml2 (2.7.3.dfsg-2) unstable; urgency=low + + * debian/no-upstream-changelog: Removed. + * debian/rules: Don't use symlinks in /usr/share/doc anymore, and only + install the upstream changelog in the libxml2 package. Considering + its size, we don't need it everywhere. Closes: #496959. + * include/libxml/*.h: change ATTRIBUTE_PRINTF into LIBXML_ATTR_FORMAT + to avoid macro name. Cherry-pick upstream f076f34. Closes: #521994. + * error.c: fix structured error handling problems. Cherry-pick upstream + 719f397. Closes: #522669. + * debian/control: + + Change libxml2-dbg's section to "debug". + + Bump Standards-Version to 3.8.2.0. + + Add Homepage, Vcs-Git and Vcs-Browser fields. + + -- Mike Hommey <glandium@debian.org> Mon, 13 Jul 2009 08:56:37 +0200 + +libxml2 (2.7.3.dfsg-1) unstable; urgency=low + + * New upstream release. + * parser.c: Remove useless nbParse* variables and avoid exporting them as + symbols. + * debian/libxml2.symbols: Reference the new symbols. + * debian/rules: bump shlibs to current version. + + -- Mike Hommey <glandium@debian.org> Sun, 01 Mar 2009 11:57:55 +0100 + +libxml2 (2.6.32.dfsg-5) unstable; urgency=high + + * parserInternals.c: apply patch from upstream revision 3741 to avoid + double-free in some situations. This fixes a crash while running the + W3C/OASIS XML conformance test. + * tree.c: Fix infinite loop. Fixes: CVE-2008-4225. + * SAX2.c: Fix integer overflow. Fixes: CVE-2008-4226. + + -- Mike Hommey <glandium@debian.org> Tue, 18 Nov 2008 08:08:34 +0100 + +libxml2 (2.6.32.dfsg-4) unstable; urgency=high + + * Fix regressions due to previous security fixes. Fixes: CVE-2008-3529. + Closes: #498768. + + -- Mike Hommey <glandium@debian.org> Fri, 19 Sep 2008 21:26:19 +0200 + +libxml2 (2.6.32.dfsg-3) unstable; urgency=high + + * Fix DoS which leads to recursive evaluation of entities. + Fixes: CVE-2008-3281, without breaking librsvg and others. Closes: #496125. + + -- Mike Hommey <glandium@debian.org> Mon, 25 Aug 2008 22:01:17 +0200 + +libxml2 (2.6.32.dfsg-2) unstable; urgency=low + + * debian/control: + + Use ${binary:Version} instead of ${Source-Version}. + + Fixed spelling error for "Python". + * debian/rules: Don't ignore make distclean errors. + * debian/libxml2-doc.doc-base: Changed section to fit doc-base sections + changes. + * xml2-config.1: Remove unknown groff command. + + -- Mike Hommey <glandium@debian.org> Sat, 19 Apr 2008 20:38:50 +0200 + +libxml2 (2.6.32.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/control: Bumped Standards-Version to 3.7.3.0. No changes. + * debian/rules: + + Make dpkg-shlibdeps fail when symbols are missing. + + Removed the workaround for removed and modified files during build. The + former was for svn-buildpackage that I don't use anymore, and the latter + for a file that isn't in the .orig.tar.gz anymore. + + Bump shlibs to current version, since a new symbol was added. + * debian/libxml2.symbols: Reference the new symbol. + + -- Mike Hommey <glandium@debian.org> Wed, 09 Apr 2008 11:25:18 +0200 + +libxml2 (2.6.31.dfsg-2) unstable; urgency=low + + * debian/rules: Brown paper bag: uncomment $(MAKE) distclean. + Closes: #442656. + * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files. + * nanohttp.c: Apply fix from svn revision 3685 to allocate enough memory + for the Host HTTP header when containing a port number. Closes: #464173. + * error.c: Don't grow error buffer indefinitely when vsnprintf returns -1, + which, if it happens, on glibc-based systems, will happen indefinitely. + Closes: #456653. + + -- Mike Hommey <glandium@debian.org> Wed, 05 Mar 2008 23:42:37 +0100 + +libxml2 (2.6.31.dfsg-1) unstable; urgency=low + + * New upstream release. + * Acknowledged NMU. + * testModule.c: Revert our change to add PATH_MAX for the Hurd, since we now + don't even build this file. + * debian/rules: bump shlibs to current version, since a new symbol was added. + * debian/libxml2.symbols: Reference the new symbol. + * autogen.sh: Switch to automake1.10 to follow upstream. + + -- Mike Hommey <glandium@debian.org> Sat, 19 Jan 2008 18:46:41 +0100 + +libxml2 (2.6.30.dfsg-3.1) unstable; urgency=high + + * Non-maintainer upload by security team. + * This update addresses the following security issue: + - CVE-2007-6284: The xmlCurrentChar function allows context-dependent + attackers to cause a denial of service (infinite loop) via XML + containing invalid UTF-8 sequences (Closes: #460292). + + -- Nico Golde <nion@debian.org> Sun, 13 Jan 2008 15:15:04 +0100 + +libxml2 (2.6.30.dfsg-3) unstable; urgency=low + + * debian/libxml2.symbols: Add a symbols file to benefit from the new + features in dpkg-shlibdeps. + * debian/control: Build depend on debhelper (>= 5.0.61) and dpkg-dev (>= + 1.14.9), accordingly. + * debian/rules: + + Apply rules suggested in autotools-dev documentation. + + Add -Wl,--as-needed to LDFLAGS so that useless dependencies are not + added. + * Makefile.am, Makefile.in: Don't build noinst targets. + + -- Mike Hommey <glandium@debian.org> Wed, 21 Nov 2007 19:22:51 +0100 + +libxml2 (2.6.30.dfsg-2) unstable; urgency=low + + * libxml.h: define _LARGEFILE64_SOURCE to properly get gzopen64 defines in + zlib.h. Closes: #439843. Thanks Dann Frazier. + + -- Mike Hommey <glandium@debian.org> Tue, 28 Aug 2007 21:52:30 +0200 + +libxml2 (2.6.30.dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Mike Hommey <glandium@debian.org> Sun, 26 Aug 2007 10:52:39 +0200 + +libxml2 (2.6.29.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/rules: bump shlibs to current version, since new symbols were added. + + -- Mike Hommey <glandium@debian.org> Wed, 13 Jun 2007 20:52:41 +0200 + +libxml2 (2.6.28.dfsg-1) unstable; urgency=low + + * New upstream release: + + Provides doc/html/index.html. Closes: #405802. + + Fixed infinite loop with invalid characters in Xincluded files. + Closes: #410762. + * debian/rules: bump shlibs to current version, since new symbols were added. + + -- Mike Hommey <glandium@debian.org> Wed, 18 Apr 2007 08:09:16 +0200 + +libxml2 (2.6.27.dfsg-1) unstable; urgency=low + + * New "huge bug fixes list" upstream release. + * autogen.sh: Updated so that doc/examples/index.html gets updated + correctly. + * debian/control: Bumped Standards-Version to 3.7.2.2. No changes required. + * debian/rules: bump shlibs to current version, since new symbols were added. + + -- Mike Hommey <glandium@debian.org> Thu, 26 Oct 2006 23:15:00 +0200 + +libxml2 (2.6.26.dfsg-4) unstable; urgency=low + + * debian/control: + + Bumped Standards-Version to 3.7.2.1. No changes required. + + Added a conflict to the sarge version of libxslt1.1 to avoid upgrade + problems. Closes: #390733. + * debian/watch: Updated to mangle the Debian version. + + -- Mike Hommey <glandium@debian.org> Wed, 4 Oct 2006 16:51:29 +0200 + +libxml2 (2.6.26.dfsg-3) unstable; urgency=medium + + * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la + directly and sed it to remove the dependency_libs. Note that will break + linking statically libxml2 with libtool, we recommend to use pkg-config + --static --libs libxml-2.0 instead of relying on libtool. + Closes: #379807, #378511. + * xml2-config.in: Fixed usage alignment of the new option introduced in + previous upload. + + -- Mike Hommey <glandium@debian.org> Thu, 27 Jul 2006 19:40:27 +0200 + +libxml2 (2.6.26.dfsg-2) unstable; urgency=low + + * The slithering release. + + * debian/python-libxml2.examples.in: Renamed to + debian/python-libxml2.examples + * debian/python-libxml2.install.in: Renamed to + debian/python-libxml2.install, and replaced PYVERS by a wildcard. + * debian/control: + + Adapted dependencies to fit all changes. + + Added fields required by new Python policy. + + Added fields necessary for flawless transition. + + Replaced dummy python-libxml2 package by a full real package which + itself replaces python2.x-libxml2 packages. + * debian/rules: + + Changed rules to get the python versions we want to build for and + adapted some rules to fit with the new setting. + + Changed shell loops to make loops. + + In case python binary modules are identical (and they are, but they + may not be with future versions of the python headers), replace some + of them with symbolic links. + + Adapted rules to the fact we're installing in only one python package + instead of several. + * debian/pycompat: Set to 2, for new Python policy. Closes: #373456. + * Switching to the new policy avoids necessity to conflict with very old + versions of the python bindings packages. Closes: #365057. + + * debian/libxml2-doc.install: Added the /usr/share/gtk-doc directory. + Closes: #375113. + * debian/control: Made libxml2-doc suggest devhelper. + * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and + Libs.private. + * configure.in, configure: Adapted to fill the variables correctly for + libraries. + * xml2-config.in, xml2-config.1: Added a --static option to add to --libs + so that we can split what is needed when building statically and what is + needed when building dynamically. Closes: #374017. + * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in, xml2-config.in: Added + BASE_THREADS_LIBS to the static link information so that -lpthread would + appear. Closes: #372945. + * debian/control: Removed dependency on zlib-dev for libxml2-dev. + * debian/rules: Add the NEWS file to dh_install calls. Closes: #365596. + * debian/watch: Updated. + * NEWS: Updated. + + -- Mike Hommey <glandium@debian.org> Sat, 1 Jul 2006 10:45:02 +0200 + +libxml2 (2.6.26.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + Added -fno-strict-aliasing to the CFLAGS. + + Use dpkg-architecture to feed configure. + + Bumped shlibs to current version, since new symbol for XPath cache has + been added. + * debian/control: Bumped Standards-Version to 3.7.2.0. No changes required. + + -- Mike Hommey <glandium@debian.org> Thu, 8 Jun 2006 21:39:55 +0200 + +libxml2 (2.6.24.dfsg-1) unstable; urgency=low + + * New upstream release. Closes: #365246. + * debian/control: + + Changed libxml2-dbg's priority to extra. + + Bumped Standards-Version to 3.7.0.0. No changes required. + * debian/rules: bump shlibs to current version, since new symbols were added. + + -- Mike Hommey <glandium@debian.org> Sat, 29 Apr 2006 22:18:14 +0200 + +libxml2 (2.6.23.dfsg.2-3) unstable; urgency=low + + * debian/rules: Correctly strip python modules. + + -- Mike Hommey <glandium@debian.org> Sat, 18 Mar 2006 19:15:53 +0100 + +libxml2 (2.6.23.dfsg.2-2) unstable; urgency=low + + * debian/control: Removed python2.2-libxml2 and build-dep on python2.2-dev. + Closes: #351125. + * doc/xmllint.xml, doc/xmllint.1: Applied patch from upstream cvs. That + improves the manual page by many ways. + * doc/xmllint.html: Manually updated with changes from the .xml file. + * xmllint.c: Don't throw error when failed to load an entity through --path + option of xmllint (patch from upstream cvs). Closes: #352634. + Thanks Daniel Leidert. + + -- Mike Hommey <glandium@debian.org> Mon, 20 Feb 2006 10:52:46 +0100 + +libxml2 (2.6.23.dfsg.2-1) unstable; urgency=low + + * result/, test/: Totally removed. There is more suspicious content than + what has been removed in previous upload, so I'm just dropping the + regression tests from the archive until all files are investigated. + Closes: #331534. + * debian/control, debian/rules: Added a libxml2-dbg package containing + debug symlbols for the library and the utilities. We don't provide the + symbols for the python modules, though. Closes: #296299. + * debian/control, debian/compat: Adjust build dependencies and debhelper + compatibility accordingly. + * debian/libxml2-dbg.dirs: Add /usr/share/doc in the new libxml2-dbg + package. + + -- Mike Hommey <glandium@debian.org> Tue, 31 Jan 2006 20:17:37 +0100 + +libxml2 (2.6.23.dfsg.1-0.1) unstable; urgency=medium + + * NMU. + * Medium urgency due to RC bugfix. + * Removed non-free test files from upstream tarball. Closes: #331534. + + -- Per Olofsson <pelle@debian.org> Sun, 15 Jan 2006 23:02:12 +0100 + +libxml2 (2.6.23-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix XML parser to unbreak xsltproc (Closes: #346594). + + -- Luk Claes <luk@debian.org> Thu, 12 Jan 2006 15:25:42 +0100 + +libxml2 (2.6.23-1) unstable; urgency=low + + * New upstream release + * debian/control: + + Added | libreadline-dev for readline dependency. + + Bumped Standards-Version to 3.6.2.1. No changes needed. + * debian/rules: bump shlibs to current version, since new symbols were added. + + -- Mike Hommey <glandium@debian.org> Fri, 6 Jan 2006 19:03:57 +0100 + +libxml2 (2.6.22-2) unstable; urgency=low + + * autogen.sh: Changed the way we rebuild the examples. + * debian/rules: Added history support in xmllint. Closes: #318083. + * debian/control: Added build dependency upon libreadline5-dev for history + support in xmllint. + * xmllint.c: Added some spaces in usage(). Closes: #335015. + * testModule.c: Added PATH_MAX definition for the Hurd. Closes: #333623. + + -- Mike Hommey <glandium@debian.org> Wed, 2 Nov 2005 19:22:41 +0100 + +libxml2 (2.6.22-1) unstable; urgency=low + + * New upstream release + * error.c: Reenable support of validation errors in structured error + handler. + * autogen.sh: Use automake1.9, as upstream does, and run it. + + -- Mike Hommey <glandium@debian.org> Tue, 13 Sep 2005 18:04:10 +0200 + +libxml2 (2.6.21-1) unstable; urgency=low + + * New upstream release + * debian/control, debian/rules: Removed dummy package. Closes: #322052. + * debian/rules: bump shlibs to current version. + + -- Mike Hommey <glandium@debian.org> Wed, 7 Sep 2005 19:11:32 +0200 + +libxml2 (2.6.20-1) unstable; urgency=low + + * New upstream release + * debian/rules: bump shlibs to current version. + + -- Mike Hommey <glandium@debian.org> Thu, 14 Jul 2005 09:42:27 +0200 + +libxml2 (2.6.19-1) unstable; urgency=low + + * The "Sarge got released but I was offline, so couldn't upload" release. + * New upstream release. + * debian/rules: bump shlibs to current version. + + -- Mike Hommey <glandium@debian.org> Fri, 8 Jul 2005 19:29:29 +0200 + +libxml2 (2.6.16-7) unstable; urgency=low + + * The "dummy packages are arch: all, dammit" release. + * debian/control: Changed to Architecture: all for dummy package. + + -- Mike Hommey <glandium@debian.org> Sat, 9 Apr 2005 11:57:29 +0200 + +libxml2 (2.6.16-6) unstable; urgency=low + + * The "Let's do it cleaner" release. + * debian/rules: fix installation of python files and make proper use of + DESTDIR at install time. + + -- Mike Hommey <glandium@debian.org> Mon, 28 Mar 2005 18:12:15 +0200 + +libxml2 (2.6.16-5) unstable; urgency=low + + * debian/watch: use svn-upgrade instead of uupdate. + * debian/control, debian/rules, debian/python-libxml2.*.in: + Added support for several python bindings packages. Currently for python + 2.2, 2.3 and 2.4. + * debian/python2.3-libxml2.*: Removed. + + -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2005 21:36:53 +0200 + +libxml2 (2.6.16-4) unstable; urgency=high + + * Urgency set to high because we avoid breaking packages depending on us + when we don't properly bytecompile our python bindings. + * debian/rules: Call dh_python. We now get proper maintainer scripts for + bytecompiling files at install time and removing them at removal time. + Closes: #300834. + * debian/control: Adjust build dependencies accordingly. + + -- Mike Hommey <glandium@debian.org> Tue, 22 Mar 2005 21:56:50 +0100 + +libxml2 (2.6.16-3) unstable; urgency=low + + * tree.c: Avoid adding namespaced attributes to other elements than element + nodes. Closes: #293592. + * encoding.c: Fix the comments to describe the real return values of + UTF8Toisolat1 and isolat1ToUTF8. + * doc/: Regenerate API documentation. + + -- Mike Hommey <glandium@debian.org> Wed, 16 Feb 2005 20:31:17 +0100 + +libxml2 (2.6.17-1) experimental; urgency=low + + * New upstream release. + + -- Mike Hommey <glandium@debian.org> Sat, 5 Feb 2005 13:10:13 +0100 + +libxml2 (2.6.16-2) unstable; urgency=low + + * Upload to unstable, targetted for sarge. + * Changed my maintainer address to the fresh new Debian one. + * debian/rules: Added changelog and copyright files in dummy package. + * debian/libxml2-doc.doc-base: Fixed files sections. Closes: #281242. + + -- Mike Hommey <glandium@debian.org> Fri, 4 Feb 2005 20:45:48 +0100 + +libxml2 (2.6.16-1) experimental; urgency=low + + * New upstream release + * debian/control, debian/rules: Changed libxml2-python2.3's name to + python2.3-libxml2. Added a dummy package for smooth transition. + * debian/libxml2-python2.3.*: Renamed to python2.3-libxml2.*. + Closes: #279343. + * debian/rules: + - Don't install files in the dummy libxml2-python2.3 package. + - Bump shlibs to current version. + + -- Mike Hommey <mh@glandium.org> Sat, 13 Nov 2004 16:38:37 +0900 + +libxml2 (2.6.15-2) experimental; urgency=low + + * error.c: Removed support of validation errors in structured error handler. + That avoids it to crash when a validation error happens. (That was a + broken feature added in 2.6.15. This will get properly fixed in 2.6.16). + Closes: #279040. + + -- Mike Hommey <mh@glandium.org> Mon, 8 Nov 2004 22:16:00 +0900 + +libxml2 (2.6.15-1) experimental; urgency=low + + * New upstream release + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.15)'", since version + 2.6.16 introduces some new symbols. + + -- Mike Hommey <mh@glandium.org> Thu, 28 Oct 2004 19:08:20 +0900 + +libxml2 (2.6.11-5) unstable; urgency=high + + * Backport patch from libxml2-2.6.15 to fix buffer overflows [nanohttp.c, + nanoftp.c, CAN-2004-0989] + + -- Mike Hommey <mh@glandium.org> Thu, 28 Oct 2004 17:34:54 +0900 + + +libxml2 (2.6.14-1) experimental; urgency=low + + * New upstream release. Closes: #273961. + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.14)'", since version + 2.6.14 introduces some new symbols. + * debian/shlibs.local: Removed, since it is not useful any more. + + -- Mike Hommey <mh@glandium.org> Sat, 16 Oct 2004 16:29:06 +0900 + +libxml2 (2.6.11-4) unstable; urgency=low + + * The "let's do some clean up for sarge" release. + * debian/libxml2-python2.3.install: don't install .a and .la files. + * debian/rules: Avoid compression of both python examples and documentation. + * Reorganization in documentation: + + debian/libxml2-doc.examples: removed, they will get installed by + libxml2-doc.install, and we don't ship gjob* examples anymore, they + have been superseded by a lot of better examples. + + debian/libxml2-doc.install, debian/rules: changed the way files are + installed in the libxml2-doc package, and their location. + + debian/libxml2-doc.doc-base: changed the location of the documentation + base to fit the new one. + + doc/examples/index.html: generated this file from examples.x?l by + hand. It would otherwise require a build dependency on xsltproc, itself + depending upon libxml2... wouldn't be very reasonnable. + * debian/no-upstream-changelog, debian/rules, debian/libxml2-dev.dirs, + debian/libxml2-utils.dirs: /usr/share/doc directories have been replaced + by a symbolic link in packages libxml2-utils and libxml2-dev. + In libxml2-python2.3, all files but TODO are symlinks to the corresponding + file from libxml2. The one from libxml2-doc is replaced by an explicative + text saying where to find it and why it has been (re)moved. + That will save some space in the archive, especially considering this + file is constantly growing. + * debian/README.Debian: Added a recommentation to upgrade package if user + needs heavy standards compliance. + * debian/shlibs.local: Added to tighten dependencies between libxml2-* + packages. + * xmlIO.c: Fixed typo (Closes: #265740). + * nanohttp.c, nanoftp.c: no_proxy environment variable doesn't disable proxy + anymore. (Closes: #266430) + * debian/rules, debian/control: Removed the workaround to compile with + gcc-3.2 on hppa, since $254549 is closed. + + -- Mike Hommey <mh@glandium.org> Sat, 16 Oct 2004 16:20:54 +0900 + +libxml2 (2.6.11-3) unstable; urgency=low + + * debian/control: add a space between gcc-3.2 and [hppa]. Closes: #262101. + * python/drv_libxml2.py: add encoding declaration. Closes: #259526. + * debian/rules: Backup files that are removed or modified by upstream build + system and restore them so that calling the clean target actually gives + the same tree as before a build. + + -- Mike Hommey <mh@glandium.org> Sun, 1 Aug 2004 05:02:14 +0900 + +libxml2 (2.6.11-2) unstable; urgency=medium + + * Thanks to Andreas Metzler: + + Hotfix for toolchain breakage (#254549), because libxml2 blocks lots of + packages from propagating to testing. Compile with gcc-3.2 on hppa. + + -- Mike Hommey <mh@glandium.org> Wed, 21 Jul 2004 23:37:22 +0900 + +libxml2 (2.6.11-1) unstable; urgency=low + + * New upstream release + * libxml.m4: removed debian changes which have been incorporated upstream. + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.11)'", since + version 2.6.11 introduces some new functions. + + -- Mike Hommey <mh@glandium.org> Wed, 7 Jul 2004 00:54:50 +0900 + +libxml2 (2.6.10-3) unstable; urgency=low + + * debian/control: changed deps on libz-dev to zlib1g-dev | libz-dev. + * debian/rules: made binary-indep target actually build the libxml2-doc + package which is Arch: all. Closes: #251971. + + -- Mike Hommey <mh@glandium.org> Wed, 2 Jun 2004 15:57:21 +0900 + +libxml2 (2.6.10-2) unstable; urgency=low + + * debian/watch: updated the watch file to exclude the cvs-snapshot from + the scope. Closes: #250177. + * debian/rules: rename libxml.m4 to libxml2.m4 in the /usr/share/aclocal + directory. + * libxml.m4: removed the AM_PATH_XML macro which is a macro for checking + libxml, not libxml2. Changed CFLAGS to CPPFLAGS from test compiles so + that using C++ also works. Closes: #249033. + + -- Mike Hommey <mh@glandium.org> Wed, 26 May 2004 21:28:54 +0900 + +libxml2 (2.6.10-1) unstable; urgency=low + + * New upstream release: + + Fixes xincludes fallback issues. Closes: #243580. + + Fixes output formatting issues. Closes: #246181. + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.10)'", since + version 2.6.10 introduces some few new functions. + + -- Mike Hommey <mh@glandium.org> Mon, 17 May 2004 17:16:44 +0900 + +libxml2 (2.6.9-2) unstable; urgency=low + + * Enable AM_MAINTAINER_MODE and re-run the autotools suite. + Closes: #245990. + + -- Mike Hommey <mh@glandium.org> Tue, 27 Apr 2004 16:31:21 +0900 + +libxml2 (2.6.9-1) unstable; urgency=high + + * New upstream release: + + xincludes fallbacks fixed. Closes: #243580. + * Urgency set to high because of RC bug fixed and it's been too long + libxml2 has been stucking packages in sid. + * Ran all the autotools suite, especially the latest libtool. + Closes: #244557. + * debian/rules: + + Removed all python file removals since these files get now + correctly removed upstream. + + Changed once more the python/libxml2-py.c workaround to finally + work really properly. + + -- Mike Hommey <mh@glandium.org> Mon, 19 Apr 2004 17:58:56 +0900 + +libxml2 (2.6.8-2) unstable; urgency=high + + * Urgency set to high because of the FTBFS RC bug fixed. + * debian/changelog: + + Added missing changes for release 2.6.8-1. + + Converted changelog file to UTF-8. + * debian/rules: Changed the python/libxml2-py.c workaround stuff to + actually work properly + + -- Mike Hommey <mh@glandium.org> Sat, 17 Apr 2004 16:59:01 +0000 + +libxml2 (2.6.8-1.1) unstable; urgency=high + + * NMU. Urgency set to high as libxml2 has been preventing too many packages + from entering testing for too long. + * Grabbed from SVN: + Mike Hommey <mh@glandium.org> Sat, 10 Apr 2004 12:42:03 +0900 + * debian/control: + + Updated section for libxml2-doc package. + + Added dependency on libz-dev for libxml2-dev. (Closes: #242683) + + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Fri, 16 Apr 2004 22:37:08 +0200 + +libxml2 (2.6.8-1) unstable; urgency=low + + * New upstream release + * debian/rules: + + Use "dh_makeshlibs -V 'libxml2 (>= 2.6.8)'", since version 2.6.8 + introduces some few new functions. + + Try to circumvent new troubles with the python/libxml2-py.c with + svn-buildpackage not wanting to make the build (the file used to + be removed because it was modified by the build). + * Removed changes about XML_CATALOG_FILES in manual pages, since it has + been incorporated upstream. + + -- Mike Hommey <mh@glandium.org> Thu, 25 Mar 2004 14:57:44 +0900 + +libxml2 (2.6.7-2) unstable; urgency=low + + * debian/control: Changed Maintainer to Debian SGML/XML Group and + put myself into Uploaders. + * Merged back libxml2-headers into libxml2-dev. That was too much of + a split. Closes: #238109. + + -- Mike Hommey <mh@glandium.org> Mon, 22 Mar 2004 15:41:30 +0900 + +libxml2 (2.6.7-1) unstable; urgency=low + + * New upstream release + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.7)'", since + version 2.6.7 introduces some few new functions. + + -- Mike Hommey <mh@glandium.org> Wed, 25 Feb 2004 15:43:11 +0900 + +libxml2 (2.6.6-2) unstable; urgency=low + + * debian/control: + + Added a Recommends: xml-core to libxml2 package. + + Added a libxml2-headers and a libxml2-docs packages to split + arch-dependent and arch-independent files. These files used to be + in the libxml2-dev package. Note that the new libxml2-dev package + depends on libxml2-headers, so that upgrade will keep the header + files on the system, but libxml2-headers only suggests libxml2-doc, + while libxml2-dev doesn't say anything about it, which means that + the documentation files won't be automagically installed on your + system. Closes: #233405. + + Added the adequate dependencies between new and old packages. + + Uniformized short descriptions. + + Slightly modified long descriptions. + * debian/rules: + + Externalized all dh_* calls with arguments. (i.e. created + corresponding debian/package.dh_stuff files) + + Moved installation of some doc files to the install target. + * Removed un-needed debian/libxml2-python2.3.docs. + * Moved libxml manpage from libxml2 to libxml2-dev. + * doc/xmlcatalog_man.xml: Added a note about the incompatibility between + xmlcatalog and update-catalog from xml-core in the man page. + * doc/xmllint.xml, doc/xmlcatalog_man.xml: Added a note about the + XML_CATALOG_FILES environment variable. Closes: #232728. + + -- Mike Hommey <mh@glandium.org> Wed, 18 Feb 2004 21:29:58 +0900 + +libxml2 (2.6.6-1) unstable; urgency=high + + * New upstream release + * Set urgency to high, since this new upstream fixes buffer overflows. + Closes: #232447. + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.6)'", since + version 2.6.6 introduces some new functions. + + -- Mike Hommey <mh@glandium.org> Mon, 16 Feb 2004 16:56:57 +0900 + +libxml2 (2.6.5-1) unstable; urgency=low + + * New upstream release + * debian/rules: + - Made better use of CFLAGS. + - Replaced an mv by cp -r. Closes: #227392. + - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.5)'", since version 2.6.5 + introduced some new functions. + - Make some clean-up in the example directory. + + -- Mike Hommey <mh@glandium.org> Fri, 30 Jan 2004 15:14:02 +0900 + +libxml2 (2.6.4-1) unstable; urgency=low + + * New upstream release + + -- Mike Hommey <mh@glandium.org> Sat, 27 Dec 2003 18:25:17 +0900 + +libxml2 (2.6.3-1) unstable; urgency=low + + * New upstream release + * debian/rules: + - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.3)'", since versions 2.6.3 + introduced some new functions. + - Put more examples in /usr/share/doc/libxml2-dev/examples. + + -- Mike Hommey <mh@glandium.org> Fri, 12 Dec 2003 14:45:24 +0900 + +libxml2 (2.6.2-1) unstable; urgency=low + + * New upstream release + * debian/rules: + - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.2)'", since versions 2.6.2 + introduced some new functions. + - Put the API docs back in /usr/share/doc/libxml2-dev/libxml-dev.html. + + -- Mike Hommey <mh@glandium.org> Mon, 10 Nov 2003 22:20:33 +0900 + +libxml2 (2.6.1-1) experimental; urgency=low + + * New upstream release + + -- Mike Hommey <mh@glandium.org> Wed, 29 Oct 2003 14:07:11 +0900 + +libxml2 (2.6.0-1) experimental; urgency=low + + * New upstream release: should be API and ABI compatible but got a lot + of changes. + * debian/rules: + - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.0)'", since applications + using the new API won't work on previous versions. + Note that this doesn't prevent applications built with older versions + to work properly with newer releases, since it is not supposed to be + any API/ABI breakage. + - Don't remove non-existant python/test/tmp.xml file on clean rule. + - Remove python/libxml2-py.c file on clean rule, to avoid its changes + made during build to be stored in the diff file. + - Added handling of the nostrip DEB_BUILD_OPTIONS. + - Changed old fashion dh_movefiles to dh_install --sourcedir=debian/tmp. + - Added installation of the python/TODO file in the libxml2-python2.3 + package. + - Now take what is installed in debian/tmp/usr/share/doc/... for + documentation. + - Copy Copyright file into COPYING file in clean rule to avoid + unrepresentable changes to source. + * debian/*.files: renamed to debian/*.install. + * debian/libxml2.install: removed reference to non-existant + usr/lib/libxml.so.* + * Removed unneeded debian/libxml2-dev.dirs file. + + -- Mike Hommey <mh@glandium.org> Tue, 21 Oct 2003 14:07:04 +0900 + +libxml2 (2.5.11-2) unstable; urgency=low + + * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.5.9)'", since + versions 2.5.8 and 2.5.9 introduced some changes in API. + Closes: #212819, #211318. + + -- Mike Hommey <mh@glandium.org> Sun, 28 Sep 2003 21:57:32 +0200 + +libxml2 (2.5.11-1) unstable; urgency=low + + * New upstream release. + * New maintainer. + * Bumped Standards-Version to 3.6.1 (no changes needed). + * Removed garbage debian/libxml-utils. + * moved debhelper compatibility to debian/compat. + + -- Mike Hommey <mh@glandium.org> Sun, 14 Sep 2003 16:03:46 +0200 + +libxml2 (2.5.10-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Aug 2003 20:08:31 +0200 + +libxml2 (2.5.8-2) unstable; urgency=low + + * Use python 2.3 (closes: #205145) + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 13 Aug 2003 21:28:14 +0200 + +libxml2 (2.5.8-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 7 Aug 2003 20:08:23 +0200 + +libxml2 (2.5.7-1) unstable; urgency=low + + * New upstream release (closes: #194757) + * Updated shlibs file (closes: #191022) + * Put xmllint and xmlcatalog in new package (closes: #174823) + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 26 May 2003 20:16:01 +0200 + +libxml2 (2.5.6-2) unstable; urgency=low + + * Update libtool (closes: #188967) + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 14 Apr 2003 20:52:45 +0200 + +libxml2 (2.5.6-1) unstable; urgency=low + + * New upstream release (closes: #188004) + * Applied patch from Graham Wilson <bob@decoy.wox.org> to handle + noopt build option. (closes: #171782) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 12 Apr 2003 20:54:13 +0200 + +libxml2 (2.5.4-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 14 Mar 2003 18:40:08 +0100 + +libxml2 (2.5.3-1.1) unstable; urgency=high + + * Applied patch by Paul Hampson <Paul.Hampson@anu.edu.au> to correct + licensing information in debian/copyright which Colin Watson reported + as incorrect. (Addresses #178060 for sid) + + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 16 Mar 2003 09:55:59 +0100 + +libxml2 (2.5.3-1) unstable; urgency=low + + * New upstream release + * xml2-config --libs should be correct (closes: #155312) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 22 Feb 2003 17:34:23 +0100 + +libxml2 (2.5.1-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 18 Jan 2003 10:52:56 +0100 + +libxml2 (2.5.0-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 7 Jan 2003 19:02:10 +0100 + +libxml2 (2.4.30-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 14 Dec 2002 16:55:13 +0100 + +libxml2 (2.4.28-2) unstable; urgency=low + + * Upgraded libtool (closes: #172418) + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 1 Dec 2002 15:59:49 +0100 + +libxml2 (2.4.28-1) unstable; urgency=low + + * New upstream release + * Added patch from CVS to fix KDE problems. + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Nov 2002 19:58:54 +0100 + +libxml2 (2.4.27-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 18 Nov 2002 21:05:07 +0100 + +libxml2 (2.4.26-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 15 Nov 2002 17:29:30 +0100 + +libxml2 (2.4.24-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 24 Aug 2002 22:28:24 +0200 + +libxml2 (2.4.23-2) unstable; urgency=low + + * Created new libxml2-python package + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 30 Jul 2002 20:16:17 +0200 + +libxml2 (2.4.23-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 8 Jul 2002 00:20:43 +0200 + +libxml2 (2.4.22-1) unstable; urgency=low + + * New upstream release (closes: #149287) + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 7 Jun 2002 19:43:21 +0200 + +libxml2 (2.4.21-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 10 May 2002 18:40:02 +0200 + +libxml2 (2.4.20-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 23 Apr 2002 22:13:37 +0200 + +libxml2 (2.4.19-4) unstable; urgency=low + + * Make libxml2-dev replace libxml2 <= 2.4.19-1 (closes: #142609, #142741) + * Update shlibs version to 2.4.19-4 (closes: #142806) + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 14 Apr 2002 12:19:51 +0200 + +libxml2 (2.4.19-3) unstable; urgency=low + + * Dont use threads for now (closes: #142596) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 13 Apr 2002 15:53:04 +0200 + +libxml2 (2.4.19-2) unstable; urgency=low + + * Move pkgconfig stuff to -dev package (closes: #142171) + * Compile with thread support (closes: #141764) + * xml2-config --cflags will return same paths as previous versions + (closes: #142229) + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 12 Apr 2002 18:21:48 +0200 + +libxml2 (2.4.19-1) unstable; urgency=low + + * New upstream release + * Fixed doc-base (closes: #141067) + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 3 Apr 2002 19:45:33 +0200 + +libxml2 (2.4.16-2) unstable; urgency=low + + * New version as last version was built with broken debhelper. + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Feb 2002 22:28:24 +0100 + +libxml2 (2.4.16-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 23 Feb 2002 20:21:34 +0100 + +libxml2 (2.4.13-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 15 Jan 2002 20:02:53 +0100 + +libxml2 (2.4.12-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 8 Dec 2001 22:52:44 +0100 + +libxml2 (2.4.10-1) unstable; urgency=low + + * New upstream release + * Applied patch from LaMont Jones <lamont@smallone.fc.hp.com> to fix + gcc 3.0 build problem (closes: #120254) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Nov 2001 18:02:29 +0100 + +libxml2 (2.4.8-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 5 Nov 2001 19:49:26 +0100 + +libxml2 (2.4.6-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 18 Oct 2001 19:48:07 +0200 + +libxml2 (2.4.5-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 15 Sep 2001 23:11:11 +0200 + +libxml2 (2.4.3-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 27 Aug 2001 20:32:21 +0200 + +libxml2 (2.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 21 Aug 2001 20:39:44 +0200 + +libxml2 (2.4.1-1) unstable; urgency=low + + * New upstream release + * Added ncurses and readline build depends. + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 24 Jul 2001 21:08:16 +0200 + +libxml2 (2.4.0-2) unstable; urgency=low + + * xml2-config --libs only outputs -lxml2 (closes: #97739) + * Patched libxml.m4 to include string.h + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 18 Jul 2001 13:44:10 +0200 + +libxml2 (2.4.0-1) unstable; urgency=low + + * New upstream release (closes: #105568) + * Fixed xml2-config to not output -I/usr/include, -L/usr/lib + (closes: #101390) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 17 Jul 2001 12:43:34 +0200 + +libxml2 (2.3.13-3.1) unstable; urgency=low + + * NMU (for porting) + * Change configure / configure.in to not specify -I/usr/include + (closes: #104603) + + -- Matthew Wilcox <willy@debian.org> Fri, 13 Jul 2001 17:08:36 -0600 + +libxml2 (2.3.13-3) unstable; urgency=low + + * Don't build example (closes: #103220, #103281) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 3 Jul 2001 16:13:31 +0200 + +libxml2 (2.3.13-2) unstable; urgency=low + + * xmllint is back + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 2 Jul 2001 21:05:25 +0200 + +libxml2 (2.3.13-1) unstable; urgency=low + + * New upstream release + * Use DH_COMPAT 3 + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 1 Jul 2001 17:37:08 +0200 + +libxml2 (2.3.11-1) unstable; urgency=low + + * New upstream release + * Apparently builds on Alpha now (closes: #95938) + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 17 Jun 2001 21:33:36 +0200 + +libxml2 (2.3.10-2) unstable; urgency=low + + * Quick hack to fix makefiles on m68k (closes: #99897) + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 11 Jun 2001 14:51:14 +0200 + +libxml2 (2.3.10-1) unstable; urgency=low + + * New upstream release + * Leave pkgconfig as someone wants it (closes: #97621) + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 3 Jun 2001 22:02:25 +0200 + +libxml2 (2.3.9-1) unstable; urgency=low + + * I am back. Some bugs closed by NMUs (closes: #96944, #86508) + * Updated libtool (closes: #98137) + * Fixed dependency (closes: #98323) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 2 Jun 2001 16:37:18 +0200 + +libxml2 (2.3.9-0.1) unstable; urgency=low + + * NMU of a new upstream release. + * Changed shlibs, they should change every time the API is augmented. + * Updated xmllint(1) manpage. Removed useless libxml(4) manpage. + + -- Nicolás Lichtmaier <nick@debian.org> Sun, 20 May 2001 20:25:02 -0300 + +libxml2 (2.3.8-0.2) unstable; urgency=low + + * Non-maintainer upload with permission from maintainer to fix the + libxml-dev conflict. + * The symbolic links to old, libxml-dev names introduced in 2.3.0-1 are + now gone: programs wanting to link with libxml2 should explicity call + the new libxml2-config (almost all the packages in debian are already + doing that.) + * Changed libxml-dev to libxml2-dev in debian/libxml2-dev.doc-base to + resolve libxml-dev conflict. + * Fixed shlibs problem introduced in previous NMU by wrong -V argument + of dh_makeshlibs. + + -- Federico Di Gregorio <fog@debian.org> Thu, 10 May 2001 16:37:59 +0200 + +libxml2 (2.3.8-0.1) unstable; urgency=low + + * Non-maintainer upload with permission from maintainer + * New upstream release + * Fixes shlibs version info (closes: #96291) + * config.sub & config.guess updated (closes: #96100) + + -- Jeremy T. Bouse <jbouse@debian.org> Wed, 9 May 2001 22:57:28 -0700 + +libxml2 (2.3.7-1) unstable; urgency=low + + * New upstream release (closes: #95692) + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 29 Apr 2001 11:42:54 +0200 + +libxml2 (2.3.5-2) unstable; urgency=low + + * Rebuild to avoid link problems (closes: #92721) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 3 Apr 2001 16:12:20 +0200 + +libxml2 (2.3.5-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 25 Mar 2001 10:58:21 +0200 + +libxml2 (2.3.4-1) unstable; urgency=low + + * New upstream release + * Applied IBM S/390 patch on config.sub (closes: #88551) + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 15 Mar 2001 19:49:17 +0100 + +libxml2 (2.3.3-2) unstable; urgency=low + + * Updated shlibs file with dependency (closes: #87337) + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 8 Mar 2001 10:26:46 +0100 + +libxml2 (2.3.3-1) unstable; urgency=low + + * New upstream release + * Fixed xml2Conf.sh so gnome-config works (closes: #88341) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 3 Mar 2001 16:53:05 +0100 + +libxml2 (2.3.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 1 Mar 2001 09:46:37 +0100 + +libxml2 (2.3.1-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Feb 2001 09:44:04 +0100 + +libxml2 (2.3.0-1) unstable; urgency=low + + * New upstream release (closes: #86379) + For some reason the library has changed name from libxml to libxml2 and + the config script from libxml-config to libxml2-config. I am providing + symbolic links to the old names, hopefully this will prevent stuff from + breaking. + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 17 Feb 2001 23:25:43 +0100 + +libxml2 (2.2.8-1) unstable; urgency=low + + * New upstream release + * Probably a bad idea to remove -lz so put it back and add dependency on + libz-dev in dev-package. + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 20 Nov 2000 14:03:34 +0100 + +libxml2 (2.2.6-1) unstable; urgency=low + + * New upstream release + * Removed -lz from xml-config --libs (closes: #74709) + + -- Fredrik Hallenberg <hallon@debian.org> Fri, 27 Oct 2000 12:47:57 +0200 + +libxml2 (2.2.4-1) unstable; urgency=low + + * New upstream release (closes: #74488, #70051) + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 11 Oct 2000 07:26:31 +0200 + +libxml2 (2.2.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 29 Aug 2000 22:55:43 +0200 + +libxml2 (2.2.1-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 3 Aug 2000 21:28:29 +0200 + +libxml2 (2.0.0-3) unstable; urgency=low + + * Doc-base now uses correct directory + + -- Fredrik Hallenberg <hallon@debian.org> Mon, 3 Jul 2000 09:20:23 +0200 + +libxml2 (2.0.0-2) unstable; urgency=low + + * Renamed dev-package to libxml2-dev + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 28 Jun 2000 10:48:48 +0200 + +libxml2 (2.0.0-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Jun 2000 11:36:12 +0200 + +libxml (1.8.7-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 11 Mar 2000 20:33:28 +0100 + +libxml (1.8.6-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 5 Feb 2000 15:01:51 +0100 + +libxml (1.8.5-1) unstable; urgency=low + + * New upstream release (closes: #56172) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 25 Jan 2000 14:57:12 +0100 + +libxml (1.8.4-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 16 Jan 2000 13:01:14 +0100 + +libxml (1.8.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 30 Dec 1999 11:38:47 +0100 + +libxml (1.7.3-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Wed, 29 Sep 1999 23:33:28 +0200 + +libxml (1.4.0-4) unstable; urgency=low + + * Oops, must of course replace old libxml0 package. (closes: #43519) + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 26 Aug 1999 09:37:18 +0200 + +libxml (1.4.0-3) unstable; urgency=low + + * Provide libxml.so.0 (which is binary compatible with libxml1) + (closes: #43385) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 24 Aug 1999 09:31:15 +0200 + +libxml (1.4.0-2) unstable; urgency=low + + * Include example in dev-package. + * Fixed postinst to only call ldconfig on configure. + * Let dh_installdocs handle doc-base. + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 21 Aug 1999 14:44:52 +0200 + +libxml (1.4.0-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 5 Aug 1999 16:05:26 +0200 + +libxml (1.1.0-2) unstable; urgency=low + + * Added man page for xml-config. (closes: #39471) + + -- Fredrik Hallenberg <hallon@debian.org> Sat, 3 Jul 1999 14:55:55 +0200 + +libxml (1.1.0-1) unstable; urgency=low + + * New upstream release. (closes: #39791) + * Use install-docs on dev documents. + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 20 Jun 1999 10:20:53 +0200 + +libxml (1.0.0-2) unstable; urgency=low + + * Moved html-documentation to dev package. (closes: #39049) + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 15 Jun 1999 21:07:44 +0200 + +libxml (1.0.0-1) unstable; urgency=low + + * Patched xml-config.in. xml-config --version didn't work as expected. + Fixes bug #34881. + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Tue, 16 Mar 1999 18:36:11 +0100 + +libxml (0.99.8-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg <hallon@debian.org> Thu, 18 Feb 1999 15:40:19 +0100 + +libxml (0.99.3-2) unstable; urgency=low + + * New maintainer. + * Some files were missing from the last release (xml-config, encoding.h, + debugXML.h) + * New rules file. + + -- Fredrik Hallenberg <hallon@debian.org> Sun, 14 Feb 1999 18:56:10 +0100 + +libxml (0.99.3-1) unstable; urgency=low + + * New upstream version. + * Recompile with lastest GNOME libs. + * Fix #28869. + + -- Vincent Renardias <vincent@waw.com> Wed, 20 Jan 1999 11:32:55 +0100 + +libxml (0.30-1) unstable; urgency=low + + * Initial debianization. + + -- Vincent Renardias <vincent@waw.com> Fri, 25 Sep 1998 19:16:53 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1220df1 --- /dev/null +++ b/debian/control @@ -0,0 +1,148 @@ +Source: libxml2 +Priority: optional +Section: libs +Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> +Uploaders: Aron Xu <aron@debian.org>, YunQiang Su <wzssyqa@gmail.com> +Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, + libpython-all-dev, libpython-all-dbg, + python-all-dev:any (>= 2.7.5-5~), python-all-dbg:any, + zlib1g-dev | libz-dev, liblzma-dev +Homepage: http://xmlsoft.org/ +Vcs-Git: git://anonscm.debian.org/debian-xml-sgml/libxml2.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-xml-sgml/libxml2.git +XS-Testsuite: autopkgtest + +Package: libxml2 +Priority: standard +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: xml-core +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 + 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 package provides a library providing an extensive API to handle + such XML data files. + +Package: libxml2-utils +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 + 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 package provides xmllint, a tool for validating and reformatting + XML documents, and xmlcatalog, a tool to parse and manipulate XML or + SGML catalog files. + +Package: libxml2-utils-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libxml2-utils (= ${binary:Version}), ${misc:Depends} +Description: XML utilities (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 + 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 package provides the debugging symbols for the utilities provided + by the libxml2-utils package. + +Package: libxml2-dev +Architecture: any +Section: libdevel +Depends: libxml2 (= ${binary:Version}), ${misc:Depends} +Suggests: pkg-config +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 + 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. + . + Install this package if you wish to develop your own programs using + the GNOME XML library. + +Package: libxml2-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libxml2 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Description: Debugging symbols 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 + 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 package provides the debugging symbols for the library. + +Package: libxml2-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Multi-Arch: foreign +Description: Documentation 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 + 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 package contains general information about the GNOME XML library + and more specific API references. + +Package: python-libxml2 +Architecture: any +Section: python +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +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 + 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 package contains the files needed to use the GNOME XML library + in Python programs. + +Package: python-libxml2-dbg +Architecture: any +Section: debug +Priority: extra +Provides: ${python:Provides} +Depends: python-dbg, python-libxml2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +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 + 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 package contains the files needed to use the GNOME XML library + in Python programs for use with the Python debug interpreter. diff --git a/debian/control.udeb b/debian/control.udeb new file mode 100644 index 0000000..bba35d3 --- /dev/null +++ b/debian/control.udeb @@ -0,0 +1,16 @@ + +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 --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7a37994 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,104 @@ +This package was debianized by Vincent Renardias <vincent@waw.com> on +Sat, 26 Sep 1998 16:50:54 +0200 + +It was downloaded from ftp://xmlsoft.org/libxml2/ + +========================== + +Except where otherwise noted in the source code (trio files, hash.c and list.c) +covered by a similar licence but with different Copyright notices: + + Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Daniel Veillard shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from him. +========================== +trio.c, trio.h: +Copyright (C) 1998 Bjorn Reese and Daniel Stenberg. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. +========================== +triop.h: +Copyright (C) 2000 Bjorn Reese and Daniel Stenberg. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. +========================== +hash.c: +Copyright (C) 2000 Bjorn Reese and Daniel Veillard. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. +========================== +list.c: +Copyright (C) 2000 Gary Pennington and Daniel Veillard. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. +========================== +triodef.h, trionan.c, trionan.h: +Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net> + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. +========================== +triostr.c, triostr.h: +Copyright (C) 2001 Bjorn Reese and Daniel Stenberg. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND +CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. diff --git a/debian/libxml2-dbg.preinst b/debian/libxml2-dbg.preinst new file mode 100644 index 0000000..c248ab0 --- /dev/null +++ b/debian/libxml2-dbg.preinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +[ "$1" = "upgrade" ] && +[ -L /usr/share/doc/libxml2-dbg ] && +rm -f /usr/share/doc/libxml2-dbg + +#DEBHELPER# + +exit 0 diff --git a/debian/libxml2-dev.install b/debian/libxml2-dev.install new file mode 100644 index 0000000..aa09d9e --- /dev/null +++ b/debian/libxml2-dev.install @@ -0,0 +1,7 @@ +usr/bin/xml2-config +usr/lib/*/libxml2.so +usr/lib/*/libxml2.a +usr/lib/*/xml2Conf.sh +usr/share/aclocal +usr/lib/*/pkgconfig +usr/include/libxml2 diff --git a/debian/libxml2-dev.manpages b/debian/libxml2-dev.manpages new file mode 100644 index 0000000..17f65f5 --- /dev/null +++ b/debian/libxml2-dev.manpages @@ -0,0 +1,2 @@ +libxml.3 +xml2-config.1 diff --git a/debian/libxml2-dev.preinst b/debian/libxml2-dev.preinst new file mode 100644 index 0000000..6429c86 --- /dev/null +++ b/debian/libxml2-dev.preinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +[ "$1" = "upgrade" ] && +[ -L /usr/share/doc/libxml2-dev ] && +rm -f /usr/share/doc/libxml2-dev + +#DEBHELPER# + +exit 0 diff --git a/debian/libxml2-doc.doc-base b/debian/libxml2-doc.doc-base new file mode 100644 index 0000000..156af5a --- /dev/null +++ b/debian/libxml2-doc.doc-base @@ -0,0 +1,10 @@ +Document: libxml2-doc +Title: Reference manual for the libxml2. +Author: Daniel Veillard +Abstract: This manual describes the functions available in libxml2. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libxml2-doc/index.html +Files: /usr/share/doc/libxml2-doc/*.html + /usr/share/doc/libxml2-doc/*/*.html diff --git a/debian/libxml2-doc.install b/debian/libxml2-doc.install new file mode 100644 index 0000000..2a59cf4 --- /dev/null +++ b/debian/libxml2-doc.install @@ -0,0 +1,2 @@ +usr/share/doc/libxml2-doc +usr/share/gtk-doc diff --git a/debian/libxml2-udeb.install b/debian/libxml2-udeb.install new file mode 100644 index 0000000..dc0c3ec --- /dev/null +++ b/debian/libxml2-udeb.install @@ -0,0 +1 @@ +usr/lib/*/libxml2.so.* usr/lib diff --git a/debian/libxml2-utils.install b/debian/libxml2-utils.install new file mode 100644 index 0000000..3cafad4 --- /dev/null +++ b/debian/libxml2-utils.install @@ -0,0 +1,2 @@ +usr/bin/xmllint +usr/bin/xmlcatalog diff --git a/debian/libxml2-utils.manpages b/debian/libxml2-utils.manpages new file mode 100644 index 0000000..470f8f7 --- /dev/null +++ b/debian/libxml2-utils.manpages @@ -0,0 +1,2 @@ +doc/xmllint.1 +doc/xmlcatalog.1 diff --git a/debian/libxml2-utils.preinst b/debian/libxml2-utils.preinst new file mode 100644 index 0000000..8c07be8 --- /dev/null +++ b/debian/libxml2-utils.preinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +[ "$1" = "upgrade" ] && +[ -L /usr/share/doc/libxml2-utils ] && +rm -f /usr/share/doc/libxml2-utils + +#DEBHELPER# + +exit 0 diff --git a/debian/libxml2.install b/debian/libxml2.install new file mode 100644 index 0000000..d1a994c --- /dev/null +++ b/debian/libxml2.install @@ -0,0 +1 @@ +usr/lib/*/libxml2.so.* diff --git a/debian/libxml2.lintian-overrides b/debian/libxml2.lintian-overrides new file mode 100644 index 0000000..05487a2 --- /dev/null +++ b/debian/libxml2.lintian-overrides @@ -0,0 +1 @@ +libxml2: package-name-doesnt-match-sonames diff --git a/debian/libxml2.symbols b/debian/libxml2.symbols new file mode 100644 index 0000000..374ef1d --- /dev/null +++ b/debian/libxml2.symbols @@ -0,0 +1,171 @@ +libxml2.so.2 libxml2 #MINVER# + (symver|optional)LIBXML2_2.4.30 2.7.4 + (symver|optional)LIBXML2_2.5.0 2.7.4 + (symver|optional)LIBXML2_2.5.2 2.7.4 + (symver|optional)LIBXML2_2.5.4 2.7.4 + (symver|optional)LIBXML2_2.5.5 2.7.4 + (symver|optional)LIBXML2_2.5.6 2.7.4 + (symver|optional)LIBXML2_2.5.7 2.7.4 + (symver|optional)LIBXML2_2.5.8 2.7.4 + (symver|optional)LIBXML2_2.5.9 2.7.4 + (symver|optional)LIBXML2_2.6.0 2.7.4 + (symver|optional)LIBXML2_2.6.10 2.7.4 + (symver|optional)LIBXML2_2.6.11 2.7.4 + (symver|optional)LIBXML2_2.6.12 2.7.4 + (symver|optional)LIBXML2_2.6.14 2.7.4 + (symver|optional)LIBXML2_2.6.15 2.7.4 + (symver|optional)LIBXML2_2.6.16 2.7.4 + (symver|optional)LIBXML2_2.6.17 2.7.4 + (symver|optional)LIBXML2_2.6.18 2.7.4 + (symver|optional)LIBXML2_2.6.19 2.7.4 + (symver|optional)LIBXML2_2.6.1 2.7.4 + (symver|optional)LIBXML2_2.6.20 2.7.4 + (symver|optional)LIBXML2_2.6.21 2.7.4 + (symver|optional)LIBXML2_2.6.23 2.7.4 + (symver|optional)LIBXML2_2.6.24 2.7.4 + (symver|optional)LIBXML2_2.6.25 2.7.4 + (symver|optional)LIBXML2_2.6.27 2.7.4 + (symver|optional)LIBXML2_2.6.28 2.7.4 + (symver|optional)LIBXML2_2.6.29 2.7.4 + (symver|optional)LIBXML2_2.6.2 2.7.4 + (symver|optional)LIBXML2_2.6.32 2.7.4 + (symver|optional)LIBXML2_2.6.3 2.7.4 + (symver|optional)LIBXML2_2.6.5 2.7.4 + (symver|optional)LIBXML2_2.6.6 2.7.4 + (symver|optional)LIBXML2_2.6.7 2.7.4 + (symver|optional)LIBXML2_2.6.8 2.7.4 + (symver|optional)LIBXML2_2.7.0 2.7.4 + (symver|optional)LIBXML2_2.7.3 2.7.4 + (symver|optional)LIBXML2_2.7.4 2.7.4 + (symver|optional)LIBXML2_2.8.0 2.8.0 + (symver|optional)LIBXML2_2.9.0 2.9.0 + (symver|optional)LIBXML2_2.9.1 2.9.1 + __docbDefaultSAXHandler@Base 2.6.27 + __htmlDefaultSAXHandler@Base 2.6.27 + __htmlParseContent@Base 2.6.27 + __libxml2_xzclose@Base 2.8.0 + __libxml2_xzdopen@Base 2.8.0 + __libxml2_xzopen@Base 2.8.0 + __libxml2_xzread@Base 2.8.0 + __oldXMLWDcompatibility@Base 2.6.27 + __xmlBufferAllocScheme@Base 2.6.27 + __xmlDefaultBufferSize@Base 2.6.27 + __xmlDefaultSAXHandler@Base 2.6.27 + __xmlDefaultSAXLocator@Base 2.6.27 + __xmlDeregisterNodeDefaultValue@Base 2.6.27 + __xmlDoValidityCheckingDefaultValue@Base 2.6.27 + __xmlErrEncoding@Base 2.6.27 + __xmlGenericError@Base 2.6.27 + __xmlGenericErrorContext@Base 2.6.27 + __xmlGetWarningsDefaultValue@Base 2.6.27 + __xmlGlobalInitMutexDestroy@Base 2.6.31 + __xmlGlobalInitMutexLock@Base 2.6.28 + __xmlGlobalInitMutexUnlock@Base 2.6.28 + __xmlIOErr@Base 2.6.27 + __xmlIndentTreeOutput@Base 2.6.27 + __xmlInitializeDict@Base 2.9.1 + __xmlKeepBlanksDefaultValue@Base 2.6.27 + __xmlLastError@Base 2.6.27 + __xmlLineNumbersDefaultValue@Base 2.6.27 + __xmlLoadExtDtdDefaultValue@Base 2.6.27 + __xmlLoaderErr@Base 2.6.27 + __xmlOutputBufferCreateFilename@Base 2.6.27 + __xmlOutputBufferCreateFilenameValue@Base 2.6.27 + __xmlParserDebugEntities@Base 2.6.27 + __xmlParserInputBufferCreateFilename@Base 2.6.27 + __xmlParserInputBufferCreateFilenameValue@Base 2.6.27 + __xmlParserVersion@Base 2.6.27 + __xmlPedanticParserDefaultValue@Base 2.6.27 + __xmlRaiseError@Base 2.6.27 + __xmlRandom@Base 2.8.0 + __xmlRegisterCallbacks@Base 2.6.27 + __xmlRegisterNodeDefaultValue@Base 2.6.27 + __xmlSaveNoEmptyTags@Base 2.6.27 + __xmlSimpleError@Base 2.6.27 + __xmlStructuredError@Base 2.6.27 + __xmlStructuredErrorContext@Base 2.7.4 + __xmlSubstituteEntitiesDefaultValue@Base 2.6.27 + __xmlTreeIndentString@Base 2.6.27 + compute_minrun@Base 2.9.0 + htmlDecodeEntities@Base 2.6.27 + libxml_domnode_binary_insertion_sort@Base 2.9.0 + libxml_domnode_tim_sort@Base 2.9.0 + xmlAllocOutputBufferInternal@Base 2.7.1 + xmlAutomataSetFlags@Base 2.7.4 + xmlBufAdd@Base 2.9.0 + xmlBufAddHead@Base 2.9.0 + xmlBufAddLen@Base 2.9.0 + xmlBufAttrSerializeTxtContent@Base 2.9.0 + xmlBufAvail@Base 2.9.0 + xmlBufBackToBuffer@Base 2.9.0 + xmlBufCCat@Base 2.9.0 + xmlBufCat@Base 2.9.0 + xmlBufContent@LIBXML2_2.9.0 2.9.0 + xmlBufCreate@Base 2.9.0 + xmlBufCreateSize@Base 2.9.0 + xmlBufCreateStatic@Base 2.9.0 + xmlBufDetach@Base 2.9.0 + xmlBufDump@Base 2.9.0 + xmlBufDumpAttributeDecl@Base 2.9.0 + xmlBufDumpElementDecl@Base 2.9.0 + xmlBufDumpEntityDecl@Base 2.9.0 + xmlBufDumpNotationTable@Base 2.9.0 + xmlBufEmpty@Base 2.9.0 + xmlBufEnd@LIBXML2_2.9.0 2.9.0 + xmlBufErase@Base 2.9.0 + xmlBufFree@Base 2.9.0 + xmlBufFromBuffer@Base 2.9.0 + xmlBufGetAllocationScheme@Base 2.9.0 + xmlBufGetInputBase@Base 2.9.0 + xmlBufGetNodeContent@LIBXML2_2.9.0 2.9.0 + xmlBufGrow@Base 2.9.0 + xmlBufInflate@Base 2.9.0 + xmlBufIsEmpty@Base 2.9.0 + xmlBufLength@Base 2.9.0 + xmlBufMergeBuffer@Base 2.9.0 + xmlBufNodeDump@LIBXML2_2.9.0 2.9.0 + xmlBufResetInput@Base 2.9.0 + xmlBufResize@Base 2.9.0 + xmlBufSetAllocationScheme@Base 2.9.0 + xmlBufSetInputBaseCur@Base 2.9.0 + xmlBufShrink@LIBXML2_2.9.0 2.9.0 + xmlBufUse@LIBXML2_2.9.0 2.9.0 + xmlBufWriteCHAR@Base 2.9.0 + xmlBufWriteChar@Base 2.9.0 + xmlBufWriteQuotedString@Base 2.9.0 + xmlBufferDetach@LIBXML2_2.8.0 2.8.0 + xmlBuildRelativeURI@LIBXML2_2.6.11 2.8.0 + xmlCharEncFirstLineInput@Base 2.9.0 + xmlCharEncFirstLineInt@Base 2.7.4 + xmlCharEncInput@Base 2.9.0 + xmlCharEncOutput@Base 2.9.0 + xmlDictGetUsage@LIBXML2_2.9.0 2.9.0 + xmlDictSetLimit@LIBXML2_2.9.0 2.9.0 + xmlEncodeAttributeEntities@Base 2.9.0 + xmlGenericErrorDefaultFunc@Base 2.6.27 + xmlInitializeDict@LIBXML2_2.8.0 2.8.0 + xmlMallocBreakpoint@Base 2.6.27 + xmlNop@Base 2.9.1 + xmlNsListDumpOutput@Base 2.6.27 + xmlOutputBufferCreateFilenameDefault@LIBXML2_2.6.11 2.8.0 + xmlOutputBufferCreateFilenameValue@LIBXML2_2.6.11 2.8.0 + xmlOutputBufferGetContent@LIBXML2_2.9.0 2.9.0 + xmlOutputBufferGetSize@LIBXML2_2.9.0 2.9.0 + xmlParserInputBufferCreateFilenameDefault@LIBXML2_2.6.11 2.8.0 + xmlParserInputBufferCreateFilenameValue@LIBXML2_2.6.11 2.8.0 + xmlSchemaCollapseString@LIBXML2_2.6.11 2.8.0 + xmlSchemaFreeWildcard@LIBXML2_2.6.11 2.8.0 + xmlSchemaGetBuiltInListSimpleTypeItemType@LIBXML2_2.6.11 2.8.0 + xmlSchemaGetBuiltInType@LIBXML2_2.6.11 2.8.0 + xmlSchemaIsBuiltInTypeFacet@LIBXML2_2.6.11 2.8.0 + xmlSchemaValidateListSimpleTypeFacet@LIBXML2_2.6.11 2.8.0 + xmlSchemaValidateSetFilename@LIBXML2_2.9.0 2.9.0 + xmlSchemaValidateSetLocator@LIBXML2_2.9.0 2.9.0 + xmlTextWriterSetQuoteChar@LIBXML2_2.9.0 2.9.0 + xmlThrDefOutputBufferCreateFilenameDefault@LIBXML2_2.6.11 2.8.0 + xmlThrDefParserInputBufferCreateFilenameDefault@LIBXML2_2.6.11 2.8.0 + xmlTextReaderRelaxNGValidateCtxt@LIBXML2_2.8.0 + xmlUpgradeOldNs@Base 2.6.27 + xmlXPathNodeEval@LIBXML2_2.9.1 2.9.1 + xmlXPathSetContextNode@LIBXML2_2.9.1 2.9.1 + xmlXPtrAdvanceNode@Base 2.6.27 diff --git a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch new file mode 100644 index 0000000..c5b16bb --- /dev/null +++ b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch @@ -0,0 +1,108 @@ +From: Aron Xu <aron@debian.org> +Date: Fri, 21 Sep 2012 00:19:41 +0800 +Subject: modify xml2-config and pkgconfig behaviour + +--- + configure.in | 2 +- + libxml-2.0-uninstalled.pc.in | 3 ++- + libxml-2.0.pc.in | 2 +- + xml2-config.1 | 4 ++++ + xml2-config.in | 22 ++++++++++------------ + 5 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/configure.in b/configure.in +index d449b11..668f233 100644 +--- a/configure.in ++++ b/configure.in +@@ -1380,7 +1380,7 @@ case "$host" in + *) M_LIBS="-lm" + ;; + esac +-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" ++XML_LIBS="-lxml2" + XML_LIBTOOLLIBS="libxml2.la" + AC_SUBST(WITH_ICONV) + +diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in +index cab6834..af16ebc 100644 +--- a/libxml-2.0-uninstalled.pc.in ++++ b/libxml-2.0-uninstalled.pc.in +@@ -8,5 +8,6 @@ Name: libXML + Version: @VERSION@ + Description: libXML library version2. + Requires: +-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ ++Libs: -L${libdir} -lxml2 ++Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ + Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ +diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in +index f5f5f03..0de667b 100644 +--- a/libxml-2.0.pc.in ++++ b/libxml-2.0.pc.in +@@ -9,5 +9,5 @@ Version: @VERSION@ + Description: libXML library version2. + Requires: + Libs: -L${libdir} -lxml2 +-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ ++Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ @LZMA_LIBS@ + Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ +diff --git a/xml2-config.1 b/xml2-config.1 +index 8cf9858..7b4195d 100644 +--- a/xml2-config.1 ++++ b/xml2-config.1 +@@ -8,11 +8,15 @@ xml-config - script to get information about the installed version of GNOME-XML + \fIxml-config\fP is a tool that is used to determine the compile and + linker flags that should be used to compile and link programs that use + \fIGNOME-XML\fP. ++It is highly recommended to use pkg-config instead because building in a ++multi-arch environment is not well supported in this script. + .SH OPTIONS + \fIxml-config\fP accepts the following options: + .TP 8 + .B \-\-version + Print the currently installed version of \fIGNOME-XML\fP on the standard output. ++Add the \fB\-\-static\fP option to print the linker flags that are necessary ++to \fBstatically\fP link a \fIGNOME-XML\fP program. + .TP 8 + .B \-\-libs + Print the linker flags that are necessary to link a \fIGNOME-XML\fP program. +diff --git a/xml2-config.in b/xml2-config.in +index 1957486..b764d83 100644 +--- a/xml2-config.in ++++ b/xml2-config.in +@@ -15,6 +15,8 @@ Known values for OPTION are: + --prefix=DIR change libxml prefix [default $prefix] + --exec-prefix=DIR change libxml exec prefix [default $exec_prefix] + --libs print library linking information ++ add --static to print static library linking ++ information + --cflags print pre-processor and compiler flags + --modules module support enabled + --help display this help and exit +@@ -82,18 +84,14 @@ while test $# -gt 0; do + ;; + + --libs) +- if [ "`uname`" = "Linux" ] +- then +- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +- then +- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +- fi +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ +- fi +- ;; ++ LIBS="@XML_LIBS@ @WIN32_EXTRA_LIBADD@" ++ if [ "$2" = "--static" ] ++ then ++ shift ++ LIBS="${LIBS} @Z_LIBS@ @BASE_THREAD_LIBS@@THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@" ++ fi ++ echo ${LIBS} ++ ;; + + *) + usage diff --git a/debian/patches/0002-fix-python-multiarch-includes.patch b/debian/patches/0002-fix-python-multiarch-includes.patch new file mode 100644 index 0000000..ff7c4fa --- /dev/null +++ b/debian/patches/0002-fix-python-multiarch-includes.patch @@ -0,0 +1,35 @@ +From: Matthias Klose <doko@ubuntu.com> +Date: Wed, 9 Jul 2014 05:30:24 +0800 +Subject: fix python multiarch includes + +--- + python/Makefile.am | 2 +- + python/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 34aed96..8445ea5 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -19,7 +19,7 @@ if WITH_PYTHON + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ $(PYTHON_INCLUDES) + + python_LTLIBRARIES = libxml2mod.la + +diff --git a/python/Makefile.in b/python/Makefile.in +index efdea43..23e7fa2 100644 +--- a/python/Makefile.in ++++ b/python/Makefile.in +@@ -430,7 +430,7 @@ EXTRA_DIST = \ + @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 --git a/debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch b/debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch new file mode 100644 index 0000000..03bf447 --- /dev/null +++ b/debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch @@ -0,0 +1,27 @@ +From: Alexander Pastukhov <pastuchov@yandex.ru> +Date: Tue, 23 Apr 2013 05:02:11 +0000 +Subject: Fix an error in xmlCleanupParser + +https://bugzilla.gnome.org/show_bug.cgi?id=698582 + +xmlCleanupParser calls xmlCleanupGlobals() and then +xmlResetLastError() but the later reallocate the global +data freed by previous call. Just swap the two calls. +--- + parser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index ee429f3..b9df6d8 100644 +--- a/parser.c ++++ b/parser.c +@@ -14763,8 +14763,8 @@ xmlCleanupParser(void) { + xmlSchemaCleanupTypes(); + xmlRelaxNGCleanupTypes(); + #endif +- xmlCleanupGlobals(); + xmlResetLastError(); ++ xmlCleanupGlobals(); + xmlCleanupThreads(); /* must be last if called not from the main thread */ + xmlCleanupMemory(); + xmlParserInitialized = 0; diff --git a/debian/patches/0004-Fix-missing-break-on-last-function-for-attributes.patch b/debian/patches/0004-Fix-missing-break-on-last-function-for-attributes.patch new file mode 100644 index 0000000..cff8b72 --- /dev/null +++ b/debian/patches/0004-Fix-missing-break-on-last-function-for-attributes.patch @@ -0,0 +1,21 @@ +From: dcb <dcb314@hotmail.com> +Date: Thu, 2 May 2013 08:11:46 +0000 +Subject: Fix missing break on last() function for attributes + +pointed out by cppcheck +--- + python/libxml.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/python/libxml.c b/python/libxml.c +index 03cfb9f..3338b83 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) + xmlAttrPtr attr = (xmlAttrPtr) cur; + + res = attr->last; ++ break; + } + default: + res = NULL; diff --git a/debian/patches/0005-xmllint-memory-should-fail-on-empty-files.patch b/debian/patches/0005-xmllint-memory-should-fail-on-empty-files.patch new file mode 100644 index 0000000..e1a2197 --- /dev/null +++ b/debian/patches/0005-xmllint-memory-should-fail-on-empty-files.patch @@ -0,0 +1,27 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Wed, 8 May 2013 05:45:48 +0000 +Subject: xmllint --memory should fail on empty files + +Exposed by https://bugzilla.gnome.org/show_bug.cgi?id=699896 +when doing analysis but a priori unrelated. +--- + xmllint.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xmllint.c b/xmllint.c +index 26d8db1..c0196ab 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -2338,8 +2338,11 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { + if ((fd = open(filename, O_RDONLY)) < 0) + return; + base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; +- if (base == (void *) MAP_FAILED) ++ if (base == (void *) MAP_FAILED) { ++ fprintf(stderr, "mmap failure for file %s\n", filename); ++ progresult = XMLLINT_ERR_RDFILE; + return; ++ } + + if (rectxt == NULL) + doc = xmlReadMemory((char *) base, info.st_size, diff --git a/debian/patches/0006-properly-quote-the-namespace-uris-written-out-during.patch b/debian/patches/0006-properly-quote-the-namespace-uris-written-out-during.patch new file mode 100644 index 0000000..6f4c4c8 --- /dev/null +++ b/debian/patches/0006-properly-quote-the-namespace-uris-written-out-during.patch @@ -0,0 +1,32 @@ +From: Aleksey Sanin <aleksey@aleksey.com> +Date: Thu, 9 May 2013 16:02:16 +0000 +Subject: properly quote the namespace uris written out during c14n + +--- + c14n.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/c14n.c b/c14n.c +index afd95b3..ca77f92 100644 +--- a/c14n.c ++++ b/c14n.c +@@ -547,14 +547,15 @@ xmlC14NPrintNamespaces(const xmlNsPtr ns, xmlC14NCtxPtr ctx) + if (ns->prefix != NULL) { + xmlOutputBufferWriteString(ctx->buf, " xmlns:"); + xmlOutputBufferWriteString(ctx->buf, (const char *) ns->prefix); +- xmlOutputBufferWriteString(ctx->buf, "=\""); ++ xmlOutputBufferWriteString(ctx->buf, "="); + } else { +- xmlOutputBufferWriteString(ctx->buf, " xmlns=\""); ++ xmlOutputBufferWriteString(ctx->buf, " xmlns="); + } + if(ns->href != NULL) { +- xmlOutputBufferWriteString(ctx->buf, (const char *) ns->href); ++ xmlBufWriteQuotedString(ctx->buf->buffer, ns->href); ++ } else { ++ xmlOutputBufferWriteString(ctx->buf, "\"\""); + } +- xmlOutputBufferWriteString(ctx->buf, "\""); + return (1); + } + diff --git a/debian/patches/0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch b/debian/patches/0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch new file mode 100644 index 0000000..442fd11 --- /dev/null +++ b/debian/patches/0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch @@ -0,0 +1,57 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Wed, 22 May 2013 20:56:45 +0000 +Subject: Fix a parsing bug on non-ascii element and CR/LF usage + +https://bugzilla.gnome.org/show_bug.cgi?id=698550 + +Somehow the behaviour of the internal parser routine changed +slightly when encountering CR/LF, which led to a bug when +parsing document with non-ascii Names +--- + parser.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b9df6d8..dd00399 100644 +--- a/parser.c ++++ b/parser.c +@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + int len = 0, l; + int c; + int count = 0; ++ const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */ + + #ifdef DEBUG + nbParseNCNameComplex++; +@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + * Handler for more complex cases + */ + GROW; ++ end = ctxt->input->cur; + c = CUR_CHAR(l); + if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */ + (!xmlIsNameStartChar(ctxt, c) || (c == ':'))) { +@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + } + len += l; + NEXTL(l); ++ end = ctxt->input->cur; + c = CUR_CHAR(l); + if (c == 0) { + count = 0; + GROW; + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); ++ end = ctxt->input->cur; + c = CUR_CHAR(l); + } + } +@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); + return(NULL); + } +- return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len)); ++ return(xmlDictLookup(ctxt->dict, end - len, len)); + } + + /** diff --git a/debian/patches/0008-missing-else-in-xlink.c.patch b/debian/patches/0008-missing-else-in-xlink.c.patch new file mode 100644 index 0000000..88a4e86 --- /dev/null +++ b/debian/patches/0008-missing-else-in-xlink.c.patch @@ -0,0 +1,22 @@ +From: Ami Fischman <fischman@google.com> +Date: Tue, 2 Jul 2013 09:47:26 +0800 +Subject: missing else in xlink.c + +Obviously forgotten +--- + xlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xlink.c b/xlink.c +index 3566e06..c0e4ff3 100644 +--- a/xlink.c ++++ b/xlink.c +@@ -150,7 +150,7 @@ xlinkIsLink (xmlDocPtr doc, xmlNodePtr node) { + if (type != NULL) { + if (xmlStrEqual(type, BAD_CAST "simple")) { + ret = XLINK_TYPE_SIMPLE; +- } if (xmlStrEqual(type, BAD_CAST "extended")) { ++ } else if (xmlStrEqual(type, BAD_CAST "extended")) { + role = xmlGetNsProp(node, BAD_CAST "role", XLINK_NAMESPACE); + if (role != NULL) { + xmlNsPtr xlink; diff --git a/debian/patches/0009-Catch-malloc-error-and-exit-accordingly.patch b/debian/patches/0009-Catch-malloc-error-and-exit-accordingly.patch new file mode 100644 index 0000000..3f93a57 --- /dev/null +++ b/debian/patches/0009-Catch-malloc-error-and-exit-accordingly.patch @@ -0,0 +1,24 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 11 Jul 2013 15:41:22 +0800 +Subject: Catch malloc error and exit accordingly + +As pointed privately by Bill Parker <wp02855@gmail.com> +--- + xmllint.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xmllint.c b/xmllint.c +index c0196ab..4d464e4 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -3090,6 +3090,10 @@ static void usage(const char *name) { + static void registerNode(xmlNodePtr node) + { + node->_private = malloc(sizeof(long)); ++ if (node->_private == NULL) { ++ fprintf(stderr, "Out of memory in xmllint:registerNode()\n"); ++ exit(XMLLINT_ERR_MEM); ++ } + *(long*)node->_private = (long) 0x81726354; + nbregister++; + } diff --git a/debian/patches/0010-Fix-handling-of-mmap-errors.patch b/debian/patches/0010-Fix-handling-of-mmap-errors.patch new file mode 100644 index 0000000..0c55cfe --- /dev/null +++ b/debian/patches/0010-Fix-handling-of-mmap-errors.patch @@ -0,0 +1,51 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Fri, 12 Jul 2013 12:08:40 +0800 +Subject: Fix handling of mmap errors + +https://bugzilla.gnome.org/show_bug.cgi?id=702320 + +as raised by Gaurav <ya1gaurav@gmail.com> +--- + xmllint.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/xmllint.c b/xmllint.c +index 4d464e4..92e6b03 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -1837,8 +1837,12 @@ static void streamFile(char *filename) { + if ((fd = open(filename, O_RDONLY)) < 0) + return; + base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; +- if (base == (void *) MAP_FAILED) ++ if (base == (void *) MAP_FAILED) { ++ close(fd); ++ fprintf(stderr, "mmap failure for file %s\n", filename); ++ progresult = XMLLINT_ERR_RDFILE; + return; ++ } + + reader = xmlReaderForMemory(base, info.st_size, filename, + NULL, options); +@@ -2223,8 +2227,12 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { + if ((fd = open(filename, O_RDONLY)) < 0) + return; + base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; +- if (base == (void *) MAP_FAILED) ++ if (base == (void *) MAP_FAILED) { ++ close(fd); ++ fprintf(stderr, "mmap failure for file %s\n", filename); ++ progresult = XMLLINT_ERR_RDFILE; + return; ++ } + + doc = htmlReadMemory((char *) base, info.st_size, filename, + NULL, options); +@@ -2339,6 +2347,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { + return; + base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; + if (base == (void *) MAP_FAILED) { ++ close(fd); + fprintf(stderr, "mmap failure for file %s\n", filename); + progresult = XMLLINT_ERR_RDFILE; + return; diff --git a/debian/patches/0011-Avoid-crash-if-allocation-fails.patch b/debian/patches/0011-Avoid-crash-if-allocation-fails.patch new file mode 100644 index 0000000..e4e7206 --- /dev/null +++ b/debian/patches/0011-Avoid-crash-if-allocation-fails.patch @@ -0,0 +1,25 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Mon, 22 Jul 2013 14:28:20 +0800 +Subject: Avoid crash if allocation fails + +https://bugzilla.gnome.org/show_bug.cgi?id=704527 +xmlSchemaNewValue() may fail on OOM error +--- + xmlschemastypes.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xmlschemastypes.c b/xmlschemastypes.c +index a9edc03..ec403e8 100644 +--- a/xmlschemastypes.c ++++ b/xmlschemastypes.c +@@ -242,6 +242,10 @@ xmlSchemaNewMinLengthFacet(int value) + } + ret->type = XML_SCHEMA_FACET_MINLENGTH; + ret->val = xmlSchemaNewValue(XML_SCHEMAS_NNINTEGER); ++ if (ret->val == NULL) { ++ xmlFree(ret); ++ return(NULL); ++ } + ret->val->value.decimal.lo = value; + return (ret); + } diff --git a/debian/patches/0012-Fix-a-possible-NULL-dereference.patch b/debian/patches/0012-Fix-a-possible-NULL-dereference.patch new file mode 100644 index 0000000..9a7cf6f --- /dev/null +++ b/debian/patches/0012-Fix-a-possible-NULL-dereference.patch @@ -0,0 +1,30 @@ +From: Gaurav <g.gupta@40samsung.com> +Date: Sat, 3 Aug 2013 22:16:02 +0800 +Subject: Fix a possible NULL dereference + +https://bugzilla.gnome.org/show_bug.cgi?id=705400 +In case of allocation error the pointer was dereferenced before the +test for a failure +--- + SAX2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SAX2.c b/SAX2.c +index 4adf202..33d167e 100644 +--- a/SAX2.c ++++ b/SAX2.c +@@ -994,12 +994,12 @@ xmlSAX2StartDocument(void *ctx) + #ifdef LIBXML_HTML_ENABLED + if (ctxt->myDoc == NULL) + ctxt->myDoc = htmlNewDocNoDtD(NULL, NULL); +- ctxt->myDoc->properties = XML_DOC_HTML; +- ctxt->myDoc->parseFlags = ctxt->options; + if (ctxt->myDoc == NULL) { + xmlSAX2ErrMemory(ctxt, "xmlSAX2StartDocument"); + return; + } ++ ctxt->myDoc->properties = XML_DOC_HTML; ++ ctxt->myDoc->parseFlags = ctxt->options; + #else + xmlGenericError(xmlGenericErrorContext, + "libxml2 built without HTML support\n"); diff --git a/debian/patches/0013-Clear-up-a-potential-NULL-dereference.patch b/debian/patches/0013-Clear-up-a-potential-NULL-dereference.patch new file mode 100644 index 0000000..a18dfaf --- /dev/null +++ b/debian/patches/0013-Clear-up-a-potential-NULL-dereference.patch @@ -0,0 +1,26 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Sat, 3 Aug 2013 22:25:13 +0800 +Subject: Clear up a potential NULL dereference + +https://bugzilla.gnome.org/show_bug.cgi?id=705399 + +if ctxt->node_seq.buffer is null then ctxt->node_seq.maximum ought +to be zero but it's better to clarify the check in the code directly. +--- + parserInternals.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parserInternals.c b/parserInternals.c +index f8a7041..98a5836 100644 +--- a/parserInternals.c ++++ b/parserInternals.c +@@ -1990,7 +1990,8 @@ xmlParserAddNodeInfo(xmlParserCtxtPtr ctxt, + + /* Otherwise, we need to add new node to buffer */ + else { +- if (ctxt->node_seq.length + 1 > ctxt->node_seq.maximum) { ++ if ((ctxt->node_seq.length + 1 > ctxt->node_seq.maximum) || ++ (ctxt->node_seq.buffer == NULL)) { + xmlParserNodeInfo *tmp_buffer; + unsigned int byte_size; + diff --git a/debian/patches/0014-Fix-XPath-optimization-with-predicates.patch b/debian/patches/0014-Fix-XPath-optimization-with-predicates.patch new file mode 100644 index 0000000..f24424a --- /dev/null +++ b/debian/patches/0014-Fix-XPath-optimization-with-predicates.patch @@ -0,0 +1,27 @@ +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Sun, 4 Aug 2013 22:15:11 +0000 +Subject: Fix XPath '//' optimization with predicates + +My attempt to optimize XPath expressions containing '//' caused a +regression reported in bug #695699. This commit disables the +optimization for expressions of the form '//foo[predicate]'. +--- + xpath.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xpath.c b/xpath.c +index 97410e7..a676989 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -14719,8 +14719,9 @@ xmlXPathOptimizeExpression(xmlXPathCompExprPtr comp, xmlXPathStepOpPtr op) + * internal representation. + */ + +- if ((op->ch1 != -1) && +- (op->op == XPATH_OP_COLLECT /* 11 */)) ++ if ((op->op == XPATH_OP_COLLECT /* 11 */) && ++ (op->ch1 != -1) && ++ (op->ch2 == -1 /* no predicate */)) + { + xmlXPathStepOpPtr prevop = &comp->steps[op->ch1]; + diff --git a/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch new file mode 100644 index 0000000..b910c3a --- /dev/null +++ b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch @@ -0,0 +1,34 @@ +From: Tim Galeckas <tim@galeckas.com> +Date: Thu, 29 Aug 2013 16:44:33 +0800 +Subject: xmllint --pretty crashed without following numeric argument + +https://bugzilla.gnome.org/show_bug.cgi?id=674789 + +We need to check for NULL argument before calling atoi() +--- + xmllint.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/xmllint.c b/xmllint.c +index 92e6b03..d69722c 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -3388,11 +3388,13 @@ main(int argc, char **argv) { + (!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 --git a/debian/patches/0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch b/debian/patches/0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch new file mode 100644 index 0000000..fa8a176 --- /dev/null +++ b/debian/patches/0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch @@ -0,0 +1,45 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Wed, 11 Sep 2013 14:59:06 +0800 +Subject: Fix potential NULL pointer dereferences in regexp code + +https://bugzilla.gnome.org/show_bug.cgi?id=707749 + +Fix 3 cases where we might dereference NULL +--- + xmlregexp.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/xmlregexp.c b/xmlregexp.c +index 1f9911c..8e63d74 100644 +--- a/xmlregexp.c ++++ b/xmlregexp.c +@@ -3162,8 +3162,10 @@ xmlFARegExecRollBack(xmlRegExecCtxtPtr exec) { + exec->status = -6; + return; + } +- memcpy(exec->counts, exec->rollbacks[exec->nbRollbacks].counts, ++ if (exec->counts) { ++ memcpy(exec->counts, exec->rollbacks[exec->nbRollbacks].counts, + exec->comp->nbCounters * sizeof(int)); ++ } + } + + #ifdef DEBUG_REGEXP_EXEC +@@ -4091,7 +4093,7 @@ rollback: + */ + exec->determinist = 0; + xmlFARegExecRollBack(exec); +- if (exec->status == 0) { ++ if ((exec->inputStack != NULL ) && (exec->status == 0)) { + value = exec->inputStack[exec->index].value; + data = exec->inputStack[exec->index].data; + #ifdef DEBUG_PUSH +@@ -4306,7 +4308,7 @@ xmlRegExecGetValues(xmlRegExecCtxtPtr exec, int err, + (*nbval)++; + } + } else { +- if ((exec->comp->states[trans->to] != NULL) && ++ if ((exec->comp != NULL) && (exec->comp->states[trans->to] != NULL) && + (exec->comp->states[trans->to]->type != + XML_REGEXP_SINK_STATE)) { + if (atom->neg) diff --git a/debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch b/debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch new file mode 100644 index 0000000..2c55813 --- /dev/null +++ b/debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch @@ -0,0 +1,26 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Wed, 11 Sep 2013 15:11:27 +0800 +Subject: Fix a potential NULL dereference in tree code + +https://bugzilla.gnome.org/show_bug.cgi?id=707750 + +Also reported by Gaurav, simple fix to check the pointer before +dereference +--- + tree.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tree.c b/tree.c +index 7e5af26..efc3ca2 100644 +--- a/tree.c ++++ b/tree.c +@@ -9780,7 +9780,8 @@ leave_node: + if (clone->parent != NULL) + clone->parent->last = clone; + clone = clone->parent; +- parentClone = clone->parent; ++ if (clone != NULL) ++ parentClone = clone->parent; + /* + * Process parent --> next; + */ diff --git a/debian/patches/0018-Fix-pointer-dereferenced-before-null-check.patch b/debian/patches/0018-Fix-pointer-dereferenced-before-null-check.patch new file mode 100644 index 0000000..3ae1c59 --- /dev/null +++ b/debian/patches/0018-Fix-pointer-dereferenced-before-null-check.patch @@ -0,0 +1,25 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Mon, 30 Sep 2013 10:43:47 +0800 +Subject: Fix pointer dereferenced before null check + +for https://bugzilla.gnome.org/show_bug.cgi?id=708364 + +xmlValidateElementContent is a private function but should still +check the ctxt argument before dereferencing +--- + valid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/valid.c b/valid.c +index 6e53a76..e0832e7 100644 +--- a/valid.c ++++ b/valid.c +@@ -5236,7 +5236,7 @@ xmlValidateElementContent(xmlValidCtxtPtr ctxt, xmlNodePtr child, + xmlElementContentPtr cont; + const xmlChar *name; + +- if ((elemDecl == NULL) || (parent == NULL)) ++ if ((elemDecl == NULL) || (parent == NULL) || (ctxt == NULL)) + return(-1); + cont = elemDecl->content; + name = elemDecl->name; diff --git a/debian/patches/0019-Fix-a-bug-loading-some-compressed-files.patch b/debian/patches/0019-Fix-a-bug-loading-some-compressed-files.patch new file mode 100644 index 0000000..48b4fa4 --- /dev/null +++ b/debian/patches/0019-Fix-a-bug-loading-some-compressed-files.patch @@ -0,0 +1,69 @@ +From: Mike Alexander <mta@umich.edu> +Date: Thu, 28 Nov 2013 23:21:23 +0800 +Subject: Fix a bug loading some compressed files + +For https://bugzilla.gnome.org/show_bug.cgi?id=712528 +Related to https://bugzilla.redhat.com/show_bug.cgi?id=877567 + +There is a bug in xzlib.c which causes certain compressed XML files to fail to +load correctly. The code in xz_decomp which attempts to verify the checksum +and length of the expanded data fails if the checksum or length at the end of +the file crosses a 1024 byte boundary. It calls gz_next4 to get those two +values. This function uses the stream state in state->zstrm, but calls +xz_avail which uses the state->strm stream info. This causes gz_next4 to +signal a premature EOF if the data it is fetching crosses a 1024 byte boundary. +--- + xzlib.c | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +diff --git a/xzlib.c b/xzlib.c +index 928bd17..cd045fa 100644 +--- a/xzlib.c ++++ b/xzlib.c +@@ -245,6 +245,20 @@ xz_avail(xz_statep state) + return 0; + } + ++#ifdef HAVE_ZLIB_H ++static int ++xz_avail_zstrm(xz_statep state) ++{ ++ int ret; ++ state->strm.avail_in = state->zstrm.avail_in; ++ state->strm.next_in = state->zstrm.next_in; ++ ret = xz_avail(state); ++ state->zstrm.avail_in = (uInt) state->strm.avail_in; ++ state->zstrm.next_in = (Bytef *) state->strm.next_in; ++ return ret; ++} ++#endif ++ + static int + is_format_xz(xz_statep state) + { +@@ -314,6 +328,10 @@ is_format_lzma(xz_statep state) + #define NEXT() ((strm->avail_in == 0 && xz_avail(state) == -1) ? -1 : \ + (strm->avail_in == 0 ? -1 : \ + (strm->avail_in--, *(strm->next_in)++))) ++/* Same thing, but from zstrm */ ++#define NEXTZ() ((strm->avail_in == 0 && xz_avail_zstrm(state) == -1) ? -1 : \ ++ (strm->avail_in == 0 ? -1 : \ ++ (strm->avail_in--, *(strm->next_in)++))) + + /* Get a four-byte little-endian integer and return 0 on success and the value + in *ret. Otherwise -1 is returned and *ret is not modified. */ +@@ -324,10 +342,10 @@ gz_next4(xz_statep state, unsigned long *ret) + unsigned long val; + z_streamp strm = &(state->zstrm); + +- val = NEXT(); +- val += (unsigned) NEXT() << 8; +- val += (unsigned long) NEXT() << 16; +- ch = NEXT(); ++ val = NEXTZ(); ++ val += (unsigned) NEXTZ() << 8; ++ val += (unsigned long) NEXTZ() << 16; ++ ch = NEXTZ(); + if (ch == -1) + return -1; + val += (unsigned long) ch << 24; diff --git a/debian/patches/0020-Avoid-a-possibility-of-dangling-encoding-handler.patch b/debian/patches/0020-Avoid-a-possibility-of-dangling-encoding-handler.patch new file mode 100644 index 0000000..ab0bde8 --- /dev/null +++ b/debian/patches/0020-Avoid-a-possibility-of-dangling-encoding-handler.patch @@ -0,0 +1,57 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Fri, 29 Nov 2013 23:10:50 +0800 +Subject: Avoid a possibility of dangling encoding handler + +For https://bugzilla.gnome.org/show_bug.cgi?id=711149 + +In Function: +int xmlCharEncCloseFunc(xmlCharEncodingHandler *handler) + +If the freed handler is any one of handlers[i] list, then it will make that +hanldlers[i] as dangling. This may lead to crash issues at places where +handlers is read. +--- + encoding.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/encoding.c b/encoding.c +index 7330e90..d4fc45f 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -2851,14 +2851,25 @@ int + xmlCharEncCloseFunc(xmlCharEncodingHandler *handler) { + int ret = 0; + int tofree = 0; ++ int i, handler_in_list = 0; ++ + if (handler == NULL) return(-1); + if (handler->name == NULL) return(-1); ++ if (handlers != NULL) { ++ for (i = 0;i < nbCharEncodingHandler; i++) { ++ if (handler == handlers[i]) { ++ handler_in_list = 1; ++ break; ++ } ++ } ++ } + #ifdef LIBXML_ICONV_ENABLED + /* + * Iconv handlers can be used only once, free the whole block. + * and the associated icon resources. + */ +- if ((handler->iconv_out != NULL) || (handler->iconv_in != NULL)) { ++ if ((handler_in_list == 0) && ++ ((handler->iconv_out != NULL) || (handler->iconv_in != NULL))) { + tofree = 1; + if (handler->iconv_out != NULL) { + if (iconv_close(handler->iconv_out)) +@@ -2873,7 +2884,8 @@ xmlCharEncCloseFunc(xmlCharEncodingHandler *handler) { + } + #endif /* LIBXML_ICONV_ENABLED */ + #ifdef LIBXML_ICU_ENABLED +- if ((handler->uconv_out != NULL) || (handler->uconv_in != NULL)) { ++ if ((handler_in_list == 0) && ++ ((handler->uconv_out != NULL) || (handler->uconv_in != NULL))) { + tofree = 1; + if (handler->uconv_out != NULL) { + closeIcuConverter(handler->uconv_out); diff --git a/debian/patches/0021-Fix-a-couple-of-missing-NULL-checks.patch b/debian/patches/0021-Fix-a-couple-of-missing-NULL-checks.patch new file mode 100644 index 0000000..6771dbb --- /dev/null +++ b/debian/patches/0021-Fix-a-couple-of-missing-NULL-checks.patch @@ -0,0 +1,29 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Fri, 29 Nov 2013 23:28:21 +0800 +Subject: Fix a couple of missing NULL checks + +For https://bugzilla.gnome.org/show_bug.cgi?id=708681 +--- + tree.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tree.c b/tree.c +index efc3ca2..43c3c57 100644 +--- a/tree.c ++++ b/tree.c +@@ -4294,6 +4294,7 @@ xmlStaticCopyNodeList(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent) { + } + if (doc->intSubset == NULL) { + q = (xmlNodePtr) xmlCopyDtd( (xmlDtdPtr) node ); ++ if (q == NULL) return(NULL); + q->doc = doc; + q->parent = parent; + doc->intSubset = (xmlDtdPtr) q; +@@ -4305,6 +4306,7 @@ xmlStaticCopyNodeList(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent) { + } else + #endif /* LIBXML_TREE_ENABLED */ + q = xmlStaticCopyNode(node, doc, parent, 1); ++ if (q == NULL) return(NULL); + if (ret == NULL) { + q->prev = NULL; + ret = p = q; diff --git a/debian/patches/0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch b/debian/patches/0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch new file mode 100644 index 0000000..7820411 --- /dev/null +++ b/debian/patches/0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch @@ -0,0 +1,148 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Mon, 9 Dec 2013 15:23:40 +0800 +Subject: adding init calls to xml and html Read parsing entry points + +As pointed out by "Tassyns, Bram <BramT@enfocus.com>" on the list +some call had it other didn't, clean it up and add to all missing +ones +--- + HTMLparser.c | 6 ++++++ + parser.c | 10 ++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/HTMLparser.c b/HTMLparser.c +index dd0c1ea..44c1a3c 100644 +--- a/HTMLparser.c ++++ b/HTMLparser.c +@@ -6808,6 +6808,7 @@ htmlReadFd(int fd, const char *URL, const char *encoding, int options) + + if (fd < 0) + return (NULL); ++ xmlInitParser(); + + xmlInitParser(); + input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); +@@ -6898,6 +6899,7 @@ htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + htmlCtxtReset(ctxt); + +@@ -6931,6 +6933,7 @@ htmlCtxtReadFile(htmlParserCtxtPtr ctxt, const char *filename, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + htmlCtxtReset(ctxt); + +@@ -6967,6 +6970,7 @@ htmlCtxtReadMemory(htmlParserCtxtPtr ctxt, const char *buffer, int size, + return (NULL); + if (buffer == NULL) + return (NULL); ++ xmlInitParser(); + + htmlCtxtReset(ctxt); + +@@ -7009,6 +7013,7 @@ htmlCtxtReadFd(htmlParserCtxtPtr ctxt, int fd, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + htmlCtxtReset(ctxt); + +@@ -7053,6 +7058,7 @@ htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + htmlCtxtReset(ctxt); + +diff --git a/parser.c b/parser.c +index dd00399..ad400f4 100644 +--- a/parser.c ++++ b/parser.c +@@ -15217,6 +15217,7 @@ xmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int optio + + if (cur == NULL) + return (NULL); ++ xmlInitParser(); + + ctxt = xmlCreateDocParserCtxt(cur); + if (ctxt == NULL) +@@ -15239,6 +15240,7 @@ xmlReadFile(const char *filename, const char *encoding, int options) + { + xmlParserCtxtPtr ctxt; + ++ xmlInitParser(); + ctxt = xmlCreateURLParserCtxt(filename, options); + if (ctxt == NULL) + return (NULL); +@@ -15262,6 +15264,7 @@ xmlReadMemory(const char *buffer, int size, const char *URL, const char *encodin + { + xmlParserCtxtPtr ctxt; + ++ xmlInitParser(); + ctxt = xmlCreateMemoryParserCtxt(buffer, size); + if (ctxt == NULL) + return (NULL); +@@ -15290,6 +15293,7 @@ xmlReadFd(int fd, const char *URL, const char *encoding, int options) + + if (fd < 0) + return (NULL); ++ xmlInitParser(); + + input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); + if (input == NULL) +@@ -15333,6 +15337,7 @@ xmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, + + if (ioread == NULL) + return (NULL); ++ xmlInitParser(); + + input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx, + XML_CHAR_ENCODING_NONE); +@@ -15379,6 +15384,7 @@ xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar * cur, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + xmlCtxtReset(ctxt); + +@@ -15412,6 +15418,7 @@ xmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + xmlCtxtReset(ctxt); + +@@ -15448,6 +15455,7 @@ xmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size, + return (NULL); + if (buffer == NULL) + return (NULL); ++ xmlInitParser(); + + xmlCtxtReset(ctxt); + +@@ -15492,6 +15500,7 @@ xmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + xmlCtxtReset(ctxt); + +@@ -15537,6 +15546,7 @@ xmlCtxtReadIO(xmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, + return (NULL); + if (ctxt == NULL) + return (NULL); ++ xmlInitParser(); + + xmlCtxtReset(ctxt); + diff --git a/debian/patches/0023-Handling-of-XPath-function-arguments-in-error-case.patch b/debian/patches/0023-Handling-of-XPath-function-arguments-in-error-case.patch new file mode 100644 index 0000000..cc18db7 --- /dev/null +++ b/debian/patches/0023-Handling-of-XPath-function-arguments-in-error-case.patch @@ -0,0 +1,41 @@ +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Fri, 20 Dec 2013 00:01:53 +0100 +Subject: Handling of XPath function arguments in error case + +The XPath engine tries to guarantee that every XPath function can pop +'nargs' non-NULL values off the stack. libxslt, for example, relies on +this assumption. But the check isn't thorough enough if there are errors +during the evaluation of arguments. This can lead to segfaults: + +https://mail.gnome.org/archives/xslt/2013-December/msg00005.html + +This commit makes the handling of function arguments more robust. + +* Bail out early when evaluation of XPath function arguments fails. +* Make sure that there are 'nargs' arguments in the current call frame. +--- + xpath.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/xpath.c b/xpath.c +index a676989..a75df9b 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -13512,10 +13512,15 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + int frame; + + frame = xmlXPathSetFrame(ctxt); +- if (op->ch1 != -1) ++ if (op->ch1 != -1) { + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); +- if (ctxt->valueNr < op->value) { ++ if (ctxt->error != XPATH_EXPRESSION_OK) { ++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++ } ++ if (ctxt->valueNr < ctxt->valueFrame + op->value) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; diff --git a/debian/patches/0024-Missing-initialization-for-the-catalog-module.patch b/debian/patches/0024-Missing-initialization-for-the-catalog-module.patch new file mode 100644 index 0000000..c5a5d16 --- /dev/null +++ b/debian/patches/0024-Missing-initialization-for-the-catalog-module.patch @@ -0,0 +1,22 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Sun, 26 Jan 2014 15:02:25 +0100 +Subject: Missing initialization for the catalog module + +--- + parser.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/parser.c b/parser.c +index ad400f4..7381a78 100644 +--- a/parser.c ++++ b/parser.c +@@ -14720,6 +14720,9 @@ xmlInitParser(void) { + #ifdef LIBXML_XPATH_ENABLED + xmlXPathInit(); + #endif ++#ifdef LIBXML_CATALOG_ENABLED ++ xmlInitializeCatalog(); ++#endif + xmlParserInitialized = 1; + #ifdef LIBXML_THREAD_ENABLED + } diff --git a/debian/patches/0025-Fix-an-fd-leak-in-an-error-case.patch b/debian/patches/0025-Fix-an-fd-leak-in-an-error-case.patch new file mode 100644 index 0000000..edf1752 --- /dev/null +++ b/debian/patches/0025-Fix-an-fd-leak-in-an-error-case.patch @@ -0,0 +1,24 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 6 Feb 2014 10:38:00 +0100 +Subject: Fix an fd leak in an error case + +--- + catalog.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/catalog.c b/catalog.c +index 8e34cd2..56991da 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -994,6 +994,11 @@ xmlLoadFileContent(const char *filename) + content = (xmlChar*)xmlMallocAtomic(size + 10); + if (content == NULL) { + xmlCatalogErrMemory("allocating catalog data"); ++#ifdef HAVE_STAT ++ close(fd); ++#else ++ fclose(fd); ++#endif + return (NULL); + } + #ifdef HAVE_STAT diff --git a/debian/patches/0026-fixing-a-ptotential-uninitialized-access.patch b/debian/patches/0026-fixing-a-ptotential-uninitialized-access.patch new file mode 100644 index 0000000..65eae92 --- /dev/null +++ b/debian/patches/0026-fixing-a-ptotential-uninitialized-access.patch @@ -0,0 +1,21 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 6 Feb 2014 10:47:20 +0100 +Subject: fixing a ptotential uninitialized access + +--- + valid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/valid.c b/valid.c +index e0832e7..114bb72 100644 +--- a/valid.c ++++ b/valid.c +@@ -6948,7 +6948,7 @@ xmlValidGetValidElements(xmlNode *prev, xmlNode *next, const xmlChar **names, + int max) { + xmlValidCtxt vctxt; + int nb_valid_elements = 0; +- const xmlChar *elements[256]; ++ const xmlChar *elements[256]={0}; + int nb_elements = 0, i; + const xmlChar *name; + diff --git a/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch b/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch new file mode 100644 index 0000000..22d206a --- /dev/null +++ b/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch @@ -0,0 +1,29 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Sat, 8 Feb 2014 02:22:35 +0800 +Subject: Fix xmlTextWriterWriteElement when a null content is given + +--- + xmlwriter.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/xmlwriter.c b/xmlwriter.c +index d3f29f8..27209b9 100644 +--- a/xmlwriter.c ++++ b/xmlwriter.c +@@ -2238,10 +2238,12 @@ xmlTextWriterWriteElement(xmlTextWriterPtr writer, const xmlChar * name, + if (count == -1) + return -1; + sum += count; +- count = xmlTextWriterWriteString(writer, content); +- if (count == -1) +- return -1; +- sum += count; ++ if (content != NULL) { ++ count = xmlTextWriterWriteString(writer, content); ++ if (count == -1) ++ return -1; ++ sum += count; ++ } + count = xmlTextWriterEndElement(writer); + if (count == -1) + return -1; diff --git a/debian/patches/0028-Avoid-a-possible-NULL-pointer-dereference.patch b/debian/patches/0028-Avoid-a-possible-NULL-pointer-dereference.patch new file mode 100644 index 0000000..219d13a --- /dev/null +++ b/debian/patches/0028-Avoid-a-possible-NULL-pointer-dereference.patch @@ -0,0 +1,22 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Tue, 18 Feb 2014 11:47:43 +0800 +Subject: Avoid a possible NULL pointer dereference + +For https://bugzilla.gnome.org/show_bug.cgi?id=708355 +--- + xmlmodule.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xmlmodule.c b/xmlmodule.c +index 7fe5bc2..50ed666 100644 +--- a/xmlmodule.c ++++ b/xmlmodule.c +@@ -115,7 +115,7 @@ xmlModuleSymbol(xmlModulePtr module, const char *name, void **symbol) + { + int rc = -1; + +- if ((NULL == module) || (symbol == NULL)) { ++ if ((NULL == module) || (symbol == NULL) || (name == NULL)) { + __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_MODULE, + XML_MODULE_OPEN, XML_ERR_FATAL, NULL, 0, 0, + NULL, NULL, 0, 0, "null parameter\n"); diff --git a/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch new file mode 100644 index 0000000..06ec27c --- /dev/null +++ b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch @@ -0,0 +1,35 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Tue, 22 Apr 2014 15:30:56 +0800 +Subject: Do not fetch external parameter entities + +Unless explicitely asked for when validating or replacing entities +with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com> +--- + parser.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/parser.c b/parser.c +index 7381a78..8aad7b4 100644 +--- a/parser.c ++++ b/parser.c +@@ -2595,6 +2595,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + xmlCharEncoding enc; + + /* ++ * Note: external parsed entities will not be loaded, it is ++ * not required for a non-validating parser, unless the ++ * option of validating, or substituting entities were ++ * given. Doing so is far more secure as the parser will ++ * only process data coming from the document entity by ++ * default. ++ */ ++ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && ++ ((ctxt->options & XML_PARSE_NOENT) == 0) && ++ ((ctxt->options & XML_PARSE_DTDVALID) == 0) && ++ (ctxt->validate == 0)) ++ return; ++ ++ /* + * handle the extra spaces added before and after + * c.f. http://www.w3.org/TR/REC-xml#as-PE + * this is done independently. diff --git a/debian/patches/0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch b/debian/patches/0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch new file mode 100644 index 0000000..8a84731 --- /dev/null +++ b/debian/patches/0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch @@ -0,0 +1,32 @@ +From: Gaurav <g.gupta@samsung.com> +Date: Fri, 9 May 2014 17:00:08 +0800 +Subject: Avoid Possible null pointer dereference in memory debug mode + +Fix a use before check on pointer +For https://bugzilla.gnome.org/show_bug.cgi?id=729849 +--- + xmlmemory.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xmlmemory.c b/xmlmemory.c +index 25d9318..37dcf3b 100644 +--- a/xmlmemory.c ++++ b/xmlmemory.c +@@ -583,13 +583,15 @@ xmlMemBlocks(void) { + static void + xmlMemContentShow(FILE *fp, MEMHDR *p) + { +- int i,j,k,len = p->mh_size; +- const char *buf = (const char *) HDR_2_CLIENT(p); ++ int i,j,k,len; ++ const char *buf; + + if (p == NULL) { + fprintf(fp, " NULL"); + return; + } ++ len = p->mh_size; ++ buf = (const char *) HDR_2_CLIENT(p); + + for (i = 0;i < len;i++) { + if (buf[i] == 0) break; diff --git a/debian/patches/0031-xmllint-was-not-parsing-the-c14n11-flag.patch b/debian/patches/0031-xmllint-was-not-parsing-the-c14n11-flag.patch new file mode 100644 index 0000000..7b24f6b --- /dev/null +++ b/debian/patches/0031-xmllint-was-not-parsing-the-c14n11-flag.patch @@ -0,0 +1,22 @@ +From: =?UTF-8?q?S=C3=A9rgio=20Batista?= <mail@se.rg.io> +Date: Mon, 9 Jun 2014 22:10:15 +0800 +Subject: xmllint was not parsing the --c14n11 flag + +Cut and paste error, using the wrong variable +--- + xmllint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xmllint.c b/xmllint.c +index d69722c..4a5d043 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -2573,7 +2573,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { + fprintf(stderr, "Failed to canonicalize\n"); + progresult = XMLLINT_ERR_OUT; + } +- } else if (canonical) { ++ } else if (canonical_11) { + xmlChar *result = NULL; + int size; + diff --git a/debian/patches/0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch b/debian/patches/0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch new file mode 100644 index 0000000..d9fc108 --- /dev/null +++ b/debian/patches/0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch @@ -0,0 +1,58 @@ +From: Daniel Veillard <veillard@redhat.com> +Date: Wed, 11 Jun 2014 16:54:32 +0800 +Subject: Fix regressions introduced by CVE-2014-0191 patch + +A number of issues have been raised after the fix, and this patch +tries to correct all of them, though most were related to +postvalidation. +https://bugzilla.gnome.org/show_bug.cgi?id=730290 +and other reports on list, off-list and on Red Hat bugzilla +--- + parser.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/parser.c b/parser.c +index 8aad7b4..ea0ea65 100644 +--- a/parser.c ++++ b/parser.c +@@ -2595,8 +2595,8 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + xmlCharEncoding enc; + + /* +- * Note: external parsed entities will not be loaded, it is +- * not required for a non-validating parser, unless the ++ * Note: external parameter entities will not be loaded, it ++ * is not required for a non-validating parser, unless the + * option of validating, or substituting entities were + * given. Doing so is far more secure as the parser will + * only process data coming from the document entity by +@@ -2605,6 +2605,9 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && + ((ctxt->options & XML_PARSE_NOENT) == 0) && + ((ctxt->options & XML_PARSE_DTDVALID) == 0) && ++ ((ctxt->options & XML_PARSE_DTDLOAD) == 0) && ++ ((ctxt->options & XML_PARSE_DTDATTR) == 0) && ++ (ctxt->replaceEntities == 0) && + (ctxt->validate == 0)) + return; + +@@ -12609,6 +12612,9 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input, + return(NULL); + } + ++ /* We are loading a DTD */ ++ ctxt->options |= XML_PARSE_DTDLOAD; ++ + /* + * Set-up the SAX context + */ +@@ -12736,6 +12742,9 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID, + return(NULL); + } + ++ /* We are loading a DTD */ ++ ctxt->options |= XML_PARSE_DTDLOAD; ++ + /* + * Set-up the SAX context + */ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ce6e665 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,32 @@ +0001-modify-xml2-config-and-pkgconfig-behaviour.patch +0002-fix-python-multiarch-includes.patch +0003-Fix-an-error-in-xmlCleanupParser.patch +0004-Fix-missing-break-on-last-function-for-attributes.patch +0005-xmllint-memory-should-fail-on-empty-files.patch +0006-properly-quote-the-namespace-uris-written-out-during.patch +0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch +0008-missing-else-in-xlink.c.patch +0009-Catch-malloc-error-and-exit-accordingly.patch +0010-Fix-handling-of-mmap-errors.patch +0011-Avoid-crash-if-allocation-fails.patch +0012-Fix-a-possible-NULL-dereference.patch +0013-Clear-up-a-potential-NULL-dereference.patch +0014-Fix-XPath-optimization-with-predicates.patch +0015-xmllint-pretty-crashed-without-following-numeric-arg.patch +0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch +0017-Fix-a-potential-NULL-dereference-in-tree-code.patch +0018-Fix-pointer-dereferenced-before-null-check.patch +0019-Fix-a-bug-loading-some-compressed-files.patch +0020-Avoid-a-possibility-of-dangling-encoding-handler.patch +0021-Fix-a-couple-of-missing-NULL-checks.patch +0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch +0023-Handling-of-XPath-function-arguments-in-error-case.patch +0024-Missing-initialization-for-the-catalog-module.patch +0025-Fix-an-fd-leak-in-an-error-case.patch +0026-fixing-a-ptotential-uninitialized-access.patch +0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch +0028-Avoid-a-possible-NULL-pointer-dereference.patch +0029-Do-not-fetch-external-parameter-entities.patch +0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch +0031-xmllint-was-not-parsing-the-c14n11-flag.patch +0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch diff --git a/debian/python-libxml2-dbg.install b/debian/python-libxml2-dbg.install new file mode 100644 index 0000000..fc34bbe --- /dev/null +++ b/debian/python-libxml2-dbg.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/*.so diff --git a/debian/python-libxml2-dbg.lintian-overrides b/debian/python-libxml2-dbg.lintian-overrides new file mode 100644 index 0000000..970ee3e --- /dev/null +++ b/debian/python-libxml2-dbg.lintian-overrides @@ -0,0 +1 @@ +python-libxml2-dbg: hardening-no-fortify-functions diff --git a/debian/python-libxml2-dbg.preinst b/debian/python-libxml2-dbg.preinst new file mode 100644 index 0000000..8553b97 --- /dev/null +++ b/debian/python-libxml2-dbg.preinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +[ "$1" = "upgrade" ] && +[ -L /usr/share/doc/python-libxml2-dbg ] && +rm -f /usr/share/doc/python-libxml2-dbg + +#DEBHELPER# + +exit 0 diff --git a/debian/python-libxml2.examples b/debian/python-libxml2.examples new file mode 100644 index 0000000..de4ebf8 --- /dev/null +++ b/debian/python-libxml2.examples @@ -0,0 +1,2 @@ +python/tests/*.py +python/tests/*.xml diff --git a/debian/python-libxml2.install b/debian/python-libxml2.install new file mode 100644 index 0000000..66c4906 --- /dev/null +++ b/debian/python-libxml2.install @@ -0,0 +1,2 @@ +usr/lib/python*/*-packages/*.py* +usr/lib/python*/*-packages/*.so diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..55b006d --- /dev/null +++ b/debian/rules @@ -0,0 +1,149 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 + +# The versions of python currently supported +PYVERS=$(shell pyversions -s) +# The current default version of python +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` + +TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg) + +WITH_UDEB := $(shell dpkg-vendor --derives-from Ubuntu && echo yes) + +ifdef WITH_UDEB +$(if $(shell grep -q libxml2-udeb debian/control || echo yes),$(shell cat debian/control.udeb >> debian/control)) +TARGETS += udeb +else +$(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i /libxml2-udeb/,\$$d debian/control)) +export DH_OPTIONS = -Nlibxml2-udeb +endif + +ifeq ($(DEB_BUILD_PROFILE),stage1) +DH_OPTIONS += -Npython-libxml2 -Npython-libxml2-dbg +export DH_OPTIONS +endif + +CONFIGURE_FLAGS := --disable-silent-rules --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache" + +override_dh_auto_configure: $(TARGETS:%=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 --without-python + +override_dh_auto_build: $(TARGETS:%=dobuild-%) + +dobuild-%: BUILD_DIR=builddir/$* +dobuild-%: doconfigure-% + $(if $(filter $(BUILD_DIR),builddir/$*),,[ -d $(BUILD_DIR) ] || mv builddir/$*/python $(BUILD_DIR)) + dh_auto_build --builddirectory=$(BUILD_DIR) -- $(BUILD_FLAGS) + +dobuild-python%: BUILD_DIR=builddir/main/$* +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-%) +build-indep: +build: build-arch build-indep + +override_dh_auto_clean: + rm -rf builddir debian/tmp-dbg debian/tmp-udeb + dh_auto_clean + +override_dh_auto_install: $(TARGETS:%=doinstall-%) + find debian/ -name *.la -delete + +doinstall-main: + dh_auto_install --builddirectory=builddir/main + mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4 + + # Properly install documentation in /usr/share/doc/libxml2-doc + install -d debian/tmp/usr/share/doc/libxml2-doc/examples + install -m 644 \ + doc/*.html \ + doc/*.gif \ + doc/*.png \ + doc/libxml2-api.xml debian/tmp/usr/share/doc/libxml2-doc + install -m 644 \ + doc/examples/*.c \ + doc/examples/*.res \ + doc/examples/index.html \ + doc/examples/[tw]*.xml debian/tmp/usr/share/doc/libxml2-doc/examples + cp -a \ + doc/html \ + doc/tutorial debian/tmp/usr/share/doc/libxml2-doc + +doinstall-python%-dbg: + $(MAKE) -C builddir/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES + prename -vf 's/(?<!_d)\.so$$/_d.so/' debian/tmp-dbg/usr/lib/python$*/*-packages/*.so + +doinstall-python%: + dh_auto_install --builddirectory=builddir/main/python$* + +doinstall-udeb: + dh_auto_install --builddirectory=builddir/udeb --destdir=debian/tmp-udeb + +override_dh_installdocs: + dh_installdocs -A AUTHORS TODO README NEWS + dh_installdocs -ppython-libxml2 python/TODO + +override_dh_compress: + dh_compress -Xexamples/ -Xtutorial/ -Xhtml/ -X.html + +override_dh_installchangelogs: + dh_installchangelogs -plibxml2 ChangeLog + dh_installchangelogs -Nlibxml2 -XChangeLog + +override_dh_install: + dh_install -Npython-libxml2-dbg -Nlibxml2-udeb +ifneq ($(DEB_BUILD_PROFILE),stage1) + dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg +endif + dh_install -plibxml2-udeb --sourcedir=debian/tmp-udeb + sed -i -e 's,/lib/$(DEB_HOST_MULTIARCH),/lib,' debian/libxml2-dev/usr/bin/xml2-config + +override_dh_strip: + dh_strip -a --dbg-package=libxml2-dbg -Nlibxml2-udeb -Nlibxml2-utils -Nlibxml2-utils-dbg -Npython-libxml2 -Npython-libxml2-dbg + dh_strip -plibxml2-utils --dbg-package=libxml2-utils-dbg +ifneq ($(DEB_BUILD_PROFILE),stage1) + dh_strip -ppython-libxml2 --dbg-package=python-libxml2-dbg +endif + $(foreach python, $(filter-out $(PYVER), $(PYVERS)),\ + cd $(CURDIR)/debian/python-libxml2/usr/lib/pyshared; \ + if diff $(python)/libxml2mod.so $(PYVER)/libxml2mod.so > /dev/null 2>&1; then \ + rm -f $(python)/libxml2mod.so; \ + ln -s ../$(PYVER)/libxml2mod.so $(python)/libxml2mod.so; \ + fi;) + dh_strip + +override_dh_makeshlibs: + dh_makeshlibs -a $(if $(WITH_UDEB),--add-udeb=libxml2-udeb )-V 'libxml2 (>= 2.7.4)' -- -c4 + +%: +ifeq ($(DEB_BUILD_PROFILE),stage1) + dh $@ --with autoreconf +else + dh $@ --with autoreconf,python2 +endif + + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tests/build b/debian/tests/build new file mode 100644 index 0000000..714befa --- /dev/null +++ b/debian/tests/build @@ -0,0 +1,41 @@ +#!/bin/sh +# autopkgtest check: Build and run a program against libxml2, to verify that the +# headers and pkg-config file are installed correctly +# (C) 2012 Canonical Ltd. +# Author: Daniel Holbach <daniel.holbach@ubuntu.com> + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat <<EOF > xmltest.c +#include <libxml/parser.h> + +int +main(void) +{ + + xmlNodePtr n; + xmlDocPtr doc; + xmlNodePtr cur; + + doc = xmlNewDoc(BAD_CAST "1.0"); + n = xmlNewNode(NULL, BAD_CAST "root"); + xmlNodeSetContent(n, BAD_CAST "content"); + xmlDocSetRootElement(doc, n); + + cur = xmlDocGetRootElement(doc); + if (xmlStrcmp(cur->name, (const xmlChar *) "root")) + return (1); + xmlFreeDoc(doc); + return (0); + +} +EOF + +gcc -o xmltest xmltest.c `pkg-config --cflags --libs libxml-2.0` +echo "build: OK" +[ -x xmltest ] +./xmltest +echo "run: OK" diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..92f5df1 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Tests: build python +Depends: libxml2-dev, python-libxml2, build-essential, pkg-config diff --git a/debian/tests/python b/debian/tests/python new file mode 100644 index 0000000..5fa3338 --- /dev/null +++ b/debian/tests/python @@ -0,0 +1,22 @@ +#!/bin/sh + +python <<EOF +import libxml2 +import sys + +doc = libxml2.parseDoc( +"""<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE test [ +<!ELEMENT test (#PCDATA) > +<!ATTLIST test xmlns:abc CDATA #FIXED "http://abc.org" > +<!ATTLIST test abc:attr CDATA #FIXED "def" > +]> +<test /> +""") +elem = doc.getRootElement() +attr = elem.hasNsProp('attr', 'http://abc.org') +if attr == None or attr.serialize()[:-1] != """<!ATTLIST test abc:attr CDATA #FIXED "def">""": + print("Failed to find defaulted attribute abc:attr") + sys.exit(1) +doc.freeDoc() +EOF diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..ebd77f0 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|BETA|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ +ftp://xmlsoft.org/libxml2/libxml2-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) |