From fa13be07fd284291d565293dab2f78884a9c6a88 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 4 Sep 2010 23:05:28 -0700
Subject: zlib:Bumped/Updated for LinHES 7.

---
 abs/core-testing/zlib/PKGBUILD                   | 36 +++++++++++++++---------
 abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch | 13 +++++++++
 2 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch

diff --git a/abs/core-testing/zlib/PKGBUILD b/abs/core-testing/zlib/PKGBUILD
index 70d4b2d..f320d37 100644
--- a/abs/core-testing/zlib/PKGBUILD
+++ b/abs/core-testing/zlib/PKGBUILD
@@ -1,25 +1,33 @@
-# $Id: PKGBUILD 4237 2008-07-05 19:17:35Z pierre $
+# $Id: PKGBUILD 80715 2010-05-20 20:58:22Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.3.3
-pkgrel=14
-pkgdesc="A compression/decompression Library"
+pkgver=1.2.5
+pkgrel=2
+pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
-license=('custom:zlib')
-url="http://www.gzip.org/zlib"
-groups=('base')
+license=('custom')
+url="http://www.zlib.net/"
 depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz")
-md5sums=('c444cf020e5f0e3323b11f5a2d8af8d3')
+options=('!makeflags')
+source=("http://zlib.net/zlib-${pkgver}.tar.gz"
+        'zlib-1.2.5-lfs-decls.patch')
+md5sums=('c735eab2d659a96e5a594c9e8541ad63'
+         '4cb279ea3beab621f3526bf7b7ab99e5')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
-
-	./configure --prefix=/usr --shared
+	# see http://bugs.archlinux.org/task/19280
+	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch || return 1
+	export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
+	./configure --prefix=/usr
 	make || return 1
-	make install prefix=${pkgdir}/usr || return 1
 
-	grep -A 24 '^  Copyright' zlib.h > license.txt
-	install -D license.txt ${pkgdir}/usr/share/licenses/zlib/license.txt
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
+package() {
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir} || return 1
+	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
 }
diff --git a/abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch b/abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch
new file mode 100644
index 0000000..36e26af
--- /dev/null
+++ b/abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch
@@ -0,0 +1,13 @@
+Index: zlib-1.2.5/zlib.h
+===================================================================
+--- zlib-1.2.5.orig/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-- 
cgit v0.12