Check exit status of tempfile command #54890

Update to 1.3.5 plus Debian patches to fix segfault on alpha #53641

9 files changed, 141 insertions, 13 deletions

diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 2b30e2375e15..9b60aa312704 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/gzip
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.6 2004/05/06 07:07:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.7 2004/06/23 14:48:59 agriffis Exp $
+
+*gzip-1.3.5 (23 Jun 2004)
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> +metadata.xml,
+  files/gzip-1.3.3-security.patch, +files/gzip-1.3.5-security.patch,
+  -gzip-1.3.3-r2.ebuild, +gzip-1.3.5.ebuild:
+  Check exit status of tempfile command #54890
+  Update to 1.3.5 plus Debian patches to fix segfault on alpha #53641
 
   06 May 2004; Daniel Black <dragonheart@gentoo.org>
   -files/gzip-1.2.4a-r5-gentoo.diff, -files/gzip-1.2.4a-r6-gentoo.diff,
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index d8eb5cd878be..58b7363a14cb 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,4 +1,7 @@
-MD5 2034712a3fa0de0258ee8a1598965ac5 files/digest-gzip-1.3.3-r2 62
-MD5 2e1eadb762ec68d94f784a1d28303658 files/gzip-1.3.3-security.patch 1562
-MD5 c3b9add1ee0cbaa11bd22900af631f99 ChangeLog 3230
-MD5 8f4f4052bba17d9ab7cbcda71c879a0c gzip-1.3.3-r2.ebuild 1963
+MD5 6e392eb07476a53224f95859bd3c5bdd gzip-1.3.5.ebuild 2156
+MD5 1e2cb0868eb303f8a70a656f26d36579 gzip-1.3.3-r3.ebuild 1789
+MD5 6bd778c683ec89896c707260e0092255 ChangeLog 3229
+MD5 6318a14a58dab7174f3e487cf8558e6c files/gzip-1.3.3-security.patch 1573
+MD5 b007ca73991aa40a1b2d56cfeb9d270f files/digest-gzip-1.3.5 131
+MD5 2034712a3fa0de0258ee8a1598965ac5 files/digest-gzip-1.3.3-r3 62
+MD5 132fdde4ed8a37f34e631b51fb54c2d6 files/gzip-1.3.5-security.patch 1294
diff --git a/app-arch/gzip/files/digest-gzip-1.3.3-r2 b/app-arch/gzip/files/digest-gzip-1.3.3-r3
index 8ee90a6f0a0d..8ee90a6f0a0d 100644
--- a/app-arch/gzip/files/digest-gzip-1.3.3-r2
+++ b/app-arch/gzip/files/digest-gzip-1.3.3-r3
diff --git a/app-arch/gzip/files/digest-gzip-1.3.5 b/app-arch/gzip/files/digest-gzip-1.3.5
new file mode 100644
index 000000000000..70ca4140d8e2
--- /dev/null
+++ b/app-arch/gzip/files/digest-gzip-1.3.5
@@ -0,0 +1,2 @@
+MD5 3d6c191dfd2bf307014b421c12dc8469 gzip_1.3.5.orig.tar.gz 331550
+MD5 316503963781d09d41f5a8beecd4e824 gzip_1.3.5-8.diff.gz 53940
diff --git a/app-arch/gzip/files/gzip-1.3.3-security.patch b/app-arch/gzip/files/gzip-1.3.3-security.patch
index cbebfaf679d9..460b917f7899 100644
--- a/app-arch/gzip/files/gzip-1.3.3-security.patch
+++ b/app-arch/gzip/files/gzip-1.3.3-security.patch
@@ -10,8 +10,8 @@
  umask=`umask`
  umask 77
 -if tail +$skip $0 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
-+tmpfile=$(tempfile -p gztmp -d /tmp)
-+if tail +$skip $0 | /bin/gzip -cd >> $tmpfile; then
++tmpfile=`tempfile -p gztmp -d /tmp` || exit 1
++if tail +$skip "$0" | /bin/gzip -cd >> $tmpfile; then
    umask $umask
 -  /bin/chmod 700 /tmp/gztmp$$
 +  /bin/chmod 700 $tmpfile
diff --git a/app-arch/gzip/files/gzip-1.3.5-security.patch b/app-arch/gzip/files/gzip-1.3.5-security.patch
new file mode 100644
index 000000000000..08eeea1b21c5
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.3.5-security.patch
@@ -0,0 +1,35 @@
+--- gzexe.in.orig	2004-06-23 05:36:22.000000000 -0400
++++ gzexe.in	2004-06-23 05:53:53.000000000 -0400
+@@ -114,22 +114,23 @@
+   if test $decomp -eq 0; then
+     sed 1q $0 > $tmp
+     sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
+-skip=22
++skip=23
+ set -C
+ umask=`umask`
+ umask 77
+-if tail +$skip "$0" | /bin/gzip -cd > /tmp/gztmp$$; then
++tmpfile=`tempfile -d /tmp -p gztmp` || exit 1
++if tail +$skip "$0" | /bin/gzip -cd >> $tmpfile; then
+   umask $umask
+-  /bin/chmod 700 /tmp/gztmp$$
++  /bin/chmod 700 $tmpfile
+   prog="`echo $0 | /bin/sed 's|^.*/||'`"
+-  if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
+-    trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0
+-    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null &
++  if /bin/ln $tmpfile "/tmp/$prog" 2>/dev/null; then
++    trap '/bin/rm -f $tmpfile "/tmp/$prog"; exit $res' 0
++    (/bin/sleep 5; /bin/rm -f $tmpfile "/tmp/$prog") 2>/dev/null &
+     /tmp/"$prog" ${1+"$@"}; res=$?
+   else
+-    trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0
+-    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null &
+-    /tmp/gztmp$$ ${1+"$@"}; res=$?
++    trap '/bin/rm -f $tmpfile; exit $res' 0
++    (/bin/sleep 5; /bin/rm -f $tmpfile) 2>/dev/null &
++    $tmpfile ${1+"$@"}; res=$?
+   fi
+ else
+   echo Cannot decompress $0; exit 1
diff --git a/app-arch/gzip/gzip-1.3.3-r2.ebuild b/app-arch/gzip/gzip-1.3.3-r3.ebuild
index c3968d138b84..77ac2c9bb127 100644
--- a/app-arch/gzip/gzip-1.3.3-r2.ebuild
+++ b/app-arch/gzip/gzip-1.3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.3-r2.ebuild,v 1.8 2004/05/31 19:41:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.3-r3.ebuild,v 1.1 2004/06/23 14:48:59 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gzip.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="x86 ppc sparc mips -alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE="nls build static"
 
 RDEPEND="virtual/glibc"
@@ -25,10 +25,6 @@ src_unpack() {
 }
 
 src_compile() {
-	# Compiling with gcc3 and higher level of optimization seems to
-	# cause a segmentation fault in some very rare cases on alpha.
-	[ ${ARCH} = "alpha" ] && CFLAGS="-O -pipe"
-
 	use static && append-flags -static
 
 	econf \
diff --git a/app-arch/gzip/gzip-1.3.5.ebuild b/app-arch/gzip/gzip-1.3.5.ebuild
new file mode 100644
index 000000000000..394bb13a1eff
--- /dev/null
+++ b/app-arch/gzip/gzip-1.3.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.5.ebuild,v 1.1 2004/06/23 14:48:59 agriffis 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://debian/pool/main/g/gzip/gzip_1.3.5-8.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="nls build static"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+PROVIDE="virtual/gzip"
+
+src_unpack() {
+	unpack gzip_${PV}.orig.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/gzip_1.3.5-8.diff.gz
+	epatch ${FILESDIR}/gzip-1.3.5-security.patch
+}
+
+src_compile() {
+	use static && append-flags -static
+	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 "1d" -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/metadata.xml b/app-arch/gzip/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/app-arch/gzip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>