security fix. bug #61749

5 files changed, 132 insertions, 24 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index e93279f6f933..26b8ad4b0e3e 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.30 2004/08/24 04:21:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.31 2004/08/26 14:56:35 solar Exp $
+
+*zlib-1.2.1-r3 (26 Aug 2004)
+
+  26 Aug 2004; <solar@gentoo.org> +files/zlib-1.2.1-CAN-2004-0797.patch,
+  +zlib-1.2.1-r3.ebuild:
+  security fix. bug #61749
 
   24 Aug 2004; Sven Wegener <swegener@gentoo.org> zlib-1.1.4-r2.ebuild,
   zlib-1.1.4-r3.ebuild, zlib-1.1.4-r4.ebuild, zlib-1.2.1-r1.ebuild,
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9942eaa0bab8..87ec967f6d53 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,33 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3860177d69208444d26783c0c6f9add9 ChangeLog 4611
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b3aadcb1bf6019636f65e7cb8db85357 zlib-1.1.4-r2.ebuild 1067
-MD5 eba713fa0b9e1cfd9b6399bb41719492 zlib-1.1.4-r3.ebuild 1229
-MD5 ae016cf235049588d41c1797c8e94638 zlib-1.1.4-r4.ebuild 1311
-MD5 9b68e47c58d78250f1b610cb714fefa7 zlib-1.2.1-r1.ebuild 1309
 MD5 68d013456ea5d8427734c9bf1cf6a0b7 zlib-1.2.1-r2.ebuild 2108
+MD5 ae016cf235049588d41c1797c8e94638 zlib-1.1.4-r4.ebuild 1311
 MD5 685811c05eac951acc75ceccf8b4d992 zlib-1.2.1.ebuild 1264
+MD5 9b68e47c58d78250f1b610cb714fefa7 zlib-1.2.1-r1.ebuild 1309
+MD5 eba713fa0b9e1cfd9b6399bb41719492 zlib-1.1.4-r3.ebuild 1229
+MD5 04ff1ba2277f219b6f09103b52be0b99 zlib-1.2.1-r3.ebuild 2190
+MD5 839201fe385f5d6a1eacb68a6b6021b1 ChangeLog 4764
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
+MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1 63
+MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
+MD5 d11cf0bd8fc84eb7a006583ade1ce3c4 files/zlib-1.1.4-gzprintf.patch 7436
+MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
+MD5 58b797a8da0e12e6cebaa0140f6493df files/zlib-1.1.4-mapfile.patch 1876
+MD5 c8c569db61c8c3d4c6b0a781c188a2c8 files/zlib-1.1.4-gentoo.security.patch 10190
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r2 63
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r3 63
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r4 63
-MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r1 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r2 63
-MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
-MD5 c8c569db61c8c3d4c6b0a781c188a2c8 files/zlib-1.1.4-gentoo.security.patch 10190
+MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
+MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
 MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
-MD5 d11cf0bd8fc84eb7a006583ade1ce3c4 files/zlib-1.1.4-gzprintf.patch 7436
-MD5 58b797a8da0e12e6cebaa0140f6493df files/zlib-1.1.4-mapfile.patch 1876
+MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
 MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
-MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
-MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
-MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBKsJ1I1lqEGTUzyQRAvZ1AKDOMMBaPIhrc1EjDlXh37JRo25JmgCgscR1
-ySRDkTtx3yFBQcGx6RVXgPs=
-=YtOX
------END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.1-r3 b/sys-libs/zlib/files/digest-zlib-1.2.1-r3
new file mode 100644
index 000000000000..9f6b96487246
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.2.1-r3
@@ -0,0 +1 @@
+MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
diff --git a/sys-libs/zlib/files/zlib-1.2.1-CAN-2004-0797.patch b/sys-libs/zlib/files/zlib-1.2.1-CAN-2004-0797.patch
new file mode 100644
index 000000000000..09815b99024a
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-CAN-2004-0797.patch
@@ -0,0 +1,28 @@
+Security Bugfixes (CAN-2004-0797, OpenPKG-SA-2004.038-zlib):
+
+Index: infback.c
+--- infback.c.orig	2003-08-12 01:48:06 +0200
++++ infback.c	2004-08-25 12:37:07 +0200
+@@ -434,6 +434,9 @@
+                 }
+             }
+ 
++            if (state->mode == BAD)
++                break;
++
+             /* build code tables */
+             state->next = state->codes;
+             state->lencode = (code const FAR *)(state->next);
+Index: inflate.c
+--- inflate.c.orig	2003-10-26 07:15:36 +0100
++++ inflate.c	2004-08-25 12:37:07 +0200
+@@ -861,6 +861,9 @@
+                 }
+             }
+ 
++            if (state->mode == BAD)
++                break;
++
+             /* build code tables */
+             state->next = state->codes;
+             state->lencode = (code const FAR *)(state->next);
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..74e8e03d60a4
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.1 2004/08/26 14:56:35 solar 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"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="build"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# 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
+	# The configure script can be kind of dumb #55434
+	epatch ${FILESDIR}/${P}-configure.patch
+	#security fix. bug #61749
+	epatch ${FILESDIR}/${P}-CAN-2004-0797.patch
+}
+
+pkg_setup() {
+	# this adds support for installing to lib64/lib32. since only portage
+	# 2.0.51 will have this functionality supported in dolib and friends,
+	# and since it isnt expected that many profiles will define it, we need
+	# to make this variable default to lib.
+	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
+src_compile() {
+	./configure --shared --prefix=/usr --libdir=/${CONF_LIBDIR} || die
+	emake || die
+	make test || die
+
+	./configure --prefix=/usr --libdir=/${CONF_LIBDIR} || die
+	emake || die
+}
+
+src_install() {
+	einstall libdir=${D}/${CONF_LIBDIR} || die
+	rm ${D}/${CONF_LIBDIR}/libz.a
+	into /usr
+	dodir /usr/include
+	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
+	into /usr
+	dolib libz.a
+
+	# all the shared libs go into /lib
+	# for NFS based /usr
+	into /
+	dolib libz.so.${PV}
+	( cd ${D}/${CONF_LIBDIR} ; chmod 755 libz.so.* )
+	dosym libz.so.${PV} /${CONF_LIBDIR}/libz.so
+	dosym libz.so.${PV} /${CONF_LIBDIR}/libz.so.1
+	# with an extra symlink at /usr/lib
+	dosym /${CONF_LIBDIR}/libz.so.${PV} /usr/${CONF_LIBDIR}/libz.so
+}