diff options
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch | 66 |
2 files changed, 71 insertions, 1 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 89bf5fc099ae..7102ee3fa5d4 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.321 2014/11/18 14:18:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.322 2014/11/18 14:45:56 jer Exp $ + + 18 Nov 2014; Jeroen Roovers <jer@gentoo.org> + files/nmap-6.47-no-FORTIFY_SOURCE.patch: + Do not set FORTIFY_SOURCE anywhere else either. 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: 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 index b1c0d31bab73..d61ce2f7f2c0 100644 --- a/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch +++ b/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch @@ -9,3 +9,69 @@ # 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@ -D_FORTIFY_SOURCE=2 + + INSTALL = @INSTALL@ + STRIP = @STRIP@ |