jer 14/11/18 14:18:54
Added: nmap-6.47-no-FORTIFY_SOURCE.patch
nmap-6.47-no-libnl.patch
Log:
Remove unneeded libnl linkage (bug #529244). Do not set FORTIFY_SOURCE.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.1 net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch?rev=1.1&content-type=text/plain
Index: nmap-6.47-no-FORTIFY_SOURCE.patch
===================================================================
--- 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
1.1 net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch?rev=1.1&content-type=text/plain
Index: nmap-6.47-no-libnl.patch
===================================================================
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=""