diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2016-08-31 07:16:51 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2016-08-31 07:16:51 +0200 |
| commit | 5178bbd6abf67512cf7dfc89193b69902b2051ed (patch) | |
| tree | 511f47abdd1044568ef67802db4b8e01130693cd /net-analyzer/nmap | |
| parent | net-libs/libtrace: Version bump. (diff) | |
| download | gentoo-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')
| -rw-r--r-- | net-analyzer/nmap/files/nmap-4.75-nolua.patch | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/nmap/files/nmap-7.25-libpcre.patch | 10 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-9999.ebuild | 4 |
4 files changed, 25 insertions, 5 deletions
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch index 30bb1e0c8669..21f0e1fa49dd 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 000000000000..91caad1a6734 --- /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 000000000000..9296dab7da7b --- /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" diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 83ebe8850a47..ca472d603cc1 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -61,14 +61,14 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-4.75-nolua.patch \ "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ "${FILESDIR}"/${PN}-5.21-python.patch \ "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ "${FILESDIR}"/${PN}-6.46-uninstaller.patch \ "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \ - "${FILESDIR}"/${PN}-7.25-EC.patch + "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \ + "${FILESDIR}"/${PN}-7.25-libpcre.patch if use nls; then local lingua='' |