gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

net-analyzer/nmap: Detect EC support in dev-libs/openssl (bug #589658).

Browse Source 
Package-Manager: portage-2.3.0
This commit is contained in:
Jeroen Roovers
2016-07-29 10:12:29 +02:00
parent 15ae65710c
commit ee08f60219
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
net-analyzer/nmap/files/nmap-7.25-EC.patch Normal file
View File

@@ -0,0 +1,38 @@
- Check for EVP_PKEY_get1_EC_KEY
- Comment out inappropriate AC_CONFIG_SUBDIRS
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,12 @@
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]) ],
[ -lcrypto ])
fi
+
+ if test "$use_openssl" = "yes"; then
+ AC_CHECK_LIB(crypto, EVP_PKEY_get1_EC_KEY,
+ [AC_DEFINE(HAVE_EVP_PKEY_EC, 1, [Have EVP_PKEY_get1_EC_KEY])],
+ [AC_MSG_WARN([Disabling support for EC crypto])])
+ fi
fi
OPENSSL_LIBS=
@@ -516,7 +522,7 @@
# If we still don't have it, we use our own
if test $have_pcre != yes ; then
- AC_CONFIG_SUBDIRS( libpcre )
+# AC_CONFIG_SUBDIRS( libpcre )
CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
PCRE_BUILD="build-pcre"
--- a/nse_ssl_cert.cc
+++ b/nse_ssl_cert.cc
@@ -434,7 +434,7 @@
}
int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
-#ifdef EVP_PKEY_EC
+#ifdef HAVE_EVP_PKEY_EC
EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(pubkey);
const EC_GROUP *group = EC_KEY_get0_group(ec_key);
int nid;

7
net-analyzer/nmap/nmap-7.25_beta1.ebuild
View File

@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
MY_P=${P/_beta/BETA}
@@ -74,7 +74,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
"${FILESDIR}"/${PN}-7.25-EC.patch
if use nls; then
local lingua=''
@@ -109,6 +110,8 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
eautoreconf
}
src_configure() {

7
net-analyzer/nmap/nmap-9999.ebuild
View File

@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
inherit autotools eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
MY_P=${P/_beta/BETA}
@@ -67,7 +67,8 @@ src_prepare() {
"${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-no-FORTIFY_SOURCE.patch \
"${FILESDIR}"/${PN}-7.25-EC.patch
if use nls; then
local lingua=''
@@ -97,6 +98,8 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
eautoreconf
}
src_configure() {