| 1 |
commit: 99e1f61d11b69b9917932542a65fe3948b4a4e25 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 11 10:00:52 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 11 10:06:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e1f61d |
| 7 |
|
| 8 |
net-analyzer/nmap: SUBDIRS: Use a patch instead of a sed script |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
.../nmap/files/nmap-7.80-ac-config-subdirs.patch | 26 ++++++++++++++++++++++ |
| 14 |
net-analyzer/nmap/nmap-7.80.ebuild | 6 +---- |
| 15 |
net-analyzer/nmap/nmap-9999.ebuild | 6 +---- |
| 16 |
3 files changed, 28 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..583f7f1d1aa |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch |
| 23 |
@@ -0,0 +1,26 @@ |
| 24 |
+--- a/configure.ac |
| 25 |
++++ b/configure.ac |
| 26 |
+@@ -468,7 +468,6 @@ |
| 27 |
+ fi |
| 28 |
+ |
| 29 |
+ if test $have_libpcap != yes; then |
| 30 |
+- AC_CONFIG_SUBDIRS(libpcap) |
| 31 |
+ if test "${LIBPCAP_INC+set}" = "set"; then |
| 32 |
+ CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" |
| 33 |
+ else |
| 34 |
+@@ -611,7 +610,6 @@ |
| 35 |
+ fi |
| 36 |
+ |
| 37 |
+ if test $have_libz != yes; then |
| 38 |
+- AC_CONFIG_SUBDIRS(libz) |
| 39 |
+ # TODO: This doesn't work because libssh2's configure script is looking for |
| 40 |
+ # already-built libs. Giving up for now: build libz first or install |
| 41 |
+ # headers/libs on your own if you want compression support for SSH. |
| 42 |
+@@ -697,7 +695,6 @@ |
| 43 |
+ # If we still don't have it, we use our own |
| 44 |
+ if test $have_libssh2 != yes; then |
| 45 |
+ have_libssh2=yes |
| 46 |
+- AC_CONFIG_SUBDIRS(libssh2) |
| 47 |
+ CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS" |
| 48 |
+ LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a" |
| 49 |
+ LIBSSH2_BUILD="build-libssh2" |
| 50 |
|
| 51 |
diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild |
| 52 |
index cf94423c0af..b3ddc62aa35 100644 |
| 53 |
--- a/net-analyzer/nmap/nmap-7.80.ebuild |
| 54 |
+++ b/net-analyzer/nmap/nmap-7.80.ebuild |
| 55 |
@@ -67,6 +67,7 @@ PATCHES=( |
| 56 |
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch |
| 57 |
"${FILESDIR}"/${PN}-7.25-libpcre.patch |
| 58 |
"${FILESDIR}"/${PN}-7.31-libnl.patch |
| 59 |
+ "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch |
| 60 |
) |
| 61 |
S="${WORKDIR}/${MY_P}" |
| 62 |
|
| 63 |
@@ -108,11 +109,6 @@ src_prepare() { |
| 64 |
zenmap/install_scripts/unix/zenmap-root.desktop \ |
| 65 |
zenmap/install_scripts/unix/zenmap.desktop || die |
| 66 |
|
| 67 |
- sed -i \ |
| 68 |
- -e '/AC_CONFIG_SUBDIRS(libz)/d' \ |
| 69 |
- -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ |
| 70 |
- configure.ac |
| 71 |
- |
| 72 |
cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die |
| 73 |
|
| 74 |
eautoreconf |
| 75 |
|
| 76 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
| 77 |
index 6b625c9459b..4c5cd498f49 100644 |
| 78 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 79 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
| 80 |
@@ -65,6 +65,7 @@ PATCHES=( |
| 81 |
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch |
| 82 |
"${FILESDIR}"/${PN}-7.25-libpcre.patch |
| 83 |
"${FILESDIR}"/${PN}-7.31-libnl.patch |
| 84 |
+ "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch |
| 85 |
) |
| 86 |
S="${WORKDIR}/${MY_P}" |
| 87 |
|
| 88 |
@@ -106,11 +107,6 @@ src_prepare() { |
| 89 |
zenmap/install_scripts/unix/zenmap-root.desktop \ |
| 90 |
zenmap/install_scripts/unix/zenmap.desktop || die |
| 91 |
|
| 92 |
- sed -i \ |
| 93 |
- -e '/AC_CONFIG_SUBDIRS(libz)/d' \ |
| 94 |
- -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ |
| 95 |
- configure.ac |
| 96 |
- |
| 97 |
cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die |
| 98 |
|
| 99 |
eautoreconf |
Archives