8 files changed, 48 insertions, 39 deletions
diff --git a/dev-util/shtool/ChangeLog b/dev-util/shtool/ChangeLog
index fb0b4d3de688..e0e7985190c8 100644
--- a/dev-util/shtool/ChangeLog
+++ b/dev-util/shtool/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2005/04/01 05:40:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/ChangeLog,v 1.13 2005/05/24 23:02:56 ka0ttic Exp $
+
+*shtool-2.0.1-r1 (24 May 2005)
+
+  24 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/shtool-2.0.1-fix-insecure-tmp-creation.diff,
+  -shtool-1.5.1-r2.ebuild, -shtool-2.0.0.ebuild, +shtool-2.0.1-r1.ebuild:
+  Revision bump for security bug 93782; tidy old vulnerable versions.
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> shtool-2.0.1.ebuild:
   stable on ia64
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index e54bf8ec9fb1..cf6d748febf4 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fc96fefc0eb33d15f69d3c01794304c shtool-2.0.1-r1.ebuild 806
 MD5 c1cde8b78e5c9adfa7e35cc9800a4cfe shtool-2.0.1.ebuild 700
-MD5 48a94769c90927ae6e6678f02ebd7af5 shtool-2.0.0.ebuild 669
-MD5 38af2d6ad3e3683d868160525466d83a shtool-1.5.1-r2.ebuild 667
-MD5 6cca68d867ca9084657a36955d8ff214 ChangeLog 1574
+MD5 31863b8cfa95a216b508a761d8ce61c8 ChangeLog 1853
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 464e282a2264f57547160110a75fb2cd files/digest-shtool-1.5.1-r2 63
-MD5 63a43b75ae57d47788bf15fa55bde7e4 files/digest-shtool-2.0.0 63
+MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1-r1 63
+MD5 d68648661d4a5703763bc4d4d9a889e3 files/shtool-2.0.1-fix-insecure-tmp-creation.diff 509
 MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCk7KvEZCkKN40op4RAuCgAKCtvI3Ltaqiz6FL2j0FC1bSHZ5rsQCgwIOs
+Mx1PkRfIu3sb/CNzDlTPMFk=
+=b9gu
+-----END PGP SIGNATURE-----
diff --git a/dev-util/shtool/files/digest-shtool-1.5.1-r2 b/dev-util/shtool/files/digest-shtool-1.5.1-r2
deleted file mode 100644
index a4d770e4146f..000000000000
--- a/dev-util/shtool/files/digest-shtool-1.5.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f8400d527b7613127db2478299679f6 shtool-1.5.1.tar.gz 61695
diff --git a/dev-util/shtool/files/digest-shtool-2.0.0 b/dev-util/shtool/files/digest-shtool-2.0.0
deleted file mode 100644
index 6c9b2ac907fc..000000000000
--- a/dev-util/shtool/files/digest-shtool-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b93415536c0af62fc69e66e5db2e9cca shtool-2.0.0.tar.gz 91067
diff --git a/dev-util/shtool/files/digest-shtool-2.0.1-r1 b/dev-util/shtool/files/digest-shtool-2.0.1-r1
new file mode 100644
index 000000000000..121f547af3f2
--- /dev/null
+++ b/dev-util/shtool/files/digest-shtool-2.0.1-r1
@@ -0,0 +1 @@
+MD5 b434ed054fed53af682b52489c7931d4 shtool-2.0.1.tar.gz 91315
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
new file mode 100644
index 000000000000..f3611e27a30c
--- /dev/null
+++ b/dev-util/shtool/files/shtool-2.0.1-fix-insecure-tmp-creation.diff
@@ -0,0 +1,15 @@
+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/shtool-2.0.0.ebuild b/dev-util/shtool/shtool-2.0.0.ebuild
deleted file mode 100644
index 900a4e824e25..000000000000
--- a/dev-util/shtool/shtool-2.0.0.ebuild
+++ /dev/null
@@ -1,24 +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.0.ebuild,v 1.6 2005/04/01 05:40:55 agriffis 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ia64 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION
-}
diff --git a/dev-util/shtool/shtool-1.5.1-r2.ebuild b/dev-util/shtool/shtool-2.0.1-r1.ebuild
index 7c9ade416efb..38d1557dbe13 100644
--- a/dev-util/shtool/shtool-1.5.1-r2.ebuild
+++ b/dev-util/shtool/shtool-2.0.1-r1.ebuild
@@ -1,6 +1,8 @@
 # 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-1.5.1-r2.ebuild,v 1.13 2005/04/01 05:40:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.1-r1.ebuild,v 1.1 2005/05/24 23:02:56 ka0ttic 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"
@@ -8,17 +10,18 @@ HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ia64"
+KEYWORDS="~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6"
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	# security bug 93782
+	epatch ${FILESDIR}/${P}-fix-insecure-tmp-creation.diff
 }
 
 src_install () {
-	einstall || die
-	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION NEWS RATIONAL
 }