[arch-commits] Commit in zlib/trunk (PKGBUILD gzflush.patch)

[Pierre Schmitz]

    Date: Saturday, February 13, 2010 @ 17:34:13
  Author: pierre
Revision: 68707

upgpkg: zlib 1.2.3.8-1
upstream update

Modified:
  zlib/trunk/PKGBUILD
Deleted:
  zlib/trunk/gzflush.patch

---------------+
 PKGBUILD      |   12 ++++--------
 gzflush.patch |   12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-13 22:20:13 UTC (rev 68706)
+++ PKGBUILD	2010-02-13 22:34:13 UTC (rev 68707)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.3.7
-pkgrel=2
+pkgver=1.2.3.8
+pkgrel=1
 pkgdesc='compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,15 +11,11 @@
 groups=('base')
 depends=('glibc')
 # source from zlib-devel
-source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz"
-        'gzflush.patch')
-md5sums=('323e45f54f321116a34950e8fbf5b6e7'
-         '7e2f3d8815f1e9398e46a2a0e47399fb')
+source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz")
+md5sums=('ab5fa664b51eaa0788fd057c41a09dbd')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
-	# add missing line which causes a segfault when using gzflush on read
-	patch -p0 -i ${srcdir}/gzflush.patch || return 1
 	export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
 	./configure --prefix=/usr --shared
 	make || return 1

Deleted: gzflush.patch
===================================================================
--- gzflush.patch	2010-02-13 22:20:13 UTC (rev 68706)
+++ gzflush.patch	2010-02-13 22:34:13 UTC (rev 68707)
@@ -1,12 +0,0 @@
---- gzwrite.c	2010-01-18 21:18:27.000000000 +0100
-+++ gzwrite.c	2010-01-28 04:37:20.330530306 +0100
-@@ -435,7 +435,8 @@
-     state = (gz_statep)file;
- 
-     /* check that we're writing and that there's no error */
--    if (state->mode != GZ_WRITE|| state->err != Z_OK)
-+    if (state->mode != GZ_WRITE || state->err != Z_OK)
-+        return Z_STREAM_ERROR;
- 
-     /* check flush parameter */
-     if (flush < 0 || flush > Z_FINISH)