Another revision bump for bug 93782. Updated patch from taviso.

(Portage version: 2.0.51.22-r1)

5 files changed, 48 insertions, 11 deletions

diff --git a/dev-util/shtool/ChangeLog b/dev-util/shtool/ChangeLog
index cc91c0c839cb..dde5ae7464c9 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.15 2005/05/26 13:46:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/ChangeLog,v 1.16 2005/05/31 16:48:06 ka0ttic Exp $
+
+*shtool-2.0.1-r2 (31 May 2005)
+
+  31 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff,
+  -shtool-2.0.1.ebuild, +shtool-2.0.1-r2.ebuild:
+  Another revision bump for bug 93782. Updated patch from taviso.
 
   26 May 2005; Bryan Østergaard <kloeri@gentoo.org> shtool-2.0.1-r1.ebuild:
   Stable on ia64, bug 93782.
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index ebb95ff0937c..59402b55155f 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,7 +1,8 @@
-MD5 cc37f87756a24c69a1e58d5752c67e01 ChangeLog 2069
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 c1cde8b78e5c9adfa7e35cc9800a4cfe shtool-2.0.1.ebuild 700
 MD5 791880e548bfc5f83c5c786e8ec8453f shtool-2.0.1-r1.ebuild 803
+MD5 0a23cd20e7f487de3fa72854b3e4ae18 shtool-2.0.1-r2.ebuild 817
+MD5 3892dc41a0334d9607e32cbad2f9c046 ChangeLog 2323
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1-r1 63
+MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1-r2 63
 MD5 d68648661d4a5703763bc4d4d9a889e3 files/shtool-2.0.1-fix-insecure-tmp-creation.diff 509
-MD5 681bcf27698f4267818a267ff35134fa files/digest-shtool-2.0.1 63
+MD5 d136e53521c22eb8b9f2987dfd19163d files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff 744
diff --git a/dev-util/shtool/files/digest-shtool-2.0.1 b/dev-util/shtool/files/digest-shtool-2.0.1-r2
index 121f547af3f2..121f547af3f2 100644
--- a/dev-util/shtool/files/digest-shtool-2.0.1
+++ b/dev-util/shtool/files/digest-shtool-2.0.1-r2
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
new file mode 100644
index 000000000000..115629468bc2
--- /dev/null
+++ b/dev-util/shtool/files/shtool-2.0.1-r2-fix-insecure-tmp-creation.diff
@@ -0,0 +1,26 @@
+--- 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.ebuild b/dev-util/shtool/shtool-2.0.1-r2.ebuild
index b54504cb47ee..22297676e65a 100644
--- a/dev-util/shtool/shtool-2.0.1.ebuild
+++ b/dev-util/shtool/shtool-2.0.1-r2.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-2.0.1.ebuild,v 1.4 2005/04/01 05:40:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.1-r2.ebuild,v 1.1 2005/05/31 16:48:06 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 ~ppc"
+KEYWORDS="~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6"
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A} && cd ${S}
+	# security bug 93782
+	epatch ${FILESDIR}/${PF}-fix-insecure-tmp-creation.diff
 }
 
 src_install () {
-	emake DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION NEWS RATIONAL
 }