packages: libxml2/libxml2.spec, libxml2/libxml2-zlib.patch (NEW) - rel 6; d...

[arekm]

Author: arekm                        Date: Tue Feb  9 18:49:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; don't abuse zlib internal stuff (from archlinux)

---- Files affected:
packages/libxml2:
   libxml2.spec (1.175 -> 1.176) , libxml2-zlib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libxml2/libxml2.spec
diff -u packages/libxml2/libxml2.spec:1.175 packages/libxml2/libxml2.spec:1.176
--- packages/libxml2/libxml2.spec:1.175	Wed Oct 14 14:27:04 2009
+++ packages/libxml2/libxml2.spec	Tue Feb  9 19:49:22 2010
@@ -11,7 +11,7 @@
 Summary(pt_BR.UTF-8):	Biblioteca libXML versão 2
 Name:		libxml2
 Version:	2.7.6
-Release:	5
+Release:	6
 Epoch:		1
 License:	MIT
 Group:		Libraries
@@ -22,6 +22,7 @@
 Patch1:		%{name}-man_fixes.patch
 Patch2:		%{name}-open.gz.patch
 Patch3:		%{name}-largefile.patch
+Patch4:		%{name}-zlib.patch
 URL:		http://xmlsoft.org/
 BuildRequires:	autoconf >= 2.2
 BuildRequires:	automake >= 1.4
@@ -142,6 +143,7 @@
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -253,6 +255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2010/02/09 18:49:22  arekm
+- rel 6; don't abuse zlib internal stuff (from archlinux)
+
 Revision 1.175  2009/10/14 12:27:04  arekm
 - rel 5; force new zlib
 

================================================================
Index: packages/libxml2/libxml2-zlib.patch
diff -u /dev/null packages/libxml2/libxml2-zlib.patch:1.1
--- /dev/null	Tue Feb  9 19:49:28 2010
+++ packages/libxml2/libxml2-zlib.patch	Tue Feb  9 19:49:22 2010
@@ -0,0 +1,32 @@
+From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler at 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxml2/libxml2.spec?r1=1.175&r2=1.176&f=u