From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1475703-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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3260215800F
for <garchives@archives.gentoo.org>; Tue, 10 Jan 2023 08:34:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 38DDBE07E6;
Tue, 10 Jan 2023 08:34:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 242B4E07E6
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Jan 2023 08:34:54 +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 32F32340D9E
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Jan 2023 08:34:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7751E827
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Jan 2023 08:34:51 +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: <1673339683.25e5315c5470b97446e1074c787440883db7fd34.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-r1.ebuild 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: 25e5315c5470b97446e1074c787440883db7fd34
X-VCS-Branch: master
Date: Tue, 10 Jan 2023 08:34:51 +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: 11fae7b2-6488-403e-adc9-cef0626a416b
X-Archives-Hash: d9c570c35662d16813d387e58feb5bea
commit: 25e5315c5470b97446e1074c787440883db7fd34
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 05:15:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:34:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e5315c
net-analyzer/nmap: fix LICENSE
Apologies for missing this before - for some reason (it was in October,
so I can't recall exactly) I didn't update LICENSE with the 7.93 bump
(perhaps thought the issue wasn't resolved b/c upstream bug still open...?)
Bug: https://github.com/nmap/nmap/issues/2199
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nmap/{nmap-7.93.ebuild => nmap-7.93-r1.ebuild} | 5 +++--
net-analyzer/nmap/nmap-9999.ebuild | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93-r1.ebuild
similarity index 97%
rename from net-analyzer/nmap/nmap-7.93.ebuild
rename to net-analyzer/nmap/nmap-7.93-r1.ebuild
index 1c9da575583a..58b6435c8550 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,7 +25,8 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
SLOT="0"
IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
REQUIRED_USE="
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 747d81979e00..cb3c5fa1e068 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -27,7 +27,8 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
SLOT="0"
IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
REQUIRED_USE="