Remove version based condition around einfo. Simplify filecaps message (and make it shell implementation independent). Rename patch (9999 is not a version).

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

5 files changed, 216 insertions, 26 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 538593972c72..44d329709bf2 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,15 @@
 # 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.340 2015/05/13 05:12:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.341 2015/05/13 05:40:33 jer Exp $
+
+*nmap-6.47-r3 (13 May 2015)
+
+  13 May 2015; Jeroen Roovers <jer@gentoo.org> +nmap-6.47-r3.ebuild,
+  nmap-9999.ebuild, -files/nmap-9999-no-FORTIFY_SOURCE.patch,
+  +files/nmap-no-FORTIFY_SOURCE.patch:
+  Remove version based condition around einfo. Simplify filecaps message (and
+  make it shell implementation independent). Rename patch (9999 is not a
+  version).
 
   13 May 2015; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r1.ebuild,
   nmap-6.47-r2.ebuild, nmap-9999.ebuild:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fefc8c47a159..aa0ee80712bd 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,18 +9,19 @@ 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
+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-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-9999.ebuild 5044 SHA256 5527e60e8bf862d4c18f504c723ad23d8fd2de84b7612b1dd53b323f7af4702e SHA512 16614309cc70c30d81f495f1cb1291508b70d4f063b66985c645e5305417a8d559a0a50566f7ae2d28e33dd16a125f239b50ec938db7c9c52a4d187b79575f45 WHIRLPOOL 2d3f688f1198556bda6245d3f739e066e77772a9d532a222eed5644b6d07393102130960e129a1f30b5b95571eda6675b356132f07fc0e956cb44904ee7e4f9b
-MISC ChangeLog 42506 SHA256 c93d26208aad94948585778d90b6d1c8c7f86aec7d0293f3bbcc78c34c7e3eec SHA512 01ee42ca6decb2e072dd0e41f051459b6f990c9573f16a9b3696b76c3ee179aa341bfc85fa16ce17e5b473aaeb889ab1ae9e28e779f2573c72013e72c4b1ec98 WHIRLPOOL e582eba0b067349510170556d9ec804d6127d9d1f886192ac6798595b40cefa2d816eeab619ccc8be56e82abb10128b41072afe3a71e551550c8a5c0b5e8fe6c
+EBUILD nmap-6.47-r3.ebuild 4665 SHA256 d0084987669a9d364c8286ddae5340be75343bf08e27f477d3848f5ff1db070f SHA512 076076782b0ef6f36dcd9718a4c866a593d37ba52965c79232a84cbbff4ff97614c88efb982c9176fa49471d486976ec52d3717cc2af8ef066a0cb4a2208a3c3 WHIRLPOOL 54a55453165035ed57392b5f40eb3b853cb83f8d78d039dad3e9f1773d054550208e756f1385048216de35b2a341b873e4f524954cddfb53e64470b0b9a42fdc
+EBUILD nmap-9999.ebuild 4713 SHA256 e63064d8eddcf2aa8d2258762e292681a9a4a1b98aa4fe2447b4cdacc61473d6 SHA512 fc1ce790a997ca1e111a2e27c20e89962dd32724063dd9d2b7428930aeeb1aa9fdc2b490687f803f2b08bf16e71e25880565ee844854ec001aa560bac9ffa389 WHIRLPOOL 06b40911e983d0a9c82b9df1456f49b5baa71c8bc2f70e503ecb38cebb8e13fd9ceccdf451afc030d55585d9bbc0be2cc01fa941c969cb90d7d933be0b225b37
+MISC ChangeLog 42869 SHA256 019c9cc409b2a0ab08626f4ddeb75e6b22f7fba52ae2b13bee22481b630497a1 SHA512 c8ca12bb204810238ed24428433315c43e5f34401be2e891c6b5f815e9c83c2c6f74867b6eb022319a0ccd00401c2eaec2857a28a9ed2e592b6aaa39ba640854 WHIRLPOOL 5832a72993e0573d4c600cee06315503bca7d4fbaa30560fd81dd50c92587c012858c7df7561476d298323aaeebe4a4e55a12a1ccfafc90496231886af4ea38c
 MISC metadata.xml 774 SHA256 761bbc48753242190632a8a9b0cb8cee34f3969d00f29f36a4a02154d63bfcec SHA512 6c4f041b3a22abd05e75280b762dbdb04ad47505495443fbd4594e176bd68c375e727f9326c761964cc2a41da3a7d54c1213893b529892d972ef83bbe962fa0f WHIRLPOOL f730883a5efb88e96fd7839d434a60ce6f4f5fb7ef2a6376bb65324d004682c1f4ea145eaa156efa36bcf402a2780a30372157a349966eafa82039509798535e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVS3SwACgkQVWmRsqeSphNgfQCbBGL18R35n8xFn5kwF6W44NqX
-e7wAniuVsjKkVQ0XUhA/4ieg0aEmwpfC
-=TwGv
+iEYEAREIAAYFAlVS49QACgkQVWmRsqeSphNW3ACfctfHPBHAAikbrxBGkkQNz5r5
+f/sAn1LTBIekoMFA2JGlupi3T8DyXXeF
+=IW3U
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch
index 5f79238d19a3..5f79238d19a3 100644
--- a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch
+++ b/net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch
diff --git a/net-analyzer/nmap/nmap-6.47-r3.ebuild b/net-analyzer/nmap/nmap-6.47-r3.ebuild
new file mode 100644
index 000000000000..6374f8c1a13e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.47-r3.ebuild
@@ -0,0 +1,183 @@
+# 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-r3.ebuild,v 1.1 2015/05/13 05:40:33 jer Exp $
+
+EAPI=5
+
+DISABLE_AUTOFORMATTING=true
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+
+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"
+	#FORCE_PRINT_ELOG="true"
+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"
+
+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}"
+
+DOC_CONTENTS="
+To run nmap as unprivileged user you:
+ - add yourself to the nmap group
+ - pass --privileged on the command line or set the NMAP_PRIVILEGED variable in your environment.
+"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+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
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	# Add group for users allowed to run nmap.
+	enewgroup nmap
+
+	fcaps -o 0 -g nmap -m 4755 -M 0755 \
+		cap_net_raw,cap_net_admin,cap_net_bind_service+eip \
+		"${EROOT}"/usr/bin/nmap
+
+	einfo "To run nmap as unprivileged user you:"
+	einfo " - add yourself to the nmap group"
+	einfo " - pass --privileged on the command line or set the"
+	einfo "   NMAP_PRIVILEGED variable in your environment."
+
+	if [[ ${REPLACING_VERSIONS} < 6.48 ]]; then
+		FORCE_PRINT_ELOG="true"
+	fi
+	readme.gentoo_print_elog
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 5c9215aee80c..01aaf32d49ee 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,9 +1,10 @@
 # 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.8 2015/05/13 05:12:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.9 2015/05/13 05:40:33 jer Exp $
 
 EAPI=5
 
+DISABLE_AUTOFORMATTING=true
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
 inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user
@@ -17,7 +18,6 @@ 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=""
 	#FORCE_PRINT_ELOG="true"
 else
 	SRC_URI="
@@ -61,11 +61,11 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-DOC_CONTENTS="To run nmap as normal user you have to add yourself to the \
-nmap group AND pass --privileged on the command line. This security \
-measure ensures that only trusted users are allowed to run nmap. \
-To avoid passing --privileged every time, add \
-'export NMAP_PRIVILEGED=\"\"' to your user environment (eg ~/.bashrc)."
+DOC_CONTENTS="
+To run nmap as unprivileged user you:
+ - add yourself to the nmap group
+ - pass --privileged on the command line or set the NMAP_PRIVILEGED variable in your environment.
+"
 
 pkg_setup() {
 	if use ndiff || use zenmap; then
@@ -82,7 +82,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}-9999-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''
@@ -172,16 +172,13 @@ pkg_postinst() {
 		cap_net_raw,cap_net_admin,cap_net_bind_service+eip \
 		"${EROOT}"/usr/bin/nmap
 
-	if [[ ${PV} == "9999" ]] ; then
-		einfo "To run nmap as normal user you have to add yourself to the nmap group"
-		einfo "AND pass --privileged on the command line. This security measure"
-		einfo "ensures that only trusted users are allowed to run nmap. To avoid"
-		einfo "passing --privileged every time, add 'export NMAP_PRIVILEGED=\"\"' to"
-		einfo "your user environment (eg ~/.bashrc)."
-	else
-		if [[ ${REPLACING_VERSIONS} < 6.48 ]]; then
-			FORCE_PRINT_ELOG="true"
-		fi
-		readme.gentoo_print_elog
+	einfo "To run nmap as unprivileged user you:"
+	einfo " - add yourself to the nmap group"
+	einfo " - pass --privileged on the command line or set the"
+	einfo "   NMAP_PRIVILEGED variable in your environment."
+
+	if [[ ${REPLACING_VERSIONS} < 6.48 ]]; then
+		FORCE_PRINT_ELOG="true"
 	fi
+	readme.gentoo_print_elog
 }