Fix a bug in the su-to-zenmap script (bug #267322).

Package-Manager: portage-2.1.6.12/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 28 insertions, 10 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 5db7ea6abb53..8edcc9d7fd7c 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.197 2009/04/25 07:15:05 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.198 2009/05/02 17:34:33 spock Exp $
+
+  02 May 2009; Michał Januszewski <spock@gentoo.org> nmap-4.76.ebuild,
+  nmap-4.85_beta8.ebuild, +files/su-to-zenmap.sh.diff:
+  Fix a bug in the su-to-zenmap script (bug #267322).
 
 *nmap-4.85_beta8 (25 Apr 2009)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fb10a635c8bd..b9bf6386e315 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
+AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-4.76.tar.bz2 6061317 RMD160 ec93522e05e7233e8950b28ab12b45355e63c0c7 SHA1 a71141738b4512b6d5b35ef94258e525df30a586 SHA256 4e24328ca6ec97afb2a8caf312b1f111a15cf41763a5ac41e7a633fdb217d66d
 DIST nmap-4.85BETA7.tar.bz2 6454664 RMD160 c64585598487e63e15443853230d29eee72ef11c SHA1 c7660aa6d48516fe8085032e5de771df4a5eff95 SHA256 dfff90a51fa44770a48dbeb31378d090ee334e4df2d013c8934f6ebf33eaabe5
 DIST nmap-4.85BETA8.tar.bz2 6484436 RMD160 d91a853ba534e1d567b8df1829ddde8b6f033d94 SHA1 22a1fb0c4af5db8c2b18a300aee1f4bcfec49830 SHA256 cbb47abcf494d92a21c9618f9d76d7a26c9d33bda750dd2c2e6fc76f64a95668
-EBUILD nmap-4.76.ebuild 1458 RMD160 babf395dcd5651a4cff78f4dff1a4723112cda0c SHA1 720409f5a3397b607b29741aa985b0b63b50ccd6 SHA256 28403419c8251bad745667116beac49034acfd766df76bf8cae79cc7dd204e51
+EBUILD nmap-4.76.ebuild 1504 RMD160 56cc829c2b1ed394ef11f4a86a6c74841dc0362b SHA1 b88a4081226fd4a229f5839e63decb42ab7ef5a5 SHA256 0aac8809865e963873de31525cc722691383c87553ec7c1fb362b7048800b445
 EBUILD nmap-4.85_beta7.ebuild 1587 RMD160 59c71403949cc2a6a0961a255c2f945047095786 SHA1 903c9a0f10ba85f7437560e657b5de6aae7a0326 SHA256 9c7b1358095e049913e759dbb2231de7685ce6bd76e5090dfeb75febf58f5ca1
-EBUILD nmap-4.85_beta8.ebuild 1587 RMD160 42ae969b4c054289895649a4d336d67f9a7d3245 SHA1 d75ef880c00186cf66fd0c83cfa673645381206e SHA256 635e3f36bd1102dcd4c89ab1748ae69801cb2f7246b690bad0ed90c185dcdcf3
-MISC ChangeLog 23892 RMD160 c307b3c5bfbfc8e470a1994f55934fa9997f04d3 SHA1 54903ccb8f6f09a108d6ffd259386c0677ea65ea SHA256 a034629740c8cc46c16b35b22377e035bdc58f0a31ac324e2aa9c5875d3a1bcc
+EBUILD nmap-4.85_beta8.ebuild 1630 RMD160 781ea53789c6d37dbc9f5844c9e1c972938114e5 SHA1 8693be65a9499b6d16e0ba59c864a3f08a50cbe1 SHA256 a8ab9f080f78eb424251f25bef827c1a970205407013d50473425f78f8a498f6
+MISC ChangeLog 24074 RMD160 a7ea4d63dc54e1ce100e5a6a2118037a2a912c47 SHA1 17f7c39073b528fe457918f2e66d8a11a4b61737 SHA256 bfe727b527ab0fe9bcd0022520307a1607db86d061e843d969445a0bb090d60c
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknyuD4ACgkQchej4aZK9/fVtwCeLbiRNxJQNTzEbCEYHZgT7hNi
-VVoAn3p9QD+WovNdu/G3Og8aJONoEy99
-=LF9l
+iEYEARECAAYFAkn8hDwACgkQchej4aZK9/cwQACfXr3R4KTH1eIvzHHDuK2Eslvy
+H6AAnRAD56F53th1TvsexiEGFUR2GAyv
+=+ecT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/su-to-zenmap.sh.diff b/net-analyzer/nmap/files/su-to-zenmap.sh.diff
new file mode 100644
index 000000000000..484f165d488c
--- /dev/null
+++ b/net-analyzer/nmap/files/su-to-zenmap.sh.diff
@@ -0,0 +1,11 @@
+--- nmap-4.76/zenmap/install_scripts/unix/su-to-zenmap.sh.orig
++++ nmap-4.76/zenmap/install_scripts/unix/su-to-zenmap.sh
+@@ -45,7 +45,7 @@
+       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
+   # As a last resort, open a new xterm use sudo/su
+       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
+-      sterm) xterm -e "su -l $PRIV -C $COMMAND";;
++      sterm) xterm -e "su -l $PRIV -c $COMMAND";;
+     esac;
+ fi
+ 
diff --git a/net-analyzer/nmap/nmap-4.76.ebuild b/net-analyzer/nmap/nmap-4.76.ebuild
index ae8b1042c34e..905f4a8c5c78 100644
--- a/net-analyzer/nmap/nmap-4.76.ebuild
+++ b/net-analyzer/nmap/nmap-4.76.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.76.ebuild,v 1.9 2009/03/08 10:35:21 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.76.ebuild,v 1.10 2009/05/02 17:34:33 spock Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-4.75-include.patch"
 	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
+	epatch "${FILESDIR}/su-to-zenmap.sh.diff"
 }
 
 src_configure() {
diff --git a/net-analyzer/nmap/nmap-4.85_beta8.ebuild b/net-analyzer/nmap/nmap-4.85_beta8.ebuild
index efc40f64bbfc..4394a4e0675d 100644
--- a/net-analyzer/nmap/nmap-4.85_beta8.ebuild
+++ b/net-analyzer/nmap/nmap-4.85_beta8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.85_beta8.ebuild,v 1.1 2009/04/25 07:15:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.85_beta8.ebuild,v 1.2 2009/05/02 17:34:33 spock Exp $
 
 EAPI="2"
 
@@ -33,6 +33,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-4.75-include.patch"
 	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
+	epatch "${FILESDIR}/su-to-zenmap.sh.diff"
 	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
 }