From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1433526-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 45849158011
for <garchives@archives.gentoo.org>; Sun, 4 Sep 2022 23:56:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 47174E07D3;
Sun, 4 Sep 2022 23:56:11 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2EC75E07D3
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Sep 2022 23:56:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D42F6340C30
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Sep 2022 23:56:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 20569574
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Sep 2022 23:56:08 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1662335746.e86f2d6edad50bc23e970dd413171d28ff54ba65.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/nmap/nmap-7.93.ebuild net-analyzer/nmap/nmap-9999.ebuild
X-VCS-Directories: net-analyzer/nmap/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e86f2d6edad50bc23e970dd413171d28ff54ba65
X-VCS-Branch: master
Date: Sun, 4 Sep 2022 23:56:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9156a8b0-8a2e-41be-a8e5-0aa5404ce4cd
X-Archives-Hash: 3ced49f41480a0c897a4a49f7a436bd9
commit: e86f2d6edad50bc23e970dd413171d28ff54ba65
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 23:55:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 23:55:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86f2d6e
net-analyzer/nmap: fix build with < OpenSSL 3; don't automagically detect python2
Closes: https://bugs.gentoo.org/868483
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nmap/nmap-7.93.ebuild | 17 +++++++++++++++--
net-analyzer/nmap/nmap-9999.ebuild | 17 +++++++++++++++--
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -5,7 +5,8 @@ EAPI=8
LUA_COMPAT=( lua5-3 )
LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
DESCRIPTION="Network exploration tool and security / port scanner"
HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
)
pkg_setup() {
+ python-any-r1_pkg_setup
+
use system-lua && lua-single_pkg_setup
}
@@ -96,6 +102,13 @@ src_prepare() {
}
src_configure() {
+ export ac_cv_path_PYTHON="${PYTHON}"
+ export am_cv_pathless_PYTHON="${EPYTHON}"
+
+ # Workaround for https://github.com/nmap/nmap/issues/2516
+ # bug #868483
+ append-cppflags -DOPENSSL_API_COMPAT=10101
+
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
LUA_COMPAT=( lua5-3 )
LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
DESCRIPTION="Network exploration tool and security / port scanner"
HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
)
pkg_setup() {
+ python-any-r1_pkg_setup
+
use system-lua && lua-single_pkg_setup
}
@@ -96,6 +102,13 @@ src_prepare() {
}
src_configure() {
+ export ac_cv_path_PYTHON="${PYTHON}"
+ export am_cv_pathless_PYTHON="${EPYTHON}"
+
+ # Workaround for https://github.com/nmap/nmap/issues/2516
+ # bug #868483
+ append-cppflags -DOPENSSL_API_COMPAT=10101
+
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \