Commit 7136ef21 authored by Aron Xu's avatar Aron Xu

Prepare for new upstream release.

parent 85db8f8e
libxml2 (2.8.0+dfsg1-1) UNRELEASED; urgency=low
* New upstream release.
-- 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.
......
......@@ -4,7 +4,9 @@ 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.3
Build-Depends: debhelper (>= 9), zlib1g-dev | libz-dev, python-all-dev (>= 2.6.6-3~), python-all-dbg, autotools-dev, libreadline-dev | libreadline6-dev, binutils (>= 2.14.90.0.7), perl, dh-autoreconf
Build-Depends: debhelper (>= 9), perl, dh-autoreconf, autotools-dev,
binutils (>= 2.14.90.0.7), python-all-dev (>= 2.6.6-3~), python-all-dbg,
zlib1g-dev | libz-dev, liblzma-dev, libreadline-dev | libreadline6-dev
Homepage: http://xmlsoft.org/
Vcs-Git: git://git.debian.org/debian-xml-sgml/libxml2.git
Vcs-Browser: http://git.debian.org/?p=debian-xml-sgml/libxml2.git
......
From d8e1faeaa99c7a7c07af01c1c72de352eb590a3e Mon Sep 17 00:00:00 2001
From: Jüri Aedla <asd@ut.ee>
Date: Mon, 07 May 2012 07:06:56 +0000
Subject: Fix an off by one pointer access
getting out of the range of memory allocated for xpointer decoding
---
diff --git a/xpointer.c b/xpointer.c
index 37afa3a..0b463dd 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -1007,21 +1007,14 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContextPtr ctxt, xmlChar *name) {
NEXT;
break;
}
- *cur++ = CUR;
} else if (CUR == '(') {
level++;
- *cur++ = CUR;
} else if (CUR == '^') {
- NEXT;
- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
- *cur++ = CUR;
- } else {
- *cur++ = '^';
- *cur++ = CUR;
- }
- } else {
- *cur++ = CUR;
+ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
+ NEXT;
+ }
}
+ *cur++ = CUR;
NEXT;
}
*cur = 0;
--
cgit v0.9.0.2
01_historical_changes.patch
cve-2012-3102.patch
01_restore-html.patch
......@@ -27,12 +27,12 @@ $(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i /li
export DH_OPTIONS = -Nlibxml2-udeb
endif
CONFIGURE_FLAGS := --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/build/config.cache"
CONFIGURE_FLAGS := --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache"
override_dh_auto_configure: $(TARGETS:%=doconfigure-%)
doconfigure-%:
dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS)
dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS)
doconfigure-main: CONFIGURE_FLAGS += --without-python
doconfigure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$*
......@@ -40,12 +40,12 @@ doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tre
override_dh_auto_build: $(TARGETS:%=dobuild-%)
dobuild-%: BUILD_DIR=build/$*
dobuild-%: BUILD_DIR=builddir/$*
dobuild-%: doconfigure-%
$(if $(filter $(BUILD_DIR),build/$*),,[ -d $(BUILD_DIR) ] || mv build/$*/python $(BUILD_DIR))
$(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=build/main/$*
dobuild-python%: BUILD_DIR=builddir/main/$*
dobuild-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)'
dobuild-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \
CFLAGS="$(CFLAGS) -Wall -g -O0" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) \
......@@ -55,14 +55,14 @@ build-indep:
build: build-arch build-indep
override_dh_auto_clean:
rm -rf build debian/tmp-dbg debian/tmp-udeb
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=build/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
......@@ -82,14 +82,14 @@ doinstall-main:
doc/tutorial debian/tmp/usr/share/doc/libxml2-doc
doinstall-python%-dbg:
$(MAKE) -C build/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES
$(MAKE) -C builddir/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES
prename 's/(?<!_d)\.so$$/_d.so/' debian/tmp-dbg/usr/lib/python$*/*-packages/*.so
doinstall-python%:
dh_auto_install --builddirectory=build/main/python$*
dh_auto_install --builddirectory=builddir/main/python$*
doinstall-udeb:
dh_auto_install --builddirectory=build/udeb --destdir=debian/tmp-udeb
dh_auto_install --builddirectory=builddir/udeb --destdir=debian/tmp-udeb
override_dh_installdocs:
dh_installdocs -A AUTHORS TODO README NEWS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment