[arch-commits] Commit in libxslt/trunk (CVE-2015-7995.patch PKGBUILD)

[Jan de Groot]

    Date: Thursday, May 26, 2016 @ 23:05:18
  Author: jgc
Revision: 268621

upgpkg: libxslt 1.1.29-1

Modified:
  libxslt/trunk/PKGBUILD
Deleted:
  libxslt/trunk/CVE-2015-7995.patch

---------------------+
 CVE-2015-7995.patch |   29 -----------------------------
 PKGBUILD            |   24 ++++++++++--------------
 2 files changed, 10 insertions(+), 43 deletions(-)

Deleted: CVE-2015-7995.patch
===================================================================
--- CVE-2015-7995.patch	2016-05-26 20:55:57 UTC (rev 268620)
+++ CVE-2015-7995.patch	2016-05-26 21:05:18 UTC (rev 268621)
@@ -1,29 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard at redhat.com>
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace
----
- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/preproc.c b/libxslt/preproc.c
-index 0eb80a0..7f69325 100644
---- a/libxslt/preproc.c
-+++ b/libxslt/preproc.c
-@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
- 	} else if (IS_XSLT_NAME(inst, "attribute")) {
- 	    xmlNodePtr parent = inst->parent;
- 
--	    if ((parent == NULL) || (parent->ns == NULL) ||
-+	    if ((parent == NULL) ||
-+	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
- 		((parent->ns != inst->ns) &&
- 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
- 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
--- 
-cgit v0.11.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-26 20:55:57 UTC (rev 268620)
+++ PKGBUILD	2016-05-26 21:05:18 UTC (rev 268621)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=libxslt
-pkgver=1.1.28
-pkgrel=4
+pkgver=1.1.29
+pkgrel=1
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64')
 url="http://xmlsoft.org/XSLT/"
@@ -11,34 +11,30 @@
 license=('custom')
 depends=('libxml2' 'libgcrypt')
 makedepends=('python2')
-checkdepends=('docbook-xml')
-source=(http://xmlsoft.org/sources/${pkgname}-${pkgver}.tar.gz
-        CVE-2015-7995.patch)
-md5sums=('9667bf6f9310b957254fdcf6596600b7'
-         'b97b695cbe4171f8cb10df41f652aba5')
+checkdepends=('docbook-xml' 'python')
+source=(http://xmlsoft.org/sources/${pkgname}-${pkgver}.tar.gz)
+md5sums=('a129d3c44c022de3b9dcf6d6f288d72e')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../CVE-2015-7995.patch
+  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --with-python=/usr/bin/python2
 
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/usr/share/licenses/${pkgname}"