fix build for 9999, rename lua->nse (9999 only for now) bug #529688, fix ambiguous openssl slot dep

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

7 files changed, 129 insertions, 26 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 9e77e9caee5d..38a4beb4e63b 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.334 2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.335 2015/05/12 16:06:37 zerochaos Exp $
+
+  12 May 2015; Rick Farina <zerochaos@gentoo.org>
+  +files/nmap-9999-no-FORTIFY_SOURCE.patch, metadata.xml, nmap-6.47-r1.ebuild,
+  nmap-6.47-r2.ebuild, nmap-9999.ebuild:
+  fix build for 9999, rename lua->nse (9999 only for now) bug #529688, fix
+  ambiguous openssl slot dep
 
 *nmap-6.47-r2 (26 Jan 2015)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 998731bddac2..3eeccfa4e729 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,17 +9,28 @@ AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
 AUX nmap-6.47-no-FORTIFY_SOURCE.patch 2388 SHA256 a639ee69b7aa01f36ffe5ad251bf3fc21b990b825459fb4932d83ebf7728c3d8 SHA512 a18ffd2c46393e069a8d892cde3fce542aebb4663c4d902a7443f206c0393dd7c3f33a5753ba3eeacb989cd95a4adb9ba4217e8efec313a7bb9f43a34678aff8 WHIRLPOOL a9479b56f37753758030146e99b09bb05e18ea1c2c9adeb72ca6052e44a2e03815135f74d258b12d3a9115864434127d68cd727ee7e50ddce77cd87f4dc5a71a
 AUX nmap-6.47-no-libnl.patch 1903 SHA256 5f9fa774374ee1c410123b0349d501d0aa265feffd3aeebd6f51aa6276d334fc SHA512 5e101915a4259502c88a2e8588e9d7b77464ce5129f78c5458265e0ce0dd13adc514f4df853ade6c8502c906c96a47954e1a432e1177a5d8acbbb444574e4083 WHIRLPOOL c74013ec6878c57fd726f6a8668d92abdc502521e27140ab37fa22fd3debd17138149c246798ac600fb01ebd4d4a3fd3834f2c806f15e4318c933c81a85bc8ba
+AUX nmap-9999-no-FORTIFY_SOURCE.patch 2395 SHA256 d79c3e7d55240531414e735f15e0b9eb017abb08b320abcb97d5644ea5fdb80c SHA512 3b9ad5df3091652fc600b4bf9dcf989c47f0d756f61d158228112544ace95c5448103414ab8f485d8b7dfecd03a1be9ed0695f9e0eda7e034830063fe8ea37e5 WHIRLPOOL d7ebe8638457ace6446df3669fe147721d7eed92670e9ecd4088d9e76e109aee325f49e94f8c9b235daade85a80657a5701afa979b718d5133b41c10074bdcdd
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
-EBUILD nmap-6.47-r1.ebuild 3807 SHA256 159927583d8299c0f1411672055b1fa69ef486b9dbf82ad66f2abb17cdc6479c SHA512 e99dff9a0dd34ac18ceec5160664ad1a4f9edbe47ab859ea84fea9ac2f617e2fa8b133f0d472e5a966b1bcdd158b0e8562745ab81ec25486ecfcbacb695a668c WHIRLPOOL c879d44f5ac7e2744ebe629b0b761bce964adc5e91d25bbce88c93f8f152e7e3e22548dafbc74a61c7b5b48327b52b0773736a8397c185393f2068562f756e25
-EBUILD nmap-6.47-r2.ebuild 3817 SHA256 1495265eef6c419a1dfd9be87d255d3c07933b0c0f6234cce06cdc53085122e3 SHA512 eb0c45952aaaf63952a00bd88106c7cb0474de21447f7fcdd0d38c524758cf99bca8db6866e8ae78e77cd256c766e6a83c21140405a6ed559adb432a966c08b4 WHIRLPOOL 00ebb6e44eb0d58827635287712d52662af3b43ed207579d51640c9fd11b0c04e1a97f88ceb4135bd4222a1cff856ec169cad41e712b876287dc41bcf1a69223
-EBUILD nmap-9999.ebuild 3584 SHA256 d2cc3d44e27ed2c29b395da1335e7e30dc8e3ccca6c8a4e433e164bd270cd776 SHA512 25127ec28d004d56ba199401159db0809f9242427a0467c5ad529fd1cdf8af340608b3678e57075cf6e49006f21cc9d11886f633bca64112f7097e0d1e43bb9e WHIRLPOOL 74756fd1af5ba9e34a924667357237a5864ae50e27c1124a9e9a04b7d4f54347e544503d9375df3c5242aaa161f1993249ac8c88ceb446b5360d857edde1987c
-MISC ChangeLog 41685 SHA256 fb8b8dce8d6c30c7b813eae819f9efa6cec87d5c1f2f9a1b7b3764780db32754 SHA512 a422f92416006871c3e679bb951ba8a6b1c3ef84381d8709ef97edf0d10a7d1e7d8b616a4f106f1d507414068b4cc30d223d5f4eef1e72489584077854e39776 WHIRLPOOL d2d7f4c60f9c5e9603c342ae4517fb1a272b77ba1835bacd4f434565dcc5644b66e94bde5e04afeb0d722cb012d2ec5e9189c2310695058e87ce76871d0f82ef
-MISC metadata.xml 698 SHA256 0bc8d424bc183f9dc54ed8bc8b957a3ececa0970e8f8826400bb594cdcd178d1 SHA512 929fa760d9178548397d23e90f08ed458f90e25ecc7a7e0193d696b904fff761c67f6957beeb9bfeff6832a0a8d2832ed4a8cf2e3742e3a18b869695f4b4cd09 WHIRLPOOL 7cf95e8e5aa1edadc28bcf6ad32ab22c03d48a748470738414b5b8f3f57948a4ce5a1acc4e17186a28df2c7c037f6db14f3b8a5bb7556dc10bd0035460e723fa
+EBUILD nmap-6.47-r1.ebuild 3816 SHA256 0414c7794fcb9d8c6d6c30b7d51b3418806cbddbd90a6472b07e9e8a658e050b SHA512 9b06ce439ba656b8f2b3cef0d03a2b8744e95fa4eacc47701fe97ba17b1a4c3879011b1bb4b7b3efff8fc78c6b8cbec497a2a95097ed0b0f2cd86ab0849e9b50 WHIRLPOOL 35a944028c2da4234257e30e21c3d3bf8b2843c8a2f6506963b88f60b74d23e97599cb10e67f2baedbbb41b7f7e2eeafab33fdfa2de3ed2a2606d2e98e5638bd
+EBUILD nmap-6.47-r2.ebuild 3826 SHA256 f60ece99695d4172422595c96308d344edfbcdfc2cd31ceaff8aae6d1ae1e211 SHA512 d9ae78487a65863c06dcb3a2c63b6ba227685ecd6e2a0a5295dbe4ba4c0dea4c6545f3ae84b407fc06d674d795f7b7ce9bdfd58dfcb06823ec009eab912de878 WHIRLPOOL 682385e7e44e7a6740453d8a8cc743b03535cc6e910fc1f116b8001f04d752e57925911a6c461b4ba6a35596379a35f2e3887b67dea38c7b5fdcaf9d08d71631
+EBUILD nmap-9999.ebuild 3932 SHA256 68d5ff6e0f7099b3e5c4483bc6fa09e7c88c08732dfdb5d4a804ff0753945282 SHA512 e3606d60fde850dfc01f5cd41de275ffb2de180b23b41aac13af69787a76932316a5c4a78d4c21eaf3a2430822817dd63f05a1d44f6cd70b2f37b79187e51893 WHIRLPOOL 54d383c642f08c9050d04798b00f9b6d3d8b11907ad74fe64b830988ca646e8caddc8eefca1d1d4f1df4db2868bfe258f36864f01e55869340c9f033874d3556
+MISC ChangeLog 41966 SHA256 71e4bc53643026bf7c013b2c677a17066b2281b955d5b80211989e7fa5f18552 SHA512 bc617ca843e140d96ec54d0ba97e26f14e04ffa86b8cf9150d680f8cc2ef27af2441f32c572c44f98fb226da7b5776d73963a918a1b005943da95c330948b2e0 WHIRLPOOL 452cc9e973cef3d5f64159125fa49240acc20d8b1d6179bba66a36093f3dc7259245f62a3e7ceedad7a1dcf5264e487804348c5ff89081c3d8a153ca45dd1f52
+MISC metadata.xml 774 SHA256 761bbc48753242190632a8a9b0cb8cee34f3969d00f29f36a4a02154d63bfcec SHA512 6c4f041b3a22abd05e75280b762dbdb04ad47505495443fbd4594e176bd68c375e727f9326c761964cc2a41da3a7d54c1213893b529892d972ef83bbe962fa0f WHIRLPOOL f730883a5efb88e96fd7839d434a60ce6f4f5fb7ef2a6376bb65324d004682c1f4ea145eaa156efa36bcf402a2780a30372157a349966eafa82039509798535e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTGLkQACgkQVWmRsqeSphNn+ACeMay8sry8350OoeljsxcQzjYy
-3S4AnAu+5+T57glKUqyS8Mu/q0FwxXiz
-=nXRz
+iQIcBAEBCAAGBQJVUiUPAAoJEKXdFCfdEflK8D8P/jc5KoxJ5AgueCi8s2j7eupa
+GwXoeRE/9kFbfBwGK1K73A1gXazuXCILHApWmwhJBqVsf7KizY9gP76aLBeRbtXw
+m0t4X2z+Ojgn4Or3fBYfUssp7cnTzKxNm1+ji40RllSrvzQGtxkDIv4ujgW6ZKTG
+BvQ1fzp/G0AvlJlo4LzuCeyAfg7phpP23qmN0WtiWSKHxZSgJRxdbpYAG+mYnzZW
+Ey9CW98HqjXwDQD4v+kbRZdgwWSZrZxOLarqGhi5qYiJBs9eXSr6IGMCOz/iJYxj
+M2ltc5sYb7LP+vIIDJEIb1aVD/AX3j8kDpbr5IhMINeQfb8epwxIYPgWULevIs9C
+ztjuBN2/TsWQhXJbVQmyPH42l67FF1yVvEGhJu9vZc+G7syG8GtUC9XLxLYDlp2Z
+KT2T5beZReo5QZGKpz/0tbnpDjlFrYyA1Cxb+a7GLuS6nvhV+jP0xktMfdARXvEa
+Yu1soqLNw55E58SSeyWCljS14FqhzjC2EoKFHhn3uM68UGDPNiYGZuHus3zv7B/D
+aWq9UZsLzowctASJUEO0AYs3javmGRwNbAHY6vGJHi45fd51ELrpOqwhE4XAIICc
+W7tihwuMcN6OAh/DnzKNoSE8joAfj+sHOybxprN9Z4BP5wQCy5z+veWl966ReR89
+PhHCy/OksEC2JGYe4K21
+=YSfJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..5f79238d19a3
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch
@@ -0,0 +1,77 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
+--- a/nsock/src/Makefile.in
++++ b/nsock/src/Makefile.in
+@@ -13,7 +13,7 @@
+ CCOPT = 
+ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ INCLS = -I../include
+ CFLAGS = @CFLAGS@ $(CCOPT)
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS)
+--- a/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -37,7 +37,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
+--- a/libnetutil/Makefile.in
++++ b/libnetutil/Makefile.in
+@@ -5,7 +5,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS)
+ DEFS = @DEFS@
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ AR = ar
+ RANLIB = @RANLIB@
+ 
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -52,7 +52,7 @@
+ LIBS = @LIBS@
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
+ RM = rm -f
+ STRIP = @STRIP@
+--- a/nbase/Makefile.in
++++ b/nbase/Makefile.in
+@@ -11,7 +11,7 @@
+ CCOPT = 
+ DEFS = @DEFS@
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++#DEFS += -D_FORTIFY_SOURCE=2
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
+ STATIC = 
+--- a/nmap-update/Makefile.in
++++ b/nmap-update/Makefile.in
+@@ -10,7 +10,7 @@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@ $(NBASELIB)
+-DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
++DEFS = @DEFS@
+ APR_LIBS = @APR_LIBS@
+ SVN_LIBS = @SVN_LIBS@
+
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index e72fe434072d..ff34d48df46e 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -9,6 +9,7 @@
 <flag name="ndiff">Install the ndiff utility</flag>
 <flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
 <flag name="nping">Install the nping utility</flag>
+<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 <flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-6.47-r1.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
index 600163ac9267..498d9a9164ae 100644
--- a/net-analyzer/nmap/nmap-6.47-r1.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v 1.13 2014/12/03 09:57:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v 1.14 2015/05/12 16:06:37 zerochaos Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ RDEPEND="
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
index ac0a854c9c4e..4a1f4e31b8e6 100644
--- a/net-analyzer/nmap/nmap-6.47-r2.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.1 2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.2 2015/05/12 16:06:37 zerochaos Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ RDEPEND="
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index f624fb91e2c5..5b6fe5f24f5f 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,32 +1,40 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.2 2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.3 2015/05/12 16:06:37 zerochaos Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 subversion toolchain-funcs
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P=${P/_beta/BETA}
 
 DESCRIPTION="A utility for network exploration or security auditing"
 HOMEPAGE="http://nmap.org/"
-ESVN_REPO_URI="https://svn.nmap.org/nmap"
-SRC_URI="
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.nmap.org/nmap"
+	SRC_URI="http://dev.gentoo.org/~jer/nmap-logo-64.png"
+	KEYWORDS=""
+else
+	SRC_URI="
+		http://nmap.org/dist/${MY_P}.tar.bz2
+		http://dev.gentoo.org/~jer/nmap-logo-64.png
+		"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
-IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
-	system-lua? ( lua )
+	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -43,7 +51,7 @@ RDEPEND="
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -67,7 +75,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-9999-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''
@@ -106,7 +114,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_with zenmap) \
-		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \