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

(Portage version: 2.1.6.12/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 21 insertions, 4 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/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
 }