fix #97547

(Portage version: 2.0.51.19)

5 files changed, 99 insertions, 16 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 04fd5f909a89..21eb5d999910 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.47 2005/04/09 13:21:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.48 2005/07/06 13:10:50 taviso Exp $
+
+*zlib-1.2.2-r1 (06 Jul 2005)
+
+  06 Jul 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/zlib-1.2.2-inftrees.patch, +zlib-1.2.2-r1.ebuild:
+  fix #97547 CAN-2005-2096
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> zlib-1.2.2.ebuild:
   Stable on ppc64
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 6f6fc22e2486..3b1fbc4030b0 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8fdb273162a71c14e3c30eaf79437522 zlib-1.2.2-r1.ebuild 1868
 MD5 8064f3ee210d73a2f545ca908f6e6863 zlib-1.2.2.ebuild 1779
-MD5 16fb19e5366b6680c265e8d0fe2226f4 ChangeLog 6939
-MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
+MD5 d636be090173b1b63b336933c9b04da6 ChangeLog 7105
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
-MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
-MD5 d821453623869d6d8f7de1eca8b12e2f files/zlib-1.2.1-build-fPIC.patch 2211
 MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
 MD5 40634a4cbdcd9c795cfc34473c76038c files/zlib-1.2.2-mapfile.patch 2139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxp1ugIKl8Uu19MoRAun1AJ9FiI/MzRV1Dyha1C0N9jLIQMNETQCfbIww
-ENzpsdS7El0Kr6SluLM9hOQ=
-=WrY9
------END PGP SIGNATURE-----
+MD5 571442813f5f960edd0e7498786dff1f files/zlib-1.2.2-inftrees.patch 474
+MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2-r1 63
+MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
+MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
+MD5 d821453623869d6d8f7de1eca8b12e2f files/zlib-1.2.1-build-fPIC.patch 2211
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.2-r1 b/sys-libs/zlib/files/digest-zlib-1.2.2-r1
new file mode 100644
index 000000000000..5f8e75741a93
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.2.2-r1
@@ -0,0 +1 @@
+MD5 1b8aab042d40979e456194c468fd72c5 zlib-1.2.2.tar.bz2 371728
diff --git a/sys-libs/zlib/files/zlib-1.2.2-inftrees.patch b/sys-libs/zlib/files/zlib-1.2.2-inftrees.patch
new file mode 100644
index 000000000000..0df8dbb35e4c
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.2-inftrees.patch
@@ -0,0 +1,11 @@
+--- inftrees.c	2005-07-02 08:56:13.000000000 -0400
++++ inftrees.c	2005-07-02 08:57:15.000000000 -0400
+@@ -134,7 +134,7 @@
+         left -= count[len];
+         if (left < 0) return -1;        /* over-subscribed */
+     }
+-    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
++    if (left > 0 && (type == CODES || max != 1))
+         return -1;                      /* incomplete set */
+ 
+     /* generate offsets into symbol table for each length for sorting */
diff --git a/sys-libs/zlib/zlib-1.2.2-r1.ebuild b/sys-libs/zlib/zlib-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..ad051b4d090c
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2-r1.ebuild,v 1.1 2005/07/06 13:10:50 taviso Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.gzip.org/zlib/"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
+	http://www.zlib.net/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="build"
+
+RDEPEND=""
+
+pkg_setup() {
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) rc"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Make sure we link with glibc at all times
+	epatch ${FILESDIR}/${PN}-1.2.1-glibc.patch
+	# Needed for Alpha and prelink
+	epatch ${FILESDIR}/${PN}-1.2.1-build-fPIC.patch
+	# Only export global symbols, bug #32764
+	epatch ${FILESDIR}/${P}-mapfile.patch
+	# The configure script can be kind of dumb #55434
+	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
+	# fix shared library test on -fPIC dependant archs
+	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
+	# fix inflate vuln found by taviso@gentoo
+	epatch ${FILESDIR}/${P}-inftrees.patch
+}
+
+src_compile() {
+	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	einstall libdir=${D}/$(get_libdir) || die
+	rm "${D}"/$(get_libdir)/libz.a
+	insinto /usr/include
+	doins zconf.h zlib.h
+
+	if ! use build ; then
+		doman zlib.3
+		dodoc FAQ README ChangeLog
+		docinto txt
+		dodoc algorithm.txt
+	fi
+
+	# we don't need the static lib in /lib
+	# as it's only for compiling against
+	dolib libz.a
+
+	# all the shared libs go into /lib
+	# for NFS based /usr
+	into /
+	dolib libz.so.${PV}
+	( cd ${D}/$(get_libdir) ; chmod 755 libz.so.* )
+	dosym libz.so.${PV} /$(get_libdir)/libz.so
+	dosym libz.so.${PV} /$(get_libdir)/libz.so.1
+	gen_usr_ldscript libz.so
+}