diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-07-02 13:57:28 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-02 13:57:28 +0000 |
commit | 3ba9d2e9de02e50f8933f9e1c2ff922494ac664b (patch) | |
tree | 92f7749b06899c557fd4a6182f120c14f1e4374d /sys-libs | |
parent | Stable on alpha. (diff) | |
download | gentoo-2-3ba9d2e9de02e50f8933f9e1c2ff922494ac664b.tar.gz gentoo-2-3ba9d2e9de02e50f8933f9e1c2ff922494ac664b.tar.bz2 gentoo-2-3ba9d2e9de02e50f8933f9e1c2ff922494ac664b.zip |
old
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/zlib/files/digest-zlib-1.2.1-r3 | 1 | ||||
-rw-r--r-- | sys-libs/zlib/files/zlib-1.2.1-CAN-2004-0797.patch | 28 | ||||
-rw-r--r-- | sys-libs/zlib/files/zlib-1.2.1-mapfile.patch | 88 | ||||
-rw-r--r-- | sys-libs/zlib/zlib-1.2.1-r3.ebuild | 74 |
4 files changed, 0 insertions, 191 deletions
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.1-r3 b/sys-libs/zlib/files/digest-zlib-1.2.1-r3 deleted file mode 100644 index 9f6b96487246..000000000000 --- a/sys-libs/zlib/files/digest-zlib-1.2.1-r3 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 09815b99024a..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.1-CAN-2004-0797.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/zlib-1.2.1-mapfile.patch b/sys-libs/zlib/files/zlib-1.2.1-mapfile.patch deleted file mode 100644 index fa0e39df92f7..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.1-mapfile.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- configure.orig 2003-12-02 12:48:03.882675272 -0800 -+++ configure 2003-12-02 13:00:18.728031272 -0800 -@@ -76,7 +76,9 @@ - SFLAGS=${CFLAGS-"-fPIC -O3"} - CFLAGS="$cflags" - case `(uname -s || echo unknown) 2>/dev/null` in -- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -+ Linux | linux | GNU | GNU/*) -+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} -+ MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};; - CYGWIN* | Cygwin* | cygwin* ) - EXE='.exe';; - QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 -@@ -123,6 +125,7 @@ - LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; - SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} - CFLAGS=${CFLAGS-"-fast -xcg89"} -+ MAPFILE=${MAPFILE-"-M mapfile"} - LDSHARED=${LDSHARED-"cc -G"};; - SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} - CFLAGS=${CFLAGS-"-O2"} -@@ -169,6 +172,7 @@ - echo 'No shared library support; 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-12-02 12:59:22.275926800 -0800 -@@ -0,0 +1,56 @@ -+{ -+ global: -+ zlibVersion ; -+ deflateInit_ ; -+ deflateInit2_ ; -+ deflate ; -+ deflateSetDictionary ; -+ deflateCopy ; -+ deflateReset ; -+ deflateParams ; -+ deflateEnd ; -+ deflateBound ; -+ deflatePrime ; -+ inflateInit_ ; -+ inflateInit2_ ; -+ inflate ; -+ inflateSetDictionary ; -+ inflateSync ; -+ inflateReset ; -+ inflateEnd ; -+ inflateCopy ; -+ inflateBackInit_ ; -+ inflateBack ; -+ inflateBackEnd ; -+ zlibCompileFlags ; -+ compressBound ; -+ compress ; -+ compress2 ; -+ uncompress ; -+ gzopen ; -+ gzdopen ; -+ gzsetparams ; -+ gzread ; -+ gzwrite ; -+ gzprintf ; -+ gzputs ; -+ gzgets ; -+ gzputc ; -+ gzgetc ; -+ gzungetc ; -+ gzflush ; -+ gzseek ; -+ gzrewind ; -+ gztell ; -+ gzeof ; -+ gzclose ; -+ gzerror ; -+ gzclearerr ; -+ adler32 ; -+ crc32 ; -+ zError ; -+ inflateSyncPoint ; -+ get_crc_table ; -+ local: -+ *; -+}; diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild deleted file mode 100644 index b4554d39ccea..000000000000 --- a/sys-libs/zlib/zlib-1.2.1-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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.1-r3.ebuild,v 1.17 2005/03/13 12:00:11 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -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="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="build" - -RDEPEND="virtual/libc" - -pkg_setup() { - tc-export CC RANLIB - AR="$(tc-getAR) rc" -} - -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 - # fix shared library test on -fPIC dependant archs - epatch ${FILESDIR}/${P}-fPIC.patch -} - -src_compile() { - ./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die - emake || die - - ./configure --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 -} |