diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
| commit | 9fddb4d5b41c0b5e69d5ee138297e95eff290302 (patch) | |
| tree | b353402b4af0ac5b912dc78ca7d996c397b8e2e3 /main/libxml2/zlib.patch | |
| parent | ccf26410d30adc8c1934dd553687157ed6e31d69 (diff) | |
| parent | 8c1128e93e03012dabadb9a3f723dbd20eb60cd4 (diff) | |
| download | aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.bz2 aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.xz | |
Merged from Alpine main repository.
Merge
Conflicts:
main/abuild/APKBUILD
main/cramfs/APKBUILD
main/curl/APKBUILD
main/dialog/APKBUILD
main/libconfig/APKBUILD
main/snort/APKBUILD
main/syslinux/APKBUILD
Diffstat (limited to 'main/libxml2/zlib.patch')
| -rw-r--r-- | main/libxml2/zlib.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/main/libxml2/zlib.patch b/main/libxml2/zlib.patch deleted file mode 100644 index 4bf486d12..000000000 --- a/main/libxml2/zlib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001 -From: Mark Adler <madler@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 |