| 1 |
commit: 5178bbd6abf67512cf7dfc89193b69902b2051ed |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 05:16:51 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 05:16:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5178bbd6 |
| 7 |
|
| 8 |
net-analyzer/nmap: Fix live ebuild (maybe bug #592490). |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
net-analyzer/nmap/files/nmap-4.75-nolua.patch | 5 ++--- |
| 13 |
net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch | 11 +++++++++++ |
| 14 |
net-analyzer/nmap/files/nmap-7.25-libpcre.patch | 10 ++++++++++ |
| 15 |
net-analyzer/nmap/nmap-9999.ebuild | 4 ++-- |
| 16 |
4 files changed, 25 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch |
| 19 |
index 30bb1e0..21f0e1f 100644 |
| 20 |
--- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch |
| 21 |
+++ b/net-analyzer/nmap/files/nmap-4.75-nolua.patch |
| 22 |
@@ -1,6 +1,5 @@ |
| 23 |
-diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in |
| 24 |
---- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200 |
| 25 |
-+++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200 |
| 26 |
+--- a/Makefile.in |
| 27 |
++++ b/Makefile.in |
| 28 |
@@ -258,5 +258,5 @@ |
| 29 |
./config.status --recheck |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000..91caad1 |
| 35 |
--- /dev/null |
| 36 |
+++ b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch |
| 37 |
@@ -0,0 +1,11 @@ |
| 38 |
+--- a/Makefile.in |
| 39 |
++++ b/Makefile.in |
| 40 |
+@@ -477,7 +477,7 @@ |
| 41 |
+ ./docs/style/lua-format -i scripts/*.nse |
| 42 |
+ |
| 43 |
+ makefile.dep: |
| 44 |
+- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ |
| 45 |
++ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@ |
| 46 |
+ -include makefile.dep |
| 47 |
+ |
| 48 |
+ # These the old names of scripts that have been renamed or deleted. Any |
| 49 |
|
| 50 |
diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch |
| 51 |
new file mode 100644 |
| 52 |
index 00000000..9296dab |
| 53 |
--- /dev/null |
| 54 |
+++ b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch |
| 55 |
@@ -0,0 +1,10 @@ |
| 56 |
+--- a/configure.ac |
| 57 |
++++ b/configure.ac |
| 58 |
+@@ -522,7 +522,6 @@ |
| 59 |
+ |
| 60 |
+ # If we still don't have it, we use our own |
| 61 |
+ if test $have_pcre != yes ; then |
| 62 |
+- AC_CONFIG_SUBDIRS( libpcre ) |
| 63 |
+ CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" |
| 64 |
+ LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" |
| 65 |
+ PCRE_BUILD="build-pcre" |
| 66 |
|
| 67 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
| 68 |
index 83ebe88..ca472d6 100644 |
| 69 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 70 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
| 71 |
@@ -61,14 +61,14 @@ pkg_setup() { |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
epatch \ |
| 75 |
- "${FILESDIR}"/${PN}-4.75-nolua.patch \ |
| 76 |
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \ |
| 77 |
"${FILESDIR}"/${PN}-5.21-python.patch \ |
| 78 |
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ |
| 79 |
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \ |
| 80 |
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \ |
| 81 |
"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \ |
| 82 |
- "${FILESDIR}"/${PN}-7.25-EC.patch |
| 83 |
+ "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \ |
| 84 |
+ "${FILESDIR}"/${PN}-7.25-libpcre.patch |
| 85 |
|
| 86 |
if use nls; then |
| 87 |
local lingua='' |
Archives