From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A20815806E for ; Sun, 21 May 2023 19:42:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D322E083E; Sun, 21 May 2023 19:41:59 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38642E083E for ; Sun, 21 May 2023 19:41:59 +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 3864F335DE8 for ; Sun, 21 May 2023 19:41:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 599BCA4A for ; Sun, 21 May 2023 19:41:56 +0000 (UTC) From: "Sam James" 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" Message-ID: <1684698085.64620d3c640666e4e9a345d92babb5167b4e7692.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.94.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: 64620d3c640666e4e9a345d92babb5167b4e7692 X-VCS-Branch: master Date: Sun, 21 May 2023 19:41:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 51ea1ec8-365d-4778-9bae-aa3103afbec5 X-Archives-Hash: 69441d4d079f2f87bb11c0ca2eb2679c commit: 64620d3c640666e4e9a345d92babb5167b4e7692 Author: Sam James gentoo org> AuthorDate: Sun May 21 19:41:25 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun May 21 19:41:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64620d3c net-analyzer/nmap: fix live ebuild Closes: https://bugs.gentoo.org/906903 Fixes: 77eba6f506b1f629034647c8b7debcba8d599a6a Signed-off-by: Sam James gentoo.org> net-analyzer/nmap/nmap-7.94.ebuild | 7 +++++-- net-analyzer/nmap/nmap-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild index a12d68736f19..246e6bb067d6 100644 --- a/net-analyzer/nmap/nmap-7.94.ebuild +++ b/net-analyzer/nmap/nmap-7.94.ebuild @@ -22,12 +22,13 @@ else inherit verify-sig SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" SLOT="0" @@ -89,7 +90,9 @@ pkg_setup() { } src_unpack() { - if use verify-sig ; then + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then # Needed for downloaded patch (which is unsigned, which is fine) verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} fi diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index a12d68736f19..246e6bb067d6 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -22,12 +22,13 @@ else inherit verify-sig SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" SLOT="0" @@ -89,7 +90,9 @@ pkg_setup() { } src_unpack() { - if use verify-sig ; then + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then # Needed for downloaded patch (which is unsigned, which is fine) verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} fi