Fix bug #369543.

Package-Manager: portage-2.1.10.2/cvs/Linux x86_64

4 files changed, 28 insertions, 8 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index fdb59ca4071e..e329c28c8f94 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.248 2011/06/03 17:29:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.249 2011/06/12 22:14:04 spock Exp $
+
+  12 Jun 2011; Michał Januszewski <spock@gentoo.org> nmap-5.51.ebuild,
+  +files/nmap-5.51-su-to-zenmap-fix.patch:
+  Fix bug #369543.
 
   03 Jun 2011; Raúl Porcel <armin76@gentoo.org> nmap-5.51.ebuild:
   ia64/s390/sh/sparc stable wrt #359853
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 351f5f6bbc53..ea0851aa5a80 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -8,6 +8,7 @@ AUX nmap-5.10_beta1-string.patch 252 RMD160 58dc7f4dfb660519a51af2f5619eca144cfd
 AUX nmap-5.20-nolua.patch 1237 RMD160 b670ecd0630d0f13f8f5a46cc8ffb84b86374c3d SHA1 e64d645b6b4e3a73482945632eba7aa7f6730d4a SHA256 ce215ce6666e4518121d6a5996c7e7a29037fc77b2d43d0ffbf77d9d7c00e985
 AUX nmap-5.21-openssl-1.patch 920 RMD160 5c8d7c1c55a9cc2cd5acc5237c20bf5ca726855a SHA1 b8af4241ceac2a2bd12df5c443b599528bb31423 SHA256 1e0167303acdeb01a90d61afd2cc8ca521d8e9504585716f07e7acf2367f1360
 AUX nmap-5.21-python.patch 1219 RMD160 87b07436f42950341403ee0f92edf02abfe88614 SHA1 6e82966a50b150ce3cb2b36d0ad57595f98dc2c8 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74
+AUX nmap-5.51-su-to-zenmap-fix.patch 785 RMD160 44f30cdf13120d949792eb07e82d7b697c914bb0 SHA1 fcea2bb71901ed4c78e918f07a3da208f115a3d9 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da
 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-5.21.tar.bz2 10015121 RMD160 85e912c3c6a7ed03eb1b399c812836071e4dcf9f SHA1 ce5ff792161dae0037e41b31e0c2ef683ce94655 SHA256 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
@@ -15,13 +16,13 @@ DIST nmap-5.35DC1.tar.bz2 11302092 RMD160 d0663a669824a38f05e89c14a2ad5fd9932edd
 DIST nmap-5.51.tar.bz2 16869068 RMD160 d5ac8b245234e122936b40c80927a3c4afba53bd SHA1 3415ad9a3915d7e162c9e91435cc35d9c73ac7f6 SHA256 15b3e134a74fa9b54aba2c3a53d6701c7ad221dc4051657ef95465a5a5a8687e
 EBUILD nmap-5.21-r1.ebuild 1853 RMD160 afe1d7959e144fd320a3ebd17c391d4a6a1fc617 SHA1 6ca5da46059c3fd6fd523a447f3019734d569911 SHA256 a1e82563d667c8559ff03bc31e224e66db6d60aa8d9f2b9dce0dabb3bca4bb0f
 EBUILD nmap-5.35.ebuild 1878 RMD160 bade2661341cc764192a3ea9812a12d3804936fb SHA1 bf529de7c48b7debb722441080e01198692ca6fe SHA256 52569140a07b39c67f4a8163391d304b3a859ab1fd43a6a35f21ad4e08fa1c56
-EBUILD nmap-5.51.ebuild 1798 RMD160 b4a3888270e44f049216b289649c79792596b635 SHA1 826f4d633091d986f979d2a18debbced66c9ff0d SHA256 c3e515b5889c87425039b2c86c05f66e71fe717803e6d05edb0e5522c212b59e
-MISC ChangeLog 30310 RMD160 d1e90d2216ab830908274bee023280570123c1c6 SHA1 dcd308a690d8901ce5a6cce5ed6dd2a00c5a14d8 SHA256 1882981f22978f17940271bbbeb85e0fd3882f56993595e31bda4276268a0cb3
+EBUILD nmap-5.51.ebuild 1853 RMD160 4df8afa96ae3afe7f0ebc5f4051a0cc431d9eab5 SHA1 01a8515b3175c59c3d541e57a36b7b0f8335758c SHA256 632766f6788752a5d00c27bea784173d86940d52fb39b655a44b9238092478d0
+MISC ChangeLog 30443 RMD160 c1b68a47368a07d1906e4806220de5c474dff7d2 SHA1 0bcce1f23cff84d2ec1c0f1396a143ab98980f05 SHA256 ce4185d3e03db0ebdf7528be943b90184efbc946124a3d79a89f1fc4b07eacea
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3pGekACgkQuQc30/atMkBPbwCgvmLe9KwuxiPZRKQb4v90gwDa
-02EAnReS+Z0UBYIZpUCOWT0kxkJYrJL8
-=vuKf
+iEYEARECAAYFAk31OjgACgkQchej4aZK9/dC5QCcDF7wJop65rya+IE6LJFdoQJB
+RjUAn1uPlRttAML1pn1bmnHFNokrYqZ7
+=eySh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch b/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
new file mode 100644
index 000000000000..a2b53907752a
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
@@ -0,0 +1,14 @@
+diff -Naurp nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh
+--- nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:08:06.141000195 +0200
++++ nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:09:00.487000200 +0200
+@@ -40,8 +40,8 @@ else
+     fi
+     case $SU_TO_ROOT_X in
+       gksu) gksu -u "$PRIV" "$COMMAND";;
+-      kdesu) kdesu -u "$PRIV" "$COMMAND";;
+-      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
++      kdesu) kdesu -u "$PRIV" $COMMAND;;
++      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" $COMMAND;;
+       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
+   # As a last resort, open a new xterm use sudo/su
+       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
diff --git a/net-analyzer/nmap/nmap-5.51.ebuild b/net-analyzer/nmap/nmap-5.51.ebuild
index 0254653d2405..5886f7489696 100644
--- a/net-analyzer/nmap/nmap-5.51.ebuild
+++ b/net-analyzer/nmap/nmap-5.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.9 2011/06/03 17:29:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.10 2011/06/12 22:14:04 spock Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -39,6 +39,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
 	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	epatch "${FILESDIR}"/${PN}-5.21-python.patch
+	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
 	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
 }