5 files changed, 116 insertions, 3 deletions
diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 547a7ba472bd..e60674cb922f 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/gzip
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.25 2004/10/30 15:58:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.26 2004/11/17 21:25:23 solar Exp $
+
+*gzip-1.3.5-r3 (17 Nov 2004)
+
+  17 Nov 2004; <solar@gentoo.org> +files/gzip-1.3.5-znew-tempfile.patch,
+  +gzip-1.3.5-r3.ebuild:
+  security bump. znew tmpfile handling.
 
   30 Oct 2004; Tom Gall <tgall@gentoo.org> gzip-1.3.5-r2.ebuild:
   stable on ppc64, bug #68405
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 6c574f16faea..cffce4b9ebf6 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,7 +1,10 @@
-MD5 7b0018b3452ca4ce5d47513dc44c34a7 ChangeLog 5587
 MD5 8cf232bd624a2032dadf55c7ca093ffd gzip-1.3.5-r1.ebuild 2029
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 85317f2e071762e182f17b5ac109114a gzip-1.3.5-r3.ebuild 2148
 MD5 2948dddacf6b27fd22006250f42a7e62 gzip-1.3.5-r2.ebuild 2085
+MD5 7b0018b3452ca4ce5d47513dc44c34a7 ChangeLog 5587
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r1 134
 MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r2 134
+MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r3 134
+MD5 5e7967bad14d0fd7e1e3d4f6086831b9 files/gzip-1.3.5-znew-tempfile.patch 615
 MD5 f4727ba4030d08645aff9e1957453ecf files/gzip-1.3.5-zdiff-tempfile.patch 939
diff --git a/app-arch/gzip/files/digest-gzip-1.3.5-r3 b/app-arch/gzip/files/digest-gzip-1.3.5-r3
new file mode 100644
index 000000000000..d9e68f978e4f
--- /dev/null
+++ b/app-arch/gzip/files/digest-gzip-1.3.5-r3
@@ -0,0 +1,2 @@
+MD5 3d6c191dfd2bf307014b421c12dc8469 gzip_1.3.5.orig.tar.gz 331550
+MD5 63d6cf343da210a3740aef2ed583f85d gzip-1.3.5-deb.patch.bz2 9136
diff --git a/app-arch/gzip/files/gzip-1.3.5-znew-tempfile.patch b/app-arch/gzip/files/gzip-1.3.5-znew-tempfile.patch
new file mode 100644
index 000000000000..14f671280db8
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.3.5-znew-tempfile.patch
@@ -0,0 +1,19 @@
+--- ./znew.in~	2004-11-11 19:40:30.000000000 +0100
++++ ./znew.in	2004-11-11 19:51:20.100650392 +0100
+@@ -14,10 +14,15 @@
+ # block is the disk block size (best guess, need not be exact)
+ 
+ warn="(does not preserve modes and timestamp)"
+-tmp=/tmp/zfoo.$$
++tmp=`tempfile -d /tmp -p zfoo` || {
++        echo 'cannot create a temporary file' >&2
++        exit 1
++}
+ set -C
+ echo hi > $tmp.1 || exit 1
+ echo hi > $tmp.2 || exit 1
++trap 'rm -f $tmp.1; exit 2' HUP INT PIPE TERM 0
++trap 'rm -f $tmp.2; exit 2' HUP INT PIPE TERM 0
+ if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
+   cpmod=${CPMOD-cpmod}
+   warn=""
diff --git a/app-arch/gzip/gzip-1.3.5-r3.ebuild b/app-arch/gzip/gzip-1.3.5-r3.ebuild
new file mode 100644
index 000000000000..ff8a011a534f
--- /dev/null
+++ b/app-arch/gzip/gzip-1.3.5-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.5-r3.ebuild,v 1.1 2004/11/17 21:25:23 solar Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
+# This is also available from alpha.gnu.org, but that site has very limited
+# bandwidth and often isn't accessible
+SRC_URI="mirror://debian/pool/main/g/gzip/gzip_${PV}.orig.tar.gz
+	mirror://gentoo/${P}-deb.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls build static pic"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+PROVIDE="virtual/gzip"
+
+src_unpack() {
+	unpack gzip_${PV}.orig.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${P}-deb.patch.bz2
+	epatch ${FILESDIR}/gzip-1.3.5-zdiff-tempfile.patch
+	epatch ${FILESDIR}/gzip-1.3.5-znew-tempfile.patch
+}
+
+src_compile() {
+	use static && append-flags -static
+	# avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+	econf --exec-prefix=/ $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	make prefix=${D}/usr \
+		exec_prefix=${D}/ \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	cd ${D}/bin
+
+	for i in gzexe zforce zgrep zmore znew zcmp
+	do
+		sed -i -e "s:${D}::" ${i} || die
+		chmod 755 ${i}
+	done
+
+	# No need to waste space -- these guys should be links
+	# gzcat is equivilant to zcat, but historically zcat
+	# was a link to compress.
+	rm -f gunzip zcat zcmp zegrep zfgrep
+	dosym gzip /bin/gunzip
+	dosym gzip /bin/gzcat
+	dosym gzip /bin/zcat
+	dosym zdiff /bin/zcmp
+	dosym zgrep /bin/zegrep
+	dosym zgrep /bin/zfgrep
+
+	if ! use build
+	then
+		cd ${D}/usr/share/man/man1
+		rm -f gunzip.* zcmp.* zcat.*
+		ln -s gzip.1.gz gunzip.1.gz
+		ln -s zdiff.1.gz zcmp.1.gz
+		ln -s gzip.1.gz zcat.1.gz
+		ln -s gzip.1.gz gzcat.1.gz
+		cd ${S}
+		rm -rf ${D}/usr/man ${D}/usr/lib
+		dodoc ChangeLog NEWS README THANKS TODO
+		docinto txt
+		dodoc algorithm.doc gzip.doc
+	else
+		rm -rf ${D}/usr
+	fi
+}