From c286dcfe23f9d22a69bcf524ce00a7ebb44ace81 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 21 Nov 2015 07:52:45 +0100 Subject: [PATCH] libxml2: update to 2.9.3. --- .../libxml2/patches/2.9.2-regressions.patch | 27 ---------- srcpkgs/libxml2/patches/libxml2-pthread.patch | 53 ------------------- srcpkgs/libxml2/template | 6 +-- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 srcpkgs/libxml2/patches/2.9.2-regressions.patch delete mode 100644 srcpkgs/libxml2/patches/libxml2-pthread.patch diff --git a/srcpkgs/libxml2/patches/2.9.2-regressions.patch b/srcpkgs/libxml2/patches/2.9.2-regressions.patch deleted file mode 100644 index fb01607cd0..0000000000 --- a/srcpkgs/libxml2/patches/2.9.2-regressions.patch +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2014/10/28 18:55:56 drochner Exp $ - -https://git.gnome.org/browse/libxml2/commit/?id=f65128f38289d77ff322d63aef2858cc0a819c34 -https://git.gnome.org/browse/libxml2/commit/?id=72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 - ---- parser.c.orig 2014-10-16 05:57:40.000000000 +0000 -+++ 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; -@@ -14830,9 +14831,6 @@ xmlInitParser(void) { - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } diff --git a/srcpkgs/libxml2/patches/libxml2-pthread.patch b/srcpkgs/libxml2/patches/libxml2-pthread.patch deleted file mode 100644 index b0467f15a5..0000000000 --- a/srcpkgs/libxml2/patches/libxml2-pthread.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- threads.c 2013-07-24 03:30:55.160000003 +0000 -+++ threads.c 2013-07-24 03:33:50.323000003 +0000 -@@ -47,49 +47,7 @@ - #ifdef HAVE_PTHREAD_H - - static int libxml_is_threaded = -1; --#ifdef __GNUC__ --#ifdef linux --#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) --extern int pthread_once (pthread_once_t *__once_control, -- void (*__init_routine) (void)) -- __attribute((weak)); --extern void *pthread_getspecific (pthread_key_t __key) -- __attribute((weak)); --extern int pthread_setspecific (pthread_key_t __key, -- __const void *__pointer) -- __attribute((weak)); --extern int pthread_key_create (pthread_key_t *__key, -- void (*__destr_function) (void *)) -- __attribute((weak)); --extern int pthread_key_delete (pthread_key_t __key) -- __attribute((weak)); --extern int pthread_mutex_init () -- __attribute((weak)); --extern int pthread_mutex_destroy () -- __attribute((weak)); --extern int pthread_mutex_lock () -- __attribute((weak)); --extern int pthread_mutex_unlock () -- __attribute((weak)); --extern int pthread_cond_init () -- __attribute((weak)); --extern int pthread_cond_destroy () -- __attribute((weak)); --extern int pthread_cond_wait () -- __attribute((weak)); --extern int pthread_equal () -- __attribute((weak)); --extern pthread_t pthread_self () -- __attribute((weak)); --extern int pthread_key_create () -- __attribute((weak)); --extern int pthread_key_delete () -- __attribute((weak)); --extern int pthread_cond_signal () -- __attribute((weak)); --#endif --#endif /* linux */ --#endif /* __GNUC__ */ -+ - #endif /* HAVE_PTHREAD_H */ - - /* diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index f79b7f0655..867e12e866 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,7 +1,7 @@ # Template build file for 'libxml2'. pkgname=libxml2 -version=2.9.2 -revision=4 +version=2.9.3 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-threads --with-history" hostmakedepends="automake libtool gettext-devel pkg-config python-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.xmlsoft.org/" license="MIT" distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" -checksum=5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc +checksum=4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d LDFLAGS="-lz -llzma -lpthread"