[arch-commits] Commit in zlib/trunk (4 files)

Pierre Schmitz pierre at archlinux.org
Sun Jan 24 08:07:45 EST 2010


    Date: Sunday, January 24, 2010 @ 08:07:44
  Author: pierre
Revision: 65111

upgpkg: zlib 1.2.3.7-1
    upstream update

Modified:
  zlib/trunk/PKGBUILD
Deleted:
  zlib/trunk/install.patch
  zlib/trunk/revert-eof-reporting.patch
  zlib/trunk/revert-transparent-feof-test.patch

------------------------------------+
 PKGBUILD                           |   18 +++++-------------
 install.patch                      |   19 -------------------
 revert-eof-reporting.patch         |   18 ------------------
 revert-transparent-feof-test.patch |   19 -------------------
 4 files changed, 5 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-24 12:21:44 UTC (rev 65110)
+++ PKGBUILD	2010-01-24 13:07:44 UTC (rev 65111)
@@ -2,30 +2,22 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.3.4
-pkgrel=4
+pkgver=1.2.3.7
+pkgrel=1
 pkgdesc='compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.zlib.net/"
 groups=('base')
 depends=('glibc')
-# source from http://packages.qa.debian.org/z/zlib.html
-source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz"
-        'install.patch' 'revert-eof-reporting.patch'
-        'revert-transparent-feof-test.patch')
-md5sums=('70cad33163abe3c234939a5c63bf95ea'
-         'e0b303fabe9272803ab57d988be1e88e'
-         '40293a11f8d5032af18c31c8522feb7e'
-         '79c0b09bfe269883cb36f8f29993cbcf')
+# source from zlib-devel
+source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz")
+md5sums=('323e45f54f321116a34950e8fbf5b6e7')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
 
 	export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
-	patch -p1 -i ${srcdir}/install.patch || return 1
-	patch -p1 -i ${srcdir}/revert-eof-reporting.patch || return 1
-	patch -p1 -i ${srcdir}/revert-transparent-feof-test.patch || return 1
 	./configure --prefix=/usr --shared
 	make || return 1
 

Deleted: install.patch
===================================================================
--- install.patch	2010-01-24 12:21:44 UTC (rev 65110)
+++ install.patch	2010-01-24 13:07:44 UTC (rev 65111)
@@ -1,19 +0,0 @@
---- zlib-1.2.3.4/Makefile.in	2009-12-24 16:09:43.000000000 +0100
-+++ zlib-1.2.3.4/Makefile.in	2009-12-25 17:19:13.594735916 +0100
-@@ -34,7 +34,7 @@
- SHAREDLIB=libz.so
- SHAREDLIBV=libz.so.1.2.3.4
- SHAREDLIBM=libz.so.1
--LIBS=$(STATICLIB) $(SHAREDLIB)
-+LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
- 
- AR=ar rc
- RANLIB=ranlib
-@@ -179,6 +179,7 @@
- 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
- 	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
- 	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
-+	chmod 644 $(DESTDIR)$(libdir)/libz.a
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
- 

Deleted: revert-eof-reporting.patch
===================================================================
--- revert-eof-reporting.patch	2010-01-24 12:21:44 UTC (rev 65110)
+++ revert-eof-reporting.patch	2010-01-24 13:07:44 UTC (rev 65111)
@@ -1,18 +0,0 @@
-Don't explicitly handle z_eof in gzread(), fall through and let the lack
-of any available data give us our return value.  This avoids triggering
-an infinite loop in man-db - I'm not able to convince myself that this
-isn't an issue in man-db at the minute but this avoids the issue.
-
-Index: debian/gzio.c
-===================================================================
---- debian.orig/gzio.c	2009-12-25 15:52:36.000000000 +0000
-+++ debian/gzio.c	2009-12-25 15:52:43.000000000 +0000
-@@ -432,7 +432,7 @@
-     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
- 
-     if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
--    if (s->z_err == Z_STREAM_END || s->z_eof) return 0;  /* EOF */
-+    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
- 
-     next_out = (Byte*)buf;
-     s->stream.next_out = (Bytef*)buf;

Deleted: revert-transparent-feof-test.patch
===================================================================
--- revert-transparent-feof-test.patch	2010-01-24 12:21:44 UTC (rev 65110)
+++ revert-transparent-feof-test.patch	2010-01-24 13:07:44 UTC (rev 65111)
@@ -1,19 +0,0 @@
-Only check for and set the EOF flag if we've read zero bytes in from a
-transparent stream, otherwise we may read the entire file into our
-buffer (causing feof() to become true), flag EOF and begin reporting EOF
-to users before we have actually returned all the data in the stream to
-the application.
-
-Index: debian/gzio.c
-===================================================================
---- debian.orig/gzio.c	2009-12-28 18:48:57.000000000 +0000
-+++ debian/gzio.c	2009-12-28 18:49:02.000000000 +0000
-@@ -472,7 +472,7 @@
-             len -= s->stream.avail_out;
-             s->in  += len;
-             s->out += len;
--            if (feof(s->file)) s->z_eof = 1;
-+            if (len == 0 && feof(s->file)) s->z_eof = 1;
-             return (int)len;
-         }
-         if (s->stream.avail_in == 0 && !s->z_eof) {



More information about the arch-commits mailing list