Remove unneeded libnl linkage (bug #529244). Do not set FORTIFY_SOURCE.

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

5 files changed, 97 insertions, 8 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 8b7b725f22b5..89bf5fc099ae 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.320 2014/11/18 12:47:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.321 2014/11/18 14:18:54 jer Exp $
+
+  18 Nov 2014; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r1.ebuild,
+  +files/nmap-6.47-no-FORTIFY_SOURCE.patch, +files/nmap-6.47-no-libnl.patch:
+  Remove unneeded libnl linkage (bug #529244). Do not set FORTIFY_SOURCE.
 
   18 Nov 2014; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r1.ebuild:
   Remove obsolete sed script.
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 19baf43c7ce9..559ca1a38fb7 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,6 +9,8 @@ AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc1
 AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef04e8294bf79a9712fa015fce2 SHA512 6bb15078e79ef281b026e25199fc76bcd1b7242da0d6513ac9b078f130e521e6db506c1c36d33ef72a2198c3054111d95d6ac0654f7d6bb7549d6308ce864291 WHIRLPOOL d6f29209ee4a92e2f5b564d5aeaa8814355df2a9142665ba1ce980693c830214a1d89dc66c3f0573237273d0fc502c7ff8b39be53f6afcca29dd94fe6f081b7b
 AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0ecd7f99711bb68424214c SHA512 837e8f95ea1dfa1176abd576894e71123e867181378812f783faf408b27746e20d69b60f049ef7d37e07a2764d696ea1b169c29867e62d34378d11ce9b9e25e1 WHIRLPOOL fc821d90705c03fdbc56a3618ee96e69ef9662f81dc013eeaa1ebd8d03a1f1936a957de5d62c3402cfebc0ed34fb5c84229e7c6048d6438ecab0481d7d465d17
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
+AUX nmap-6.47-no-FORTIFY_SOURCE.patch 461 SHA256 b853207ad70eea98afb2c7e46257c983d76e3dc9161037beb3656cd5548d56e0 SHA512 8312876cc65053a03abbd56334566498dd004ee16ffc632fb0acb4cd1051af213e7dce4eeebe65220a33268df57822c06492aad4c14ebd3b2467c620c1863bac WHIRLPOOL 64a6bf7f20369b5bc1cc140c285ad715b91419f483959e554b5f7f153f5ff1ad6b641f5ff6a8efdeea4e5ac5f2d9ab66e3e7397dece07507263e0cdceb3de80a
+AUX nmap-6.47-no-libnl.patch 1903 SHA256 5f9fa774374ee1c410123b0349d501d0aa265feffd3aeebd6f51aa6276d334fc SHA512 5e101915a4259502c88a2e8588e9d7b77464ce5129f78c5458265e0ce0dd13adc514f4df853ade6c8502c906c96a47954e1a432e1177a5d8acbbb444574e4083 WHIRLPOOL c74013ec6878c57fd726f6a8668d92abdc502521e27140ab37fa22fd3debd17138149c246798ac600fb01ebd4d4a3fd3834f2c806f15e4318c933c81a85bc8ba
 DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
@@ -16,13 +18,13 @@ DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b
 EBUILD nmap-6.01.ebuild 2644 SHA256 a2e907c693677dcc8a477898731770103682529c93594fd2df7723420ab6a58b SHA512 541cdb4c5c62b5dd20f35f216d703e31f2f9a8d354f4532fb95f429aad527fa9ca3ba86d2d8a72968c3ea4229254325cd85cc55d70a067bcff6752b1dc54ad31 WHIRLPOOL d6a183fca1074ff2c905e17145317524d82dd6028ae843602ec7bd81abbff1e973533e36a278d50ab063a21804da1c019dd59af032054f884a013d5f058f4394
 EBUILD nmap-6.25-r1.ebuild 3609 SHA256 d9478ec7ed6758121432cf11b3fe1ba5643fa71ffb8aa883c98c80cb7f73368a SHA512 9a426d8c1d875819cb332254a27fc3a2be317aedeb4c7f9f3680001a7a36f119119f6dcdf96f5b9f133bd31d06b3cfb6ff9b8dddc58aea607241d4630847099c WHIRLPOOL 5167df00f1f79b4c01c896a11269c3b361e42338159839bc6b24dd69f361c50c98d059118d36f051b579601b3fb9f3366042aa4e00f09615e0e20020ea79a0ef
 EBUILD nmap-6.25.ebuild 3479 SHA256 3fc8097d4dcac997838289fd0df88ccb21f084b7b276dfe28f7392ec60cb583c SHA512 d4ee4d0b830ce2667e87c9ffda50a23bc59f6fe7ffe623453555f76b29ac21ae001bdb00dd04ec25e485002c37f953a5f14af11c932675d89f2b49a3f0aa7897 WHIRLPOOL f4faf39d4a2922c776be592971c4f421aada9c93e54f64923397ce29363f14ba458f57dc2662720caed7d63ad796b64a74d5b46545ad4af6191d1c5580a9b151
-EBUILD nmap-6.47-r1.ebuild 3704 SHA256 6f4420a89c15b23e884b96342da195ff1dcc8eaa6224b7879170772378a36fbb SHA512 58a9bcfd7bba15eb0deb8fb01c994172b463d7ed6433194df8ceeab2776bbcd852a623443412213d74de06405149cb98fca30f79a10d26f8b190316e921c0509 WHIRLPOOL bea8344e5f39058549bc61d6ab69ceec5f2e9dcd2e1841e028cfac8b4a5963dde8be5e199e1708e8e48d463c89a011ab7c8af7307797eab1443689f88137eb51
-MISC ChangeLog 39867 SHA256 bc881a06227a3cae9627568230ab302c16b3da368419b8cca2cdff821f306efb SHA512 b235829b68732ccf2135ed1f32ff35d6d610da5dc263ec127ce261d0e4e7cef30dc2c0452b3e6d8627f01fb659e54e5eaf74b78c37441952abdd1bf212142900 WHIRLPOOL 36de8c3f9cbf98b72d5912e43dd17ef9dbf295c8d546207402c3e10115f5accc80d99ca1a4492f438607635312b799dce4372a88812031b48892bec103ff1b4d
+EBUILD nmap-6.47-r1.ebuild 3801 SHA256 3ea9c401b90d4f0866853a50f654c59147c671ff913a122b210f8dac8b027085 SHA512 1916e8e1638197580025d0f79bbd8ccc054c49eb86d3836d1e53e31cbadc59298cc38508fae6cd314b7461dfbeae1d0f47aa1be537c73c9938b6893f30ed7659 WHIRLPOOL 35d5027bbd4b1ef1bfa28f8d1ae9127b932a7568f65d6d7bb7f8f773447bbbf1d4303c582c7fd5cdc43c70578cecaa2d98e2797161405ba9e4a6f1636f74b70f
+MISC ChangeLog 40087 SHA256 73f71ff8c743eadb24f7401634d9fd4e08d8d86031901da241330bedbdd8ea48 SHA512 573cff897ba13e279ebe091e688d0fa87d8942acefe390bdfcb090530de5a69a084aaa02015ae295390098fab5bee9c52937fc89c9f98307c5367303e2af3f56 WHIRLPOOL 532247f2fb8167942561af049f8cb7a1e5dcae5e7619c5cc723e07ed25f28a85e1b0647055aad293d68706efa7bf4ccc47342fca6b38a5e7f1d894881b26097d
 MISC metadata.xml 696 SHA256 9daf0485d01dd301ebd817d5431d8f4ae482aef6ebc680b9dfc02295b7a7381e SHA512 846e5a5aa81b33305046935bda0e15cf5ee388b15801314890120e8d0027672986af311be6e60d0a9060770b752fbf4fff1ad9ca30b3d0ab9b4426ae82cc4f9e WHIRLPOOL a7c66004f3ad9494739d8436765e6bcc1fa99c3bb9108fc624ed90c362aedb5363974adef686d1fbf240cf1969744cad27f0c069258a22c547b8e47e1052db23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRrP9QACgkQVWmRsqeSphNiqgCfeuPLNc0xTgeYNeROM/AfJKb6
-1/MAn1FHeAZI8jC98MctDVg0Tq5H2GCR
-=e3Je
+iEYEAREIAAYFAlRrVVAACgkQVWmRsqeSphMaywCfWl/H/y1EUq8Sh1IV+UiccEzV
+BOIAmgMghYY8pMim3/eEubXgXxcb++lY
+=1KrC
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..b1c0d31bab73
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch b/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
new file mode 100644
index 000000000000..0e0c6b70beff
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
@@ -0,0 +1,70 @@
+nping does not call anything nl_* related so it should not link against libnl (bug #529244)
+Patching configure.ac would be best but eautoreconf does not handle the subdirs very well.
+
+--- a/nping/configure
++++ b/nping/configure
+@@ -4865,64 +4865,6 @@
+ fi
+ 
+ 
+-# libpcap can require libnl
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_handle_alloc" >&5
+-$as_echo_n "checking for library containing nl_handle_alloc... " >&6; }
+-if ${ac_cv_search_nl_handle_alloc+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char nl_handle_alloc ();
+-int
+-main ()
+-{
+-return nl_handle_alloc ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' nl; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_nl_handle_alloc=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_nl_handle_alloc+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_nl_handle_alloc+:} false; then :
+-
+-else
+-  ac_cv_search_nl_handle_alloc=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nl_handle_alloc" >&5
+-$as_echo "$ac_cv_search_nl_handle_alloc" >&6; }
+-ac_res=$ac_cv_search_nl_handle_alloc
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-
+ # We test whether they specified openssl desires explicitly
+ use_openssl="yes"
+ specialssldir=""
diff --git a/net-analyzer/nmap/nmap-6.47-r1.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
index 1aa275b5f33f..78c51d2e9658 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
 # 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.5 2014/11/18 12:47:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v 1.6 2014/11/18 14:18:54 jer Exp $
 
 EAPI=5
 
@@ -70,7 +70,9 @@ src_prepare() {
 		"${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.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''