| 1 |
commit: ee08f602190ef809dda2cd38fc422b7611fe186a |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 29 08:12:29 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 08:12:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee08f602 |
| 7 |
|
| 8 |
net-analyzer/nmap: Detect EC support in dev-libs/openssl (bug #589658). |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
net-analyzer/nmap/files/nmap-7.25-EC.patch | 38 ++++++++++++++++++++++++++++++ |
| 13 |
net-analyzer/nmap/nmap-7.25_beta1.ebuild | 7 ++++-- |
| 14 |
net-analyzer/nmap/nmap-9999.ebuild | 7 ++++-- |
| 15 |
3 files changed, 48 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/nmap/files/nmap-7.25-EC.patch b/net-analyzer/nmap/files/nmap-7.25-EC.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..fff5679 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-analyzer/nmap/files/nmap-7.25-EC.patch |
| 22 |
@@ -0,0 +1,38 @@ |
| 23 |
+ - Check for EVP_PKEY_get1_EC_KEY |
| 24 |
+ - Comment out inappropriate AC_CONFIG_SUBDIRS |
| 25 |
+ |
| 26 |
+--- a/configure.ac |
| 27 |
++++ b/configure.ac |
| 28 |
+@@ -387,6 +387,12 @@ |
| 29 |
+ AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument]) ], |
| 30 |
+ [ -lcrypto ]) |
| 31 |
+ fi |
| 32 |
++ |
| 33 |
++ if test "$use_openssl" = "yes"; then |
| 34 |
++ AC_CHECK_LIB(crypto, EVP_PKEY_get1_EC_KEY, |
| 35 |
++ [AC_DEFINE(HAVE_EVP_PKEY_EC, 1, [Have EVP_PKEY_get1_EC_KEY])], |
| 36 |
++ [AC_MSG_WARN([Disabling support for EC crypto])]) |
| 37 |
++ fi |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
+ OPENSSL_LIBS= |
| 41 |
+@@ -516,7 +522,7 @@ |
| 42 |
+ |
| 43 |
+ # If we still don't have it, we use our own |
| 44 |
+ if test $have_pcre != yes ; then |
| 45 |
+- AC_CONFIG_SUBDIRS( libpcre ) |
| 46 |
++# AC_CONFIG_SUBDIRS( libpcre ) |
| 47 |
+ CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" |
| 48 |
+ LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" |
| 49 |
+ PCRE_BUILD="build-pcre" |
| 50 |
+--- a/nse_ssl_cert.cc |
| 51 |
++++ b/nse_ssl_cert.cc |
| 52 |
+@@ -434,7 +434,7 @@ |
| 53 |
+ } |
| 54 |
+ |
| 55 |
+ int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) { |
| 56 |
+-#ifdef EVP_PKEY_EC |
| 57 |
++#ifdef HAVE_EVP_PKEY_EC |
| 58 |
+ EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(pubkey); |
| 59 |
+ const EC_GROUP *group = EC_KEY_get0_group(ec_key); |
| 60 |
+ int nid; |
| 61 |
|
| 62 |
diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild |
| 63 |
index ff216a8..2005f65 100644 |
| 64 |
--- a/net-analyzer/nmap/nmap-7.25_beta1.ebuild |
| 65 |
+++ b/net-analyzer/nmap/nmap-7.25_beta1.ebuild |
| 66 |
@@ -6,7 +6,7 @@ EAPI=5 |
| 67 |
|
| 68 |
PYTHON_COMPAT=( python2_7 ) |
| 69 |
PYTHON_REQ_USE="sqlite,xml" |
| 70 |
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs |
| 71 |
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs |
| 72 |
|
| 73 |
MY_P=${P/_beta/BETA} |
| 74 |
|
| 75 |
@@ -74,7 +74,8 @@ src_prepare() { |
| 76 |
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \ |
| 77 |
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \ |
| 78 |
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ |
| 79 |
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch |
| 80 |
+ "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \ |
| 81 |
+ "${FILESDIR}"/${PN}-7.25-EC.patch |
| 82 |
|
| 83 |
if use nls; then |
| 84 |
local lingua='' |
| 85 |
@@ -109,6 +110,8 @@ src_prepare() { |
| 86 |
zenmap/install_scripts/unix/zenmap.desktop || die |
| 87 |
|
| 88 |
epatch_user |
| 89 |
+ |
| 90 |
+ eautoreconf |
| 91 |
} |
| 92 |
|
| 93 |
src_configure() { |
| 94 |
|
| 95 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
| 96 |
index 40c25d6..83ebe88 100644 |
| 97 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 98 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
| 99 |
@@ -6,7 +6,7 @@ EAPI=5 |
| 100 |
|
| 101 |
PYTHON_COMPAT=( python2_7 ) |
| 102 |
PYTHON_REQ_USE="sqlite,xml" |
| 103 |
-inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user |
| 104 |
+inherit autotools eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user |
| 105 |
|
| 106 |
MY_P=${P/_beta/BETA} |
| 107 |
|
| 108 |
@@ -67,7 +67,8 @@ src_prepare() { |
| 109 |
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ |
| 110 |
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \ |
| 111 |
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \ |
| 112 |
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch |
| 113 |
+ "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \ |
| 114 |
+ "${FILESDIR}"/${PN}-7.25-EC.patch |
| 115 |
|
| 116 |
if use nls; then |
| 117 |
local lingua='' |
| 118 |
@@ -97,6 +98,8 @@ src_prepare() { |
| 119 |
zenmap/install_scripts/unix/zenmap.desktop || die |
| 120 |
|
| 121 |
epatch_user |
| 122 |
+ |
| 123 |
+ eautoreconf |
| 124 |
} |
| 125 |
|
| 126 |
src_configure() { |
Archives