diffstat of debian/ for libxml2_2.6.27.dfsg-1 libxml2_2.6.27.dfsg-1osso4 changelog | 35 +++++++ compat | 2 control | 23 ---- libxml2-dbg.dirs | 1 libxml2-dev.dirs | 1 libxml2-dev.install | 14 +-- libxml2-dev.manpages | 2 libxml2-doc.install | 4 libxml2-utils.dirs | 1 libxml2-utils.install | 4 libxml2-utils.manpages | 2 libxml2.install | 2 patches/01-CVE-2007-6284.patch | 57 ++++++++++++ rules | 189 +++-------------------------------------- 14 files changed, 125 insertions(+), 212 deletions(-) diff -Nru libxml2-2.6.27.dfsg/debian/changelog libxml2-2.6.27.dfsg/debian/changelog --- libxml2-2.6.27.dfsg/debian/changelog 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/changelog 2008-02-19 15:19:30.000000000 +0000 @@ -1,3 +1,38 @@ +libxml2 (2.6.27.dfsg-1osso4) unstable; urgency=low + + * Added patch for CVE-2007-6284 security issue. Fixes: NB#79318 + + -- Kimmo Hämäläinen Tue, 19 Feb 2008 16:40:29 +0200 + +libxml2 (2.6.27.dfsg-1osso3) unstable; urgency=low + + * Prefer hardware floating point unless configured otherwise. + + -- Marius Vollmer Tue, 11 Sep 2007 14:03:14 +0300 + +libxml2 (2.6.27.dfsg-1osso2) unstable; urgency=low + + * Removed some non-free (document) files from the tarball: + libxml2-2.6.27/test/HTML/fp40.htm + libxml2-2.6.27/test/schemas/po0_0.xsd + libxml2-2.6.27/test/schemas/po1_0.xsd + libxml2-2.6.27/result/DocBook/bibliography.example.1.xml + libxml2-2.6.27/result/DocBook/bibliography.example.1 + libxml2-2.6.27/result/HTML/fp40.htm + libxml2-2.6.27/result/HTML/fp40.htm.sax + + -- Kimmo Hämäläinen Fri, 23 Mar 2007 16:50:55 +0200 + +libxml2 (2.6.27.dfsg-1osso1) unstable; urgency=low + + * OSSO-packaged libxml2 v2.6.27 (used Debian's packaging as a base but + replaced debian/rules with a simple cdbs one). + * Removed compilation of Python packages and some other inconvenient + build dependencies. + * Added support for compiling with thumb instructions. + + -- Kimmo Hämäläinen Fri, 17 Nov 2006 15:36:40 +0200 + libxml2 (2.6.27.dfsg-1) unstable; urgency=low * New "huge bug fixes list" upstream release. diff -Nru libxml2-2.6.27.dfsg/debian/compat libxml2-2.6.27.dfsg/debian/compat --- libxml2-2.6.27.dfsg/debian/compat 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/compat 2007-04-16 07:54:38.000000000 +0000 @@ -1 +1 @@ -5 +4 diff -Nru libxml2-2.6.27.dfsg/debian/control libxml2-2.6.27.dfsg/debian/control --- libxml2-2.6.27.dfsg/debian/control 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/control 2007-04-16 07:54:38.000000000 +0000 @@ -1,10 +1,9 @@ Source: libxml2 Priority: optional Section: libs -Maintainer: Debian XML/SGML Group -Uploaders: Mike Hommey +Maintainer: Kimmo Hämäläinen Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev | libz-dev, python-all-dev (>= 2.3.5-11), python-support (>= 0.3), autotools-dev, libreadline5-dev | libreadline-dev, binutils (>= 2.14.90.0.7) +Build-Depends: cdbs, debhelper, zlib1g-dev | libz-dev, autotools-dev, binutils (>= 2.14.90.0.7) Package: libxml2 Architecture: any @@ -90,21 +89,3 @@ This package contains general information about the GNOME XML library and more specific API references. -Package: python-libxml2 -Architecture: any -Section: python -Conflicts: python2.3-libxml2 (<< 2.6.26.dfsg-2), python2.4-libxml2 (<< 2.6.26.dfsg-2) -Replaces: python2.3-libxml2 (<< 2.6.26.dfsg-2), python2.4-libxml2 (<< 2.6.26.dfsg-2) -Provides: ${python:Provides} -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -XB-Python-Version: ${python:Versions} -Description: Python bindings for the GNOME XML library - XML is a metalanguage to let you design your own markup language. - A regular markup language defines a way to describe information in - 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. diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-dbg.dirs libxml2-2.6.27.dfsg/debian/libxml2-dbg.dirs --- libxml2-2.6.27.dfsg/debian/libxml2-dbg.dirs 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-dbg.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/doc diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-dev.dirs libxml2-2.6.27.dfsg/debian/libxml2-dev.dirs --- libxml2-2.6.27.dfsg/debian/libxml2-dev.dirs 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-dev.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/doc diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-dev.install libxml2-2.6.27.dfsg/debian/libxml2-dev.install --- libxml2-2.6.27.dfsg/debian/libxml2-dev.install 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-dev.install 2007-04-16 07:54:38.000000000 +0000 @@ -1,7 +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 +debian/tmp/usr/bin/xml2-config +debian/tmp/usr/lib/libxml2.so +debian/tmp/usr/lib/libxml2.a +debian/tmp/usr/lib/xml2Conf.sh +debian/tmp/usr/share/aclocal +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include/libxml2 diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-dev.manpages libxml2-2.6.27.dfsg/debian/libxml2-dev.manpages --- libxml2-2.6.27.dfsg/debian/libxml2-dev.manpages 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-dev.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -libxml.3 -xml2-config.1 diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-doc.install libxml2-2.6.27.dfsg/debian/libxml2-doc.install --- libxml2-2.6.27.dfsg/debian/libxml2-doc.install 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-doc.install 2007-04-16 07:54:38.000000000 +0000 @@ -1,2 +1,2 @@ -usr/share/doc/libxml2-doc -usr/share/gtk-doc +debian/tmp/usr/share/doc/libxml2-2.6.27 +debian/tmp/usr/share/gtk-doc diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-utils.dirs libxml2-2.6.27.dfsg/debian/libxml2-utils.dirs --- libxml2-2.6.27.dfsg/debian/libxml2-utils.dirs 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-utils.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/doc diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-utils.install libxml2-2.6.27.dfsg/debian/libxml2-utils.install --- libxml2-2.6.27.dfsg/debian/libxml2-utils.install 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-utils.install 2007-04-16 07:54:38.000000000 +0000 @@ -1,2 +1,2 @@ -usr/bin/xmllint -usr/bin/xmlcatalog +debian/tmp/usr/bin/xmllint +debian/tmp/usr/bin/xmlcatalog diff -Nru libxml2-2.6.27.dfsg/debian/libxml2-utils.manpages libxml2-2.6.27.dfsg/debian/libxml2-utils.manpages --- libxml2-2.6.27.dfsg/debian/libxml2-utils.manpages 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2-utils.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -doc/xmllint.1 -doc/xmlcatalog.1 diff -Nru libxml2-2.6.27.dfsg/debian/libxml2.install libxml2-2.6.27.dfsg/debian/libxml2.install --- libxml2-2.6.27.dfsg/debian/libxml2.install 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/libxml2.install 2007-04-16 07:54:38.000000000 +0000 @@ -1 +1 @@ -usr/lib/libxml2.so.* +debian/tmp/usr/lib/libxml2.so.* diff -Nru libxml2-2.6.27.dfsg/debian/patches/01-CVE-2007-6284.patch libxml2-2.6.27.dfsg/debian/patches/01-CVE-2007-6284.patch --- libxml2-2.6.27.dfsg/debian/patches/01-CVE-2007-6284.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/patches/01-CVE-2007-6284.patch 2008-02-19 14:51:26.000000000 +0000 @@ -0,0 +1,57 @@ +--- libxml2-2.6.27.orig/parserInternals.c ++++ libxml2-2.6.27/parserInternals.c +@@ -638,14 +638,13 @@ + + c = *cur; + if (c & 0x80) { +- if (c == 0xC0) ++ if (((c & 0x40) == 0) || (c == 0xC0)) + goto encoding_error; + if (cur[1] == 0) + xmlParserInputGrow(ctxt->input, INPUT_CHUNK); + if ((cur[1] & 0xc0) != 0x80) + goto encoding_error; + if ((c & 0xe0) == 0xe0) { +- + if (cur[2] == 0) + xmlParserInputGrow(ctxt->input, INPUT_CHUNK); + if ((cur[2] & 0xc0) != 0x80) +@@ -662,18 +661,24 @@ + val |= (cur[1] & 0x3f) << 12; + val |= (cur[2] & 0x3f) << 6; + val |= cur[3] & 0x3f; ++ if (val < 0x10000) ++ goto encoding_error; + } else { + /* 3-byte code */ + *len = 3; + val = (cur[0] & 0xf) << 12; + val |= (cur[1] & 0x3f) << 6; + val |= cur[2] & 0x3f; ++ if (val < 0x800) ++ goto encoding_error; + } + } else { + /* 2-byte code */ + *len = 2; + val = (cur[0] & 0x1f) << 6; + val |= cur[1] & 0x3f; ++ if (val < 0x80) ++ goto encoding_error; + } + if (!IS_CHAR(val)) { + xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR, +@@ -683,6 +688,13 @@ + } else { + /* 1-byte code */ + *len = 1; ++ if (*ctxt->input->cur == 0) ++ xmlParserInputGrow(ctxt->input, INPUT_CHUNK); ++ if ((*ctxt->input->cur == 0) && ++ (ctxt->input->end > ctxt->input->cur)) { ++ xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR, ++ "Char 0x%X out of allowed range\n", val); ++ } + if (*ctxt->input->cur == 0xD) { + if (ctxt->input->cur[1] == 0xA) { + ctxt->nbChars++; diff -Nru libxml2-2.6.27.dfsg/debian/rules libxml2-2.6.27.dfsg/debian/rules --- libxml2-2.6.27.dfsg/debian/rules 2019-04-09 00:31:05.000000000 +0000 +++ libxml2-2.6.27.dfsg/debian/rules 2007-09-11 11:23:29.000000000 +0000 @@ -1,180 +1,27 @@ #!/usr/bin/make -f +# Copyright © 2006 Nokia Corporation. All rights reserved. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk -# These are used for cross-compiling and for saving the configure script -# # from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -# The versions of python currently supported -PYVERS=$(shell pyversions -s) -# The current default version of python -PYVER=$(shell pyversions -d) +DEB_TAR_SRCDIR := libxml2-2.6.27 +include /usr/share/cdbs/1/rules/tarball.mk -WORKAROUND_REMOVED_FILES=include/libxml/xmlversion.h libxml2.spec python/setup.py doc/xmlcatalog.1 -WORKAROUND_MODIFIED_FILES=python/libxml2-py.c +DEB_CONFIGURE_EXTRA_FLAGS := --without-python --enable-ipv6=no -CFLAGS = -Wall -g +DEB_DH_STRIP_ARGS := --dbg-package=libxml2 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +# Prefer hardware floating point if enabled +ifneq (,$(findstring vfp,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mfpu=vfp -mfloat-abi=softfp else - CFLAGS += -O2 -fno-strict-aliasing +# Use soft-float and thumb mode if it enabled. +ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mthumb +endif endif -build: build-stamp -build-stamp: - dh_testdir - - # Workaround backups because of non-idempotent upstream: - $(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \ - cp -f -a $(file) $(file)-tmp;) - - # ./configure - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-history - echo "all:" > example/Makefile - echo "install:" >> example/Makefile - echo "distclean:" >> example/Makefile - echo " rm -rf .deps" >> example/Makefile - - mv -f python/Makefile python/Makefile.bak - echo all: > python/Makefile - # Build libxml2 - $(MAKE) - mv -f python/Makefile.bak python/Makefile - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp install*-stamp - - #-$(MAKE) distclean - -rm -f example/Makefile - rm COPYING && cp Copyright COPYING - - # Restore workaround backups of removed and modified files - -$(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \ - test -r $(file)-tmp && \ - mv -f $(file)-tmp $(file);) - - -test -r /usr/share/misc/config.sub && \ - cp -f /usr/share/misc/config.sub config.sub - -test -r /usr/share/misc/config.guess && \ - cp -f /usr/share/misc/config.guess config.guess - - dh_clean - -install: install-stamp install-python-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - mv -f python/Makefile python/Makefile.bak - echo install: > python/Makefile - $(MAKE) DESTDIR=`pwd`/debian/tmp install - mv -f python/Makefile.bak python/Makefile - - 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 - - - # Special workaround for svn-buildpackage: - # Restore workaround backups of modified files. - -$(foreach file, $(WORKAROUND_MODIFIED_FILES), \ - test -r $(file)-tmp && \ - cat $(file)-tmp > $(file);) - - touch install-stamp - -build-python%-stamp: build-stamp - cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* - - touch $@ - -install-python%-stamp: build-python%-stamp - rm build-python$*-stamp - cd python && $(MAKE) DESTDIR=`pwd`/../debian/tmp PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install - - touch $@ - -install-python-stamp: $(PYVERS:%=install-%-stamp) - touch $@ - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i -A AUTHORS TODO README NEWS - dh_installchangelogs -i debian/no-upstream-changelog - dh_install -i --sourcedir=debian/tmp - dh_link -i - dh_strip -i - dh_compress -i -Xexamples/ -Xtutorial/ -Xhtml/ -X.html - dh_fixperms -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installexamples -a - dh_installdocs -plibxml2 -A AUTHORS TODO README NEWS - dh_installdocs -ppython-libxml2 python/TODO - ln -sf $(foreach file, AUTHORS README README.Debian changelog.Debian.gz changelog.gz,../libxml2/$(file)) debian/python-libxml2/usr/share/doc/python-libxml2/$(file) - ln -sf libxml2 debian/libxml2-dev/usr/share/doc/libxml2-dev - ln -sf libxml2 debian/libxml2-utils/usr/share/doc/libxml2-utils - ln -sf libxml2 debian/libxml2-dbg/usr/share/doc/libxml2-dbg - dh_installman -a - dh_installchangelogs -plibxml2 ChangeLog - dh_install -a --sourcedir=debian/tmp - sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la - dh_pysupport -a - dh_python -a - dh_link -a - dh_strip -a --dbg-package=libxml2-dbg -Npython-libxml2 - dh_strip -ppython-libxml2 - $(foreach python, $(filter-out $(PYVER), $(PYVERS)),\ - cd $(CURDIR)/debian/python-libxml2/usr/lib/python-support/python-libxml2; \ - 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_compress -a -Xexamples/ - dh_fixperms -a - dh_makeshlibs -a -V 'libxml2 (>= 2.6.27)' - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +clean:: + rm -f *.cdbs-config_list