summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-08-31 07:16:51 +0200
committerJeroen Roovers <jer@gentoo.org>2016-08-31 07:16:51 +0200
commit5178bbd6abf67512cf7dfc89193b69902b2051ed (patch)
tree511f47abdd1044568ef67802db4b8e01130693cd /net-analyzer/nmap/files
parentnet-libs/libtrace: Version bump. (diff)
downloadgentoo-5178bbd6abf67512cf7dfc89193b69902b2051ed.tar.gz
gentoo-5178bbd6abf67512cf7dfc89193b69902b2051ed.tar.bz2
gentoo-5178bbd6abf67512cf7dfc89193b69902b2051ed.zip
net-analyzer/nmap: Fix live ebuild (maybe bug #592490).
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-analyzer/nmap/files')
-rw-r--r--net-analyzer/nmap/files/nmap-4.75-nolua.patch5
-rw-r--r--net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch11
-rw-r--r--net-analyzer/nmap/files/nmap-7.25-libpcre.patch10
3 files changed, 23 insertions, 3 deletions
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
index 30bb1e0c866..21f0e1fa49d 100644
--- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch
+++ b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
@@ -1,6 +1,5 @@
-diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
---- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200
-+++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
@@ -258,5 +258,5 @@
./config.status --recheck
diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
new file mode 100644
index 00000000000..91caad1a673
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -477,7 +477,7 @@
+ ./docs/style/lua-format -i scripts/*.nse
+
+ makefile.dep:
+- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
++ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
+ -include makefile.dep
+
+ # These the old names of scripts that have been renamed or deleted. Any
diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
new file mode 100644
index 00000000000..9296dab7da7
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -522,7 +522,6 @@
+
+ # If we still don't have it, we use our own
+ if test $have_pcre != yes ; then
+- AC_CONFIG_SUBDIRS( libpcre )
+ CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
+ LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
+ PCRE_BUILD="build-pcre"