Only export global symbols, bug #32764. Patch thanks to Danek Duvall

<duvall@emufarm.org>.

5 files changed, 148 insertions, 4 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 53c7aec106d4..f8804d03f401 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.16 2003/10/29 21:03:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.17 2003/11/06 22:45:16 azarah Exp $
+
+*zlib-1.1.4-r4 (07 Nov 2003)
+
+  07 Nov 2003; Martin Schlemmer <azarah@gentoo.org> zlib-1.1.4-r4.ebuild,
+  files/zlib-1.1.4-mapfile.patch:
+  Only export global symbols, bug #32764. Patch thanks to Danek Duvall
+  <duvall@emufarm.org>.
 
 *zlib-1.1.4-r3 (29 Oct 2003)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 59f29828eb09..f6a5dda36911 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -2,10 +2,9 @@ MD5 91f6062db2146c9d80cd1d67fa875bde zlib-1.1.4-r2.ebuild 1091
 MD5 cad2872215ce5bf03f9a0e39d222d686 zlib-1.1.4.ebuild 970
 MD5 07c95f20d757666245fb4bc2e779989c zlib-1.1.4-r3.ebuild 1255
 MD5 3d4c649e3822c61abee71f21546f115b zlib-1.1.4-r1.ebuild 1111
-MD5 cd4b381a57a7292a83a2dc69e5930d8e ChangeLog 2476
-MD5 013a5f8e56ee9523515420d7ce455271 zlib-1.1.4-r4.ebuild 1336
+MD5 ee7582d6814e93db2104fb8f7c06d3fd ChangeLog 2710
+MD5 9e67b1100b68849d6bac089dc6cd9db4 zlib-1.1.4-r4.ebuild 1336
 MD5 50994a0512095579777c3fcf0382ab87 zlib-1.1.3-r3.ebuild 943
-MD5 cb0db3706db858a2b137ab9338978cc1 .zlib-1.1.4-r4.ebuild.swp 12288
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r1 63
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r3 63
 MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
diff --git a/sys-libs/zlib/files/digest-zlib-1.1.4-r4 b/sys-libs/zlib/files/digest-zlib-1.1.4-r4
new file mode 100644
index 000000000000..ac97e5a21b50
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.1.4-r4
@@ -0,0 +1 @@
+MD5 ea16358be41384870acbdc372f9db152 zlib-1.1.4.tar.bz2 147014
diff --git a/sys-libs/zlib/files/zlib-1.1.4-mapfile.patch b/sys-libs/zlib/files/zlib-1.1.4-mapfile.patch
new file mode 100644
index 000000000000..8b6d13a91269
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.1.4-mapfile.patch
@@ -0,0 +1,79 @@
+--- configure.orig	2003-11-04 20:00:19.192057400 -0800
++++ configure	2003-11-04 20:00:22.524327784 -0800
+@@ -72,7 +72,8 @@
+   SFLAGS=${CFLAGS-"-fPIC -O3"}
+   CFLAGS="$cflags"
+   case `(uname -s || echo unknown) 2>/dev/null` in
+-  Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
++  Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"}
++		 MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
+   *)             LDSHARED=${LDSHARED-"gcc -shared"};;
+   esac
+ else
+@@ -104,7 +105,8 @@
+ 	     LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+   SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+              CFLAGS=${CFLAGS-"-fast -xcg89"}
+-	     LDSHARED=${LDSHARED-"cc -G"};;
++	     MAPFILE=${MAPFILE-"-M mapfile"}
++	     LDSHARED=${LDSHARED-"cc -G"};;
+   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+ 	     CFLAGS=${CFLAGS-"-O2"}
+ 	     LDSHARED=${LDSHARED-"ld"};;
+@@ -138,6 +140,7 @@
+     echo 'No shared library suppport; try without defining CC and CFLAGS'
+     shared=0;
+   fi
++  LDSHARED="${LDSHARED} ${MAPFILE}"
+ fi
+ if test $shared -eq 0; then
+   LDSHARED="$CC"
+--- /dev/null	2003-10-15 22:31:52.000000000 -0700
++++ mapfile	2003-11-04 19:44:59.742269984 -0800
+@@ -0,0 +1,46 @@
++{
++	global:
++		zlibVersion ;
++		deflateInit_ ;
++		deflateInit2_ ;
++		deflate ;
++		deflateSetDictionary ;
++		deflateCopy ;
++		deflateReset ;
++		deflateParams ;
++		deflateEnd ;
++		inflateInit_ ;
++		inflateInit2_ ;
++		inflate ;
++		inflateSetDictionary ;
++		inflateSync ;
++		inflateReset ;
++		inflateEnd ;
++		compress ;
++		compress2 ;
++		uncompress ;
++		gzopen ;
++		gzdopen ;
++		gzsetparams ;
++		gzread ;
++		gzwrite ;
++		gzprintf ;
++		gzputs ;
++		gzgets ;
++		gzputc ;
++		gzgetc ;
++		gzflush ;
++		gzseek ;
++		gzrewind ;
++		gztell ;
++		gzeof ;
++		gzclose ;
++		gzerror ;
++		adler32 ;
++		crc32 ;
++		zError ;
++		inflateSyncPoint ;
++		get_crc_table ;
++	local:
++		*;
++};
diff --git a/sys-libs/zlib/zlib-1.1.4-r4.ebuild b/sys-libs/zlib/zlib-1.1.4-r4.ebuild
new file mode 100644
index 000000000000..2da0b2ee8932
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.1.4-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.1.4-r4.ebuild,v 1.1 2003/11/06 22:45:16 azarah Exp $
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Standard (de)compression library"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2"
+HOMEPAGE="http://www.gzip.org/zlib"
+
+LICENSE="ZLIB"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Updated security patch
+	epatch ${FILESDIR}/${P}-gzprintf.patch
+
+	# Make sure we link with glibc at all times
+	epatch ${FILESDIR}/${P}-glibc.patch
+	# Needed for Alpha and prelink
+	epatch ${FILESDIR}/${P}-build-fPIC.patch
+	# Only export global symbols, bug #32764
+	epatch ${FILESDIR}/${P}-mapfile.patch
+}
+
+src_compile() {
+	./configure --shared --prefix=/usr || die
+	emake || die
+	make test || die
+
+	./configure --prefix=/usr || die
+	emake || die
+}
+
+src_install() {
+	into /usr
+	dodir /usr/include
+	insinto /usr/include
+	doins zconf.h zlib.h
+
+	dolib libz.so.${PV}
+	( cd ${D}/usr/lib ; chmod 755 libz.so.* )
+	dolib libz.a
+	dosym libz.so.${PV} /usr/lib/libz.so
+	dosym libz.so.${PV} /usr/lib/libz.so.1
+
+	doman zlib.3
+	dodoc FAQ README ChangeLog
+	docinto txt
+	dodoc algorithm.txt
+}