sh KEYWORDS

4 files changed, 2 insertions, 173 deletions

diff --git a/app-arch/gzip/files/digest-gzip-1.3.3-r4 b/app-arch/gzip/files/digest-gzip-1.3.3-r4
deleted file mode 100644
index 8ee90a6f0a0d..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.3-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52eaf713673507d21f7abefee98ba662 gzip-1.3.3.tar.gz 312263
diff --git a/app-arch/gzip/files/gzip-1.3.3-security.patch b/app-arch/gzip/files/gzip-1.3.3-security.patch
deleted file mode 100644
index a54b7b0fc6ab..000000000000
--- a/app-arch/gzip/files/gzip-1.3.3-security.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- gzip-1.3.2.orig/znew.in
-+++ gzip-1.3.2/znew.in
-@@ -16,8 +16,8 @@
- warn="(does not preserve modes and timestamp)"
- tmp=/tmp/zfoo.$$
- set -C
--echo hi > $tmp.1
--echo hi > $tmp.2
-+echo hi > $tmp.1 || exit 1
-+echo hi > $tmp.2 || exit 1
- if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
-   cpmod=${CPMOD-cpmod}
-   warn=""
-
---- gzip-1.3.2.orig/gzexe.in	1998-09-17 20:43:06.000000000 -0400
-+++ gzip-1.3.2/gzexe.in	2004-06-23 18:20:31.840776483 -0400
-@@ -21,8 +21,10 @@
-   exit 1
- fi
- 
-+set -C
- tmp=gz$$
- trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15
-+: > $tmp || exit 1
- 
- decomp=0
- res=0
-@@ -32,8 +34,8 @@
-   shift
- fi
- 
--echo hi > zfoo1$$
--echo hi > zfoo2$$
-+echo hi > zfoo1$$ || exit 1
-+echo hi > zfoo2$$ || exit 1
- if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then
-   cpmod=${CPMOD-cpmod}
- fi
-@@ -86,26 +88,28 @@
-       writable=0
-       chmod u+w $tmp 2>/dev/null
-     fi
-+    : >| $tmp	# truncate the file, ignoring set -C
-   fi
-   if test $decomp -eq 0; then
--    sed 1q $0 > $tmp
-+    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 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
-+tmpfile=`tempfile -p gztmp -d /tmp` || exit 1
-+if tail -n +$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
-@@ -120,11 +124,11 @@
- 
-   else
-     # decompression
--    skip=22
-+    skip=23
-     if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then
-       eval `sed -e 1d -e 2q "$i"`
-     fi
--    if tail +$skip "$i" | gzip -cd > $tmp; then
-+    if tail -n +$skip "$i" | gzip -cd >> $tmp; then
-       :
-     else
-       echo ${x}: $i probably not in gzexe format, file unchanged.
diff --git a/app-arch/gzip/gzip-1.3.3-r4.ebuild b/app-arch/gzip/gzip-1.3.3-r4.ebuild
deleted file mode 100644
index 89becce6343e..000000000000
--- a/app-arch/gzip/gzip-1.3.3-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.3-r4.ebuild,v 1.3 2004/06/25 23:50:35 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
-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"
-IUSE="nls build static"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-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
-		dosed -e "1d" -e "s:${D}::" ${i}
-		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-r2.ebuild b/app-arch/gzip/gzip-1.3.5-r2.ebuild
index dd6b9cc951de..c2ba218fa0e5 100644
--- a/app-arch/gzip/gzip-1.3.5-r2.ebuild
+++ b/app-arch/gzip/gzip-1.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.9 2004/10/30 15:58:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.5-r2.ebuild,v 1.10 2004/11/12 15:04:27 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/g/gzip/gzip_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc s390 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls build static pic"
 
 RDEPEND="virtual/libc"