Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 239 insertions, 5 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 3699860b0d04..a5093e8e6e0c 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.345 2015/05/15 04:36:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.346 2015/06/14 10:23:27 jer Exp $
+
+*nmap-6.49_beta1 (14 Jun 2015)
+
+  14 Jun 2015; Jeroen Roovers <jer@gentoo.org> +nmap-6.49_beta1.ebuild,
+  +files/nmap-6.49-no-FORTIFY_SOURCE.patch:
+  Version bump.
 
   15 May 2015; Jeroen Roovers <jer@gentoo.org> nmap-9999.ebuild:
   Unset one variable (bug #549470).
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ccf109deeefa..e716a527d130 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -10,19 +10,22 @@ AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a564680367
 AUX nmap-6.47-ncat-lua.patch 366 SHA256 9706268519d8cecb6841372ecd06ce502a97bf9b845621e36c422c06d1561f6d SHA512 1dbd37766bb81fa0fb956ce779c3b53f7bd8b606be93f8041905df5f50f3bfb1cde791627513ca0e8f9fc897503e6704ae3e168fa30b20f884a9164bd3c1f039 WHIRLPOOL 67b37530493e2848c25fa9b5ffeac1a5456f40ce07770152990de73275db0d8939f3e6ee1a1c6e8710b2742b4e005cd8fa8c43a8b675c3e1ba4e90e46b7b052c
 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-6.49-no-FORTIFY_SOURCE.patch 2216 SHA256 5014da132f83fd10a20632f179ac2e6e46db5e4ca88b4fbf694f6c2c2fd4236d SHA512 b9e00bbc768ef82559cb9f625730250b6bc2e81192798e8057492173515c578d9ba401819e475e1e25355af8b7da3e06d7ec88ec9ed20f09ef44e39673a998d3 WHIRLPOOL d6701e3cc1289fdfcab7d270b02628f2a78133630b05b22c9f71000b444c34652f04c13fa83bc224bd07dc809d1f21f976277c9f14aeb3991bbde5d1096aeb79
 AUX nmap-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-6.49BETA1.tar.bz2 8780444 SHA256 75f95034f95bd461f2e27cedfafe8f665ce7b462bff3e593dd8dca3d272f3ac2 SHA512 e23829ecda78904a65ac7ea641d5d8f7060cc5ab94c62468dbd9d5a888e2a3953b35ee8dab0e2f873db0f0b9f0ee4d3fd27d0db4072586ed59ad500ba490e916 WHIRLPOOL 2cc877990b6297e01d2f5de6b99147d74e1b7fbf2d6288059f9f1dd3c2f5de02bf17bdd4cff744905e93aaf8a1f7a9db4bca110eee5a538047e7f7738d96b948
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.47-r1.ebuild 3809 SHA256 a9a78190eebae3828e9cc31ceb4b0196faffa0d0cbc7e04efc15bc72543f057c SHA512 8778111789f3f9e4b40006537b53e95fd7079f71322c2b316f63dddcbec817cf98f8b9f898424670727851c65ee1391c9bb10ae6b457d45e7b335c4ba22cdbb4 WHIRLPOOL c4d7ad5511c57a964961f4f1593ccf27700e2a0dca52c75dd6284a16cf9f08efdff1cc0335fd1676f3f69c37369dba6e4bda762782131ac0f25286b1141ca278
 EBUILD nmap-6.47-r2.ebuild 3819 SHA256 f2b33a52f7c779d5023a0a75861b28614c49dd8af80a1b2cf2ab99dc2c1728f5 SHA512 3f0c3ce15c246365ddb277273fc0d6ad13222381eb60211ebc47e7d451dc521c91134ed3b55788310f952029534ffa2ef3258746c5cad4a9b012b621c86a95f5 WHIRLPOOL 7f04a76c6852e649b84cecf5825ffd3b2df2c7ff78974475af235a325b3fa9d10d6c42d73c13f0d4a30aa15af3b9b3f8f4baba7b35a8ccb03c222452e97fcfad
 EBUILD nmap-6.47-r3.ebuild 3863 SHA256 21c4da76ad475c960bf6562368a7c8a7b0433c260d64dffedc6095cb9073ac71 SHA512 a46419b019625530cca3c3a44c5bb16c48631815381ee305c0b44c1129a322beb5444925067aa6349e17f1930d38a78c515d31b4afe943adf871d2bd6e7df14b WHIRLPOOL 5cd61fd28bd038d419296a16126581816cde4da13b7a41e37af9bd6e27ee8018a44a8146ee9a1371b9f779fa2a3f6d6b31d89529be1fbfda733f824ebe760ee1
+EBUILD nmap-6.49_beta1.ebuild 3866 SHA256 06e20d8740819388d1077ea44d017e1ecbd37e4b993fc0b19b4d2f5c3abcdaec SHA512 01c6aaa2dcb9874fb9943e38253acc4679affc993874924f3fd87a7efb41026aabaaa79a28ef0ce287d8d2ef2b7e3040589904775132d2605a1e62ee9dbae280 WHIRLPOOL d38142c82a30741ddb394cf05fee19ff13147e2c3918ae751c3de026611675077f44c51fc2bc04548bd772c756f02d8e8bcbe954521bd6fcbd71cc165d980114
 EBUILD nmap-9999.ebuild 3983 SHA256 176e128178a660a081dd232d69c385125a155839798a43eb594b2a7321baacdf SHA512 de4a2ff17ea05b9816dc05c11fa5319d0f627cb9a28aeb5b83622fb4d23f049458bcdcc23944d58bca40533edb1bc2e289870d466f32dbb083c13c7bda2039b6 WHIRLPOOL 876e7551f93c31724f7cda9ad292ea15ef6d0a1d28f3feb851124f8aa4e406251e878b3183fec033c3693bea85c2ed6bd1311f2078b3f844c1aa7d0bb0ad0268
-MISC ChangeLog 43459 SHA256 18d7ad72381132b1c39ce89dc1491221824c30984790d03aea99f69bcedfea01 SHA512 f5e00e4bbc7e2ac935674c014e7623d2922f45de40429af1211847a95c800f3a4cf3e5948bcf8a9171f5a511432ec2cf52d1ecf3bf6f1ca78ff475e8e43b3fc7 WHIRLPOOL 10180941a5fae5445220a7b73be7eef1b4aea054c6dc58b611ea67fd51519c7851a68a930ea42533cb8d60d9ed35f09b6d9b4821a93cefdb6653053fc45b91d7
+MISC ChangeLog 43624 SHA256 48f536ccdaa1eb5e34d1a9af804f238104c961390530f8c6d6c5e3fc6cad7a8e SHA512 8adcdec4cacb8e3e6756a70449eed1a8ad4c222df0086edaa8b393330ec88e41f1b6cd94c4461da37c0c6e7ecb6db10dc60b4b9ccee7d20bc3566c4e05bf3095 WHIRLPOOL d555f9fdb46e998bdf58a7518d8242cd9a8e05661b4848a73905e56b9cdbe57b751031b136e7a1134629b0fa97b49ba6958ded4cfac39b439246a5eb481d1df8
 MISC metadata.xml 774 SHA256 761bbc48753242190632a8a9b0cb8cee34f3969d00f29f36a4a02154d63bfcec SHA512 6c4f041b3a22abd05e75280b762dbdb04ad47505495443fbd4594e176bd68c375e727f9326c761964cc2a41da3a7d54c1213893b529892d972ef83bbe962fa0f WHIRLPOOL f730883a5efb88e96fd7839d434a60ce6f4f5fb7ef2a6376bb65324d004682c1f4ea145eaa156efa36bcf402a2780a30372157a349966eafa82039509798535e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVVd7kACgkQVWmRsqeSphMKeACeNliVV4qecFDTEjkSwopcSPQ5
-194An15I3u8qicIWIi+nQAYDvWpMwgxb
-=YSUI
+iEYEAREIAAYFAlV9ViAACgkQVWmRsqeSphNG8QCfQcEvr/KYH1wuFrWMFc+21US+
+0xUAn1VgqXHjYs7gt1RdpamumtBlYl6U
+=GavB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..383975493be9
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch
@@ -0,0 +1,71 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,7 +41,6 @@
+ # 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
+ # 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,6 @@
+ CCOPT = 
+ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
+ INCLS = -I../include
+ CFLAGS = @CFLAGS@ $(CCOPT)
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS)
+--- a/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -38,7 +38,6 @@
+ # 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
+ # 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,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS)
+ DEFS = @DEFS@
+-DEFS += -D_FORTIFY_SOURCE=2
+ AR = ar
+ RANLIB = @RANLIB@
+ 
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -53,7 +53,6 @@
+ LIBS = @LIBS@
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
+ # With GCC, add extra security checks to source code.
+-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
+@@ -12,7 +12,6 @@
+ CCOPT = 
+ DEFS = @DEFS@
+ # With GCC, add extra security checks to source code.
+-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
+@@ -11,7 +11,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/nmap-6.49_beta1.ebuild b/net-analyzer/nmap/nmap-6.49_beta1.ebuild
new file mode 100644
index 000000000000..e2e89840d194
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.49_beta1.ebuild
@@ -0,0 +1,154 @@
+# 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.49_beta1.ebuild,v 1.1 2015/06/14 10:23:27 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}