| 1 |
commit: 86a62d35647397b546ec9340da8e454f204aad83 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 14:08:42 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 14:08:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a62d35 |
| 7 |
|
| 8 |
net-analyzer/nmap: apply workaround not to destroy a fix for Darwin, bug #604432 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28-prefix |
| 11 |
|
| 12 |
net-analyzer/nmap/nmap-7.40.ebuild | 7 ++++++- |
| 13 |
net-analyzer/nmap/nmap-9999.ebuild | 7 ++++++- |
| 14 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild |
| 17 |
index 1fe61b5..28b7751 100644 |
| 18 |
--- a/net-analyzer/nmap/nmap-7.40.ebuild |
| 19 |
+++ b/net-analyzer/nmap/nmap-7.40.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2016 Gentoo Foundation |
| 22 |
+# Copyright 1999-2017 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
@@ -111,7 +111,12 @@ src_prepare() { |
| 27 |
|
| 28 |
epatch_user |
| 29 |
|
| 30 |
+ cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die |
| 31 |
eautoreconf |
| 32 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 33 |
+ # we need the original for a Darwin-specific fix, bug #604432 |
| 34 |
+ mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die |
| 35 |
+ fi |
| 36 |
} |
| 37 |
|
| 38 |
src_configure() { |
| 39 |
|
| 40 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
| 41 |
index 7ed59bd..b7315c6 100644 |
| 42 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 43 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 1999-2016 Gentoo Foundation |
| 46 |
+# Copyright 1999-2017 Gentoo Foundation |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
# $Id$ |
| 49 |
|
| 50 |
@@ -99,7 +99,12 @@ src_prepare() { |
| 51 |
|
| 52 |
epatch_user |
| 53 |
|
| 54 |
+ cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die |
| 55 |
eautoreconf |
| 56 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 57 |
+ # we need the original for a Darwin-specific fix, bug #604432 |
| 58 |
+ mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die |
| 59 |
+ fi |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
Archives