Remove zdiff patch since it isnt actually needed (zdiff utilizes the noclobber feature of bash to protect against symlink attacks). Fixes zdiff breakage #70277.

8 files changed, 26 insertions, 144 deletions

diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 8fae7aa44bf0..08699b6e5574 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-arch/gzip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.44 2005/01/01 11:45:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.45 2005/01/04 19:28:14 vapier Exp $
+
+*gzip-1.3.5-r5 (04 Jan 2005)
+
+  04 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/gzip-1.3.5-zdiff-tempfile-2.patch,
+  -files/gzip-1.3.5-zdiff-tempfile.patch, -gzip-1.3.5-r3.ebuild,
+  -gzip-1.3.5-r4.ebuild, +gzip-1.3.5-r5.ebuild:
+  Remove zdiff patch since it isnt actually needed (zdiff utilizes the
+  noclobber feature of bash to protect against symlink attacks). Fixes zdiff
+  breakage #70277.
 
   29 Dec 2004; Hardave Riar <hardave@gentoo.org> gzip-1.3.5-r4.ebuild:
   Stable on mips, bug #70825.
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 0c3215628201..2fe28332bf52 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,10 +1,16 @@
-MD5 ba688b1cd7167a8bc5c732906c09eca2 ChangeLog 7639
-MD5 6a181e8f4f31a5390560c3a56ea9a20d gzip-1.3.5-r3.ebuild 2140
-MD5 6b1004fbfa42dd6cb53e337c8a166cdc gzip-1.3.5-r4.ebuild 2144
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f98c7721e498c13d406d850b54d6e7ee ChangeLog 8040
+MD5 f5efa40bde12f75a2ae72d6f577fd041 gzip-1.3.5-r5.ebuild 2085
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r3 134
-MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r4 134
-MD5 fece8c9d7f666a4831b914a61176bc16 files/gzip-1.3.5-zdiff-tempfile-2.patch 715
-MD5 f4727ba4030d08645aff9e1957453ecf files/gzip-1.3.5-zdiff-tempfile.patch 939
-MD5 5e7967bad14d0fd7e1e3d4f6086831b9 files/gzip-1.3.5-znew-tempfile.patch 615
 MD5 17f0be7717f949fc0acd0ef316982cd6 files/gzip-1.3.5-znew-tempfile-2.patch 1931
+MD5 a3bbaab6aec4b44161509caf1883e5d8 files/digest-gzip-1.3.5-r5 134
+MD5 5e7967bad14d0fd7e1e3d4f6086831b9 files/gzip-1.3.5-znew-tempfile.patch 615
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB2u5qroRuSHgZdywRAiIHAJ4rJoXo8VxHsYGNnm3RvDvIMRLl6QCeINaq
+XaAFV3Kg0I8H+BqTWQdh+D8=
+=xsvi
+-----END PGP SIGNATURE-----
diff --git a/app-arch/gzip/files/digest-gzip-1.3.5-r4 b/app-arch/gzip/files/digest-gzip-1.3.5-r4
deleted file mode 100644
index d9e68f978e4f..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.5-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-gzip-1.3.5-r3 b/app-arch/gzip/files/digest-gzip-1.3.5-r5
index d9e68f978e4f..d9e68f978e4f 100644
--- a/app-arch/gzip/files/digest-gzip-1.3.5-r3
+++ b/app-arch/gzip/files/digest-gzip-1.3.5-r5
diff --git a/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile-2.patch b/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile-2.patch
deleted file mode 100644
index f791e6fea674..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- zdiff.in	2002-09-26 04:33:24.000000000 -0400
-+++ zdiff.in.new	2004-10-26 19:06:08.000000000 -0400
-@@ -47,11 +51,12 @@
- 	        *[-.]gz* | *[-.][zZ] | *.t[ga]z)
- 			F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'`
- 			set -C
--			trap 'rm -f /tmp/"$F".$$; exit 2' HUP INT PIPE TERM 0
--			gzip -cdfq "$2" > /tmp/"$F".$$ || exit
--                        gzip -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$
-+			tmp=`mktemp /tmp/$F.XXXXXX`
-+			trap 'rm -f $tmp; exit 2' HUP INT PIPE TERM 0
-+			gzip -cdfq "$2" > $tmp || exit
-+			gzip -cdfq "$1" | $comp $OPTIONS - $tmp
-                         STAT="$?"
--			/bin/rm -f /tmp/"$F".$$ || STAT=2
-+			/bin/rm -f $tmp || STAT=2
- 			trap - HUP INT PIPE TERM 0
- 			exit $STAT;;
- 
diff --git a/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile.patch b/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile.patch
deleted file mode 100644
index 293560dc8763..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-zdiff-tempfile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- zdiff.in	2002-09-26 04:33:24.000000000 -0400
-+++ zdiff.in.new	2004-10-26 19:06:08.000000000 -0400
-@@ -35,6 +35,10 @@
- 	echo "Usage: $prog [${comp}_options] file [file]"
- 	exit 2
- fi
-+tmp=`tempfile -d /tmp -p gz` || {
-+	echo 'cannot create a temporary file' >&2
-+	exit 1
-+}
- set $FILES
- if test $# -eq 1; then
- 	FILE=`echo "$1" | sed 's/[-.][zZtga]*$//'`
-@@ -47,11 +51,11 @@
- 	        *[-.]gz* | *[-.][zZ] | *.t[ga]z)
- 			F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'`
- 			set -C
--			trap 'rm -f /tmp/"$F".$$; exit 2' HUP INT PIPE TERM 0
--			gzip -cdfq "$2" > /tmp/"$F".$$ || exit
--                        gzip -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$
-+			trap 'rm -f $tmp; exit 2' HUP INT PIPE TERM 0
-+			gzip -cdfq "$2" > $tmp || exit
-+			gzip -cdfq "$1" | $comp $OPTIONS - $tmp
-                         STAT="$?"
--			/bin/rm -f /tmp/"$F".$$ || STAT=2
-+			/bin/rm -f $tmp || STAT=2
- 			trap - HUP INT PIPE TERM 0
- 			exit $STAT;;
- 
diff --git a/app-arch/gzip/gzip-1.3.5-r3.ebuild b/app-arch/gzip/gzip-1.3.5-r3.ebuild
deleted file mode 100644
index 6905348db2c0..000000000000
--- a/app-arch/gzip/gzip-1.3.5-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 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.12 2005/01/01 11:45:48 eradicator 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
-}
diff --git a/app-arch/gzip/gzip-1.3.5-r4.ebuild b/app-arch/gzip/gzip-1.3.5-r5.ebuild
index 0c95ea1472b7..49c3088bf052 100644
--- a/app-arch/gzip/gzip-1.3.5-r4.ebuild
+++ b/app-arch/gzip/gzip-1.3.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r4.ebuild,v 1.10 2005/01/01 11:45:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.5-r5.ebuild,v 1.1 2005/01/04 19:28:14 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,7 +25,6 @@ src_unpack() {
 	unpack gzip_${PV}.orig.tar.gz
 	cd ${S}
 	epatch ${DISTDIR}/${P}-deb.patch.bz2
-	epatch ${FILESDIR}/gzip-1.3.5-zdiff-tempfile-2.patch
 	epatch ${FILESDIR}/gzip-1.3.5-znew-tempfile-2.patch
 }