9 files changed, 20 insertions, 92 deletions
diff --git a/dev-util/shtool/ChangeLog b/dev-util/shtool/ChangeLog
index a7e61d4fdf44..0270a9942894 100644
--- a/dev-util/shtool/ChangeLog
+++ b/dev-util/shtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/shtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/ChangeLog,v 1.22 2005/08/23 16:53:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/ChangeLog,v 1.23 2005/10/03 12:09:44 ka0ttic Exp $
+
+*shtool-2.0.3 (03 Oct 2005)
+
+  03 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/shtool-2.0.1-fix-insecure-tmp-creation.diff,
+  -files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff,
+  -shtool-2.0.1-r1.ebuild, -shtool-2.0.1-r2.ebuild, +shtool-2.0.3.ebuild:
+  Version bump; tidy old ebuilds/patches.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> shtool-2.0.2.ebuild:
   stable on ia64
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index 1dd38f3a4f9b..b8cea065f467 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,10 +1,6 @@
-MD5 2b2c847fc582680aaab5bdc79f802d67 shtool-2.0.1-r2.ebuild 815
+MD5 40609cfdb39271b26cf715d39650ecdb ChangeLog 3239
+MD5 2a38fab4d9ceb353af8397efeb3c5653 files/digest-shtool-2.0.2 63
+MD5 28e60974f858c81b6b23fa59d04218c4 files/digest-shtool-2.0.3 63
 MD5 fa9f0ec1a9f013df4ca78764a473a250 metadata.xml 256
-MD5 791880e548bfc5f83c5c786e8ec8453f shtool-2.0.1-r1.ebuild 803
-MD5 59eb782154db0870c66e49a5f761265c ChangeLog 2933
 MD5 5818c98749deebe3ccdf65c64a314b7f shtool-2.0.2.ebuild 717
-MD5 d136e53521c22eb8b9f2987dfd19163d files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff 744
-MD5 2a38fab4d9ceb353af8397efeb3c5653 files/digest-shtool-2.0.2 63
-MD5 d68648661d4a5703763bc4d4d9a889e3 files/shtool-2.0.1-fix-insecure-tmp-creation.diff 509
-MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1-r1 63
-MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1-r2 63
+MD5 2bc1aad2a2ea6928cc63ca41227e59fa shtool-2.0.3.ebuild 720
diff --git a/dev-util/shtool/files/digest-shtool-2.0.1-r1 b/dev-util/shtool/files/digest-shtool-2.0.1-r1
deleted file mode 100644
index 121f547af3f2..000000000000
--- a/dev-util/shtool/files/digest-shtool-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b434ed054fed53af682b52489c7931d4 shtool-2.0.1.tar.gz 91315
diff --git a/dev-util/shtool/files/digest-shtool-2.0.1-r2 b/dev-util/shtool/files/digest-shtool-2.0.1-r2
deleted file mode 100644
index 121f547af3f2..000000000000
--- a/dev-util/shtool/files/digest-shtool-2.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b434ed054fed53af682b52489c7931d4 shtool-2.0.1.tar.gz 91315
diff --git a/dev-util/shtool/files/digest-shtool-2.0.3 b/dev-util/shtool/files/digest-shtool-2.0.3
new file mode 100644
index 000000000000..142306b169bb
--- /dev/null
+++ b/dev-util/shtool/files/digest-shtool-2.0.3
@@ -0,0 +1 @@
+MD5 315596dfc7b728af6f83ec44c40eae46 shtool-2.0.3.tar.gz 92148
diff --git a/dev-util/shtool/files/shtool-2.0.1-fix-insecure-tmp-creation.diff b/dev-util/shtool/files/shtool-2.0.1-fix-insecure-tmp-creation.diff
deleted file mode 100644
index f3611e27a30c..000000000000
--- a/dev-util/shtool/files/shtool-2.0.1-fix-insecure-tmp-creation.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN shtool-2.0.1.orig/sh.common shtool-2.0.1/sh.common
---- shtool-2.0.1.orig/sh.common	2005-05-24 18:47:37.000000000 -0400
-+++ shtool-2.0.1/sh.common	2005-05-24 18:51:21.000000000 -0400
-@@ -168,10 +168,7 @@
-     else
-         tmpdir="/tmp"
-     fi
--    tmpfile="$tmpdir/.shtool.$$"
--    rm -f $tmpfile >/dev/null 2>&1
--    touch $tmpfile
--    chmod 600 $tmpfile
-+    tmpfile=`mktemp "$tmpdir/.shtool.XXXXXX"`
- fi
- 
- #   utility function: map string to lower case
diff --git a/dev-util/shtool/files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff b/dev-util/shtool/files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff
deleted file mode 100644
index 115629468bc2..000000000000
--- a/dev-util/shtool/files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- sh.common.orig	2004-04-07 08:50:21.000000000 +0100
-+++ sh.common	2005-05-29 20:39:20.854878600 +0100
-@@ -168,7 +168,13 @@
-     else
-         tmpdir="/tmp"
-     fi
--    tmpfile="$tmpdir/.shtool.$$"
-+    if mkdir "$tmpdir/.shtool.$$"; then
-+        tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-+	else
-+        echo "$msgprefix:Error: failed to create temporary file" 1>&2
-+        exit 1
-+    fi
-+    tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-     rm -f $tmpfile >/dev/null 2>&1
-     touch $tmpfile
-     chmod 600 $tmpfile
-@@ -188,7 +194,7 @@
- shtool_exit () {
-     rc="$1"
-     if [ ".$gen_tmpfile" = .yes ]; then
--        rm -f $tmpfile >/dev/null 2>&1 || true
-+        rm -fr "$tmpdir/.shtool.$$" >/dev/null 2>&1 || true
-     fi
-     exit $rc
- }
diff --git a/dev-util/shtool/shtool-2.0.1-r2.ebuild b/dev-util/shtool/shtool-2.0.1-r2.ebuild
deleted file mode 100644
index 17152c58b561..000000000000
--- a/dev-util/shtool/shtool-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.1-r2.ebuild,v 1.3 2005/06/04 09:08:50 kloeri Exp $
-
-inherit eutils
-
-DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
-SRC_URI="ftp://ftp.gnu.org/gnu/shtool/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	# security bug 93782
-	epatch ${FILESDIR}/${PF}-fix-insecure-tmp-creation.diff
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION NEWS RATIONAL
-}
diff --git a/dev-util/shtool/shtool-2.0.1-r1.ebuild b/dev-util/shtool/shtool-2.0.3.ebuild
index 42f82ec3bc25..23a262d25d32 100644
--- a/dev-util/shtool/shtool-2.0.1-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.3.ebuild
@@ -1,27 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.1-r1.ebuild,v 1.3 2005/05/26 13:46:35 kloeri Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.3.ebuild,v 1.1 2005/10/03 12:09:44 ka0ttic Exp $
 
 DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
-SRC_URI="ftp://ftp.gnu.org/gnu/shtool/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ia64 ~ppc sparc x86"
+SLOT="0"
+KEYWORDS="~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6"
 
-src_unpack() {
-	unpack ${A}
-	# security bug 93782
-	epatch ${FILESDIR}/${P}-fix-insecure-tmp-creation.diff
-}
-
 src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION NEWS RATIONAL
 }