Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f19ead5aae0d626186fdc39566dafa81fb0d7e21
commit f19ead5aae0d626186fdc39566dafa81fb0d7e21 Author: crazy <[email protected]> Date: Sun Nov 22 19:12:05 2015 +0100 libxml2-2.9.3-1-x86_64 * Version bump diff --git a/source/base/libxml2/CVE-2014-3660-fix.patch b/source/base/libxml2/CVE-2014-3660-fix.patch deleted file mode 100644 index 6c757d1..0000000 --- a/source/base/libxml2/CVE-2014-3660-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Thu, 23 Oct 2014 11:35:36 +0800 -Subject: Fix missing entities after CVE-2014-3660 fix - -For https://bugzilla.gnome.org/show_bug.cgi?id=738805 - -The fix for CVE-2014-3660 introduced a regression in some case -where entity substitution is required and the entity is used -first in anotther entity referenced from an attribute value - -diff --git a/parser.c b/parser.c -index 67c9dfd..a8d1b67 100644 ---- a/parser.c -+++ b/parser.c -@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - * far more secure as the parser will only process data coming from - * the document entity by default. - */ -- if ((ent->checked == 0) && -+ if (((ent->checked == 0) || -+ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && - ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || - (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { - unsigned long oldnbent = ctxt->nbentities; --- -cgit v0.10.2 - diff --git a/source/base/libxml2/FrugalBuild b/source/base/libxml2/FrugalBuild index b0f938d..c8ad896 100644 --- a/source/base/libxml2/FrugalBuild +++ b/source/base/libxml2/FrugalBuild @@ -2,11 +2,10 @@ # Maintainer: crazy <[email protected]> # Contributor: Miklos Vajna <[email protected]> -options+=('asneeded') pkgname=libxml2 -pkgver=2.9.2 -pkgrel=2 +pkgver=2.9.3 +pkgrel=1 pkgdesc="XML parsing library" url="http://www.xmlsoft.org/"; groups=('base' 'chroot-core') @@ -15,10 +14,8 @@ depends=('zlib>=1.2.3-6' 'xz') makedepends=('python>=2.7' 'readline>=6.2' 'gcc>=5.2.0') #up2date="lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep -m1 'LATEST_LIBXML2_IS_'|sed 's/.*xml2-\(.*\).t.*/\1/'" up2date="Flasttar ftp://xmlsoft.org/libxml2/"; -source=(ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz revert-catalog-initialize.patch CVE-2014-3660-fix.patch) -sha1sums=('f46a37ea6d869f702e03f393c376760f3cbee673' \ - '90708a805edfc7d035e348397e61e17396cd36d1' \ - '818e2d72aa868d750c2d6a82a85001b435e81e28') +source=(ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('0301ce933637e0ceda049047dbefd18714f59b6e') Finclude python subpkgs=("$pkgname-docs") @@ -36,12 +33,10 @@ subarchs+=('i686 x86_64') subdepends+=('python') build() { + Fpatchall - #Fsed "tail -1" "tail -n 1" configure - #Fsed "head -1" "head -n 1" configure Fmake --with-threads --with-readline --with-zlib Fmakeinstall - #Ffilerel libxml-2.0.pc /usr/lib/pkgconfig/libxml-2.0.pc Fsplit $pkgname-docs usr/share/gtk-doc Fsplit $pkgname-docs usr/share/doc diff --git a/source/base/libxml2/revert-catalog-initialize.patch b/source/base/libxml2/revert-catalog-initialize.patch deleted file mode 100644 index cd81739..0000000 --- a/source/base/libxml2/revert-catalog-initialize.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Fri, 17 Oct 2014 17:13:41 +0800 -Subject: Revert "Missing initialization for the catalog module" - -This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. -As this break xmlcatalog command -https://bugzilla.redhat.com/show_bug.cgi?id=1153753 - -diff --git a/parser.c b/parser.c -index 1d93967..67c9dfd 100644 ---- a/parser.c -+++ b/parser.c -@@ -14830,9 +14830,6 @@ xmlInitParser(void) { - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } --- -cgit v0.10.1 - - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
