Date: Sunday, March 28, 2010 @ 09:12:08 Author: jgc Revision: 73765 upgpkg: libxml2 2.7.7-1 Update to 2.7.7, remove upstream-applied patch
Modified: libxml2/trunk/PKGBUILD Deleted: libxml2/trunk/zlib.patch ------------+ PKGBUILD | 14 ++++++-------- zlib.patch | 32 -------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-03-28 12:55:55 UTC (rev 73764) +++ PKGBUILD 2010-03-28 13:12:08 UTC (rev 73765) @@ -3,25 +3,23 @@ # Contributor: John Proctor <jproc...@prium.net> pkgname=libxml2 -pkgver=2.7.6 -pkgrel=2 +pkgver=2.7.7 +pkgrel=1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('custom') -depends=('zlib>=1.2.3.3' 'readline>=6.0' 'ncurses>=5.7') +depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7') makedepends=('python') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - largefile64.patch zlib.patch) -md5sums=('7740a8ec23878a2f50120e1faa2730f2' - '5ad4915665608ebfa5b89f7908467a72' - '0365d5397164b8739219e56e5ca069d1') + largefile64.patch) +md5sums=('9abc9959823ca9ff904f1fbcf21df066' + '5ad4915665608ebfa5b89f7908467a72') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/largefile64.patch" || return 1 - patch -p1 -i "${srcdir}/zlib.patch" || return 1 ./configure --prefix=/usr --with-threads --with-history || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 Deleted: zlib.patch =================================================================== --- zlib.patch 2010-03-28 12:55:55 UTC (rev 73764) +++ zlib.patch 2010-03-28 13:12:08 UTC (rev 73765) @@ -1,32 +0,0 @@ -From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001 -From: Mark Adler <mad...@alumni.caltech.edu> -Date: Tue, 19 Jan 2010 15:28:48 +0000 -Subject: libxml violates the zlib interface and crashes - -* xmlIO.c: remove an abuse of zlib API and use a clean interface - available in zlib >= 1.2.3 ---- -diff --git a/xmlIO.c b/xmlIO.c -index c03ac43..8fc00e3 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - #ifdef HAVE_ZLIB_H - if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) && - (strcmp(URI, "-") != 0)) { -+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230 -+ ret->compressed = !gzdirect(context); -+#else - if (((z_stream *)context)->avail_in > 4) { - char *cptr, buff4[4]; - cptr = (char *) ((z_stream *)context)->next_in; -@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - gzrewind(context); - } - } -+#endif - } - #endif - } --- -cgit v0.8.3.1