gentoo auto-resync : 04:10:2022 - 13:17:38

4 files changed, 60 insertions, 2 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 04746f61a5ca..1b07f22f29e1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 2f9830a26384..9a7f1c95ef1b 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,6 +1,7 @@
 AUX ike-scan-1.9.5-clang-16.patch 3150 BLAKE2B 1ed607aee9003ddb07a49c96ad14e882d3e5135ca5f0af07212bb60dff25854b5104ce35b2bc9c7c286b34d1feb1fcd2a0b8ee6da18a35c04f800671431352ca SHA512 9e84734e60ba0bcd2ef714e5051d486ed7594b33e99447fe8ee9a6b59eda57ccd7311b01781d5e5096b98df45ed141644a94bc78d69747e5639b19cd89b0df79
+AUX ike-scan-1.9.5-openssl-libdir.patch 2502 BLAKE2B 8964dbbe156acc61db3518a1007eda8d300f6ead15b783795f8d9b102ee80663531364353814d24474cb7e42167ec29b181bf5b87f66f914baf3a28ca5b9e9b3 SHA512 d17e8a2a783009912476b45a0395f3165296588a972b92f8d4221cb826fb6ed325fc63a2e55148e51292835ce07457cffcf64b0600e875c208aad9f663616f8f
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
 DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590
 EBUILD ike-scan-1.9.4.ebuild 738 BLAKE2B f73bc5fb1a446a3f9cf97ad85a1cd68db0be95bbf3200ac4530763d0c696569092ef7032c03633cf051fb2a7d01eb7cd106c0718a76b619cbaf341e1122683a0 SHA512 aed95ea1d8511de9b542394d5f5ae41df0408dde189e95a1a255d554524e0099b0d262b1b32daaab8fc15121120400d2767dd2a57763b1bc5ec22894c75089c9
-EBUILD ike-scan-1.9.5.ebuild 784 BLAKE2B 82997a6df4449ab79ceb62d06d6605e57c04a7374d70128780f2f7772066451b7b035f48662f7b7a3dead619707a01a61f682d3f89694b01443640e41cd168c0 SHA512 b8d8a1744aa6f3107384d78dfa77f4c00f15c0185085ea40040eb18d83e1f3b810e038bc690332ccb987bdbe9c93195125ea750762e2966810a7141176665635
+EBUILD ike-scan-1.9.5.ebuild 854 BLAKE2B dd3ecb2701b7070469184a2c6a811bbd077663119557a8e37387d7c25faa0ebdd8a7017c9c749e895183cfd2237efee85e2cae24310a8772ceed3f9f6c680c32 SHA512 eec6d7ea51a5615fbe1dddef42c3b0c327f6b56a4f036eebd9cbe59158877fbfa97c1c8b467d59a05260e3bcb7fd873e19e02a352657bc62985ea557ebe11931
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch
new file mode 100644
index 000000000000..0ee12dc2f907
--- /dev/null
+++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch
@@ -0,0 +1,55 @@
+TODO: switch to pkgconfig
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,49 +187,9 @@ AC_ARG_WITH(openssl,
+    [
+       if test "x$withval" != "xno" ; then
+          AC_MSG_RESULT(yes)
+-         for ssldir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
+-            if test -f "${ssldir}/include/openssl/ssl.h"; then
+-               found_openssl="yes"
+-               openssl_header_dir="${ssldir}/include"
+-               AC_MSG_NOTICE([Found ${ssldir}/include/openssl/ssl.h])
+-               break
+-            fi
+-            if test -f "${ssldir}/openssl/ssl.h"; then
+-               found_openssl="yes"
+-               openssl_header_dir="${ssldir}"
+-               AC_MSG_NOTICE([Found ${ssldir}/openssl/ssl.h])
+-               break
+-            fi
+-         done
+-         if test x$found_openssl != xyes; then
+-            AC_MSG_ERROR([Cannot find OpenSSL header files])
+-         else
+-            AC_MSG_NOTICE([OpenSSL header files found in $openssl_header_dir])
+-            CPPFLAGS="-I${openssl_header_dir} ${CPPFLAGS}"
+-         fi
+-         if test -f "${ssldir}/lib/libcrypto.so"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.so])
+-         elif test -f "${ssldir}/libcrypto.so"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.so])
+-         elif test -f "${ssldir}/lib/libcrypto.dylib"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.dylib])
+-         elif test -f "${ssldir}/libcrypto.dylib"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.dylib])
+-         elif test -f "${ssldir}/lib/libcrypto.a"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.a])
+-         elif test -f "${ssldir}/libcrypto.a"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.a])
+-         else
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Cannot find libcrypto under $ssldir - assuming its in the standard search path])
+-         fi
+          AC_MSG_NOTICE([OpenSSL libraries found in $openssl_lib_dir])
++         openssl_header_dir="${withval}/include/openssl"
++         CPPFLAGS="${CPPFLAGS} -I${openssl_header_dir}"
+          LDFLAGS="-L${openssl_lib_dir} ${LDFLAGS}"
+          LIBS="-lcrypto ${LIBS}"
+ 
diff --git a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
index acfffd464bb0..7f1d570df837 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
@@ -19,6 +19,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.5-clang-16.patch
+	"${FILESDIR}"/${PN}-1.9.5-openssl-libdir.patch
 )
 
 src_prepare() {
@@ -33,7 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with ssl openssl)
+	econf \
+		$(use_with ssl openssl "${ESYSROOT}"/usr)
 }
 
 src_install() {