public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
Date: Tue, 10 Jan 2023 08:34:51 +0000 (UTC)	[thread overview]
Message-ID: <1673339682.a569f13b5a60aff8d82db75bedcda526728be8b1.sam@gentoo> (raw)

commit:     a569f13b5a60aff8d82db75bedcda526728be8b1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 04:56:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:34:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a569f13b

Revert "net-analyzer/nmap: drop 7.92-r2"

This reverts commit 0fe19fdc6d362149e8f6df90f04fa1423ff8c010.

This is the last version released under GPL-2 for compatibility:
https://nmap.org/npsl/

It says:
"""
Note that some releases of Nmap may fall under a previous version of this license,
or a different license entirely. The exact terms for a given version of Nmap can
be found in the included LICENSE or COPYING file.

To ease the transition to the NPSL, the first three Nmap releases made under
that license (Nmap 7.90, 7.91, and 7.92) may also be used under the previous
Nmap license terms by anyone who prefers those.
"""

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest            |   2 +
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 142 ++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8e4258cbc673..ba0eb83f06f4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,4 @@
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
new file mode 100644
index 000000000000..699b452ebd6e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+	# Just in case for now as future seems undecided.
+	LICENSE="NPSL"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
+	inherit verify-sig
+
+	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	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"
+
+	LICENSE="|| ( NPSL GPL-2 )"
+fi
+
+SLOT="0"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nse? ( sys-libs/zlib )
+	ssl? ( dev-libs/openssl:0= )
+	symlink? (
+		!net-analyzer/netcat
+		!net-analyzer/openbsd-netcat
+	)
+	system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre="${ESYSROOT}"/usr \
+		--without-ndiff \
+		--without-zenmap
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	# See bug #831713 for return of -j1
+	LC_ALL=C emake \
+		-j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+}


             reply	other threads:[~2023-01-10  8:34 UTC|newest]

Thread overview: 184+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-10  8:34 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-03  9:24 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/ Sam James
2024-09-01  9:04 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  4:38 Sam James
2023-07-06  5:59 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-05-21 19:41 Sam James
2023-05-21 19:35 Sam James
2023-05-21 18:36 Sam James
2023-04-02 21:57 Sam James
2023-01-12 17:18 Ulrich Müller
2023-01-10  8:36 Sam James
2023-01-10  8:34 Sam James
2022-12-16  4:03 Sam James
2022-10-28 19:53 Sam James
2022-10-11  6:48 Agostino Sarubbo
2022-10-11  6:47 Agostino Sarubbo
2022-10-11  6:46 Agostino Sarubbo
2022-10-11  6:45 Agostino Sarubbo
2022-10-11  6:44 Agostino Sarubbo
2022-10-11  6:43 Agostino Sarubbo
2022-10-11  6:41 Agostino Sarubbo
2022-09-04 23:56 Sam James
2022-09-03  3:49 Sam James
2022-07-19 15:09 Sam James
2022-07-14 11:06 Sam James
2022-04-17 17:22 Sam James
2022-03-20 18:43 Sam James
2022-01-22  4:42 Sam James
2021-11-19  8:34 Sam James
2021-09-27 14:53 Marek Szuba
2021-09-14  5:17 Sam James
2021-09-14  5:15 Sam James
2021-09-14  5:15 Sam James
2021-09-12 23:01 Sam James
2021-09-12 23:01 Sam James
2021-09-12 23:00 Sam James
2021-09-12 23:00 Sam James
2021-08-09  3:47 Sam James
2021-07-31 13:40 Michał Górny
2021-04-29 18:28 Mikle Kolyada
2021-04-23 13:34 Sam James
2021-04-16  4:47 Sam James
2021-04-16  0:40 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:03 Sam James
2021-04-03 15:57 Sam James
2021-03-11 18:15 Sam James
2021-03-06 20:35 Ulrich Müller
2021-03-04  4:58 Sam James
2021-02-18  8:22 Sam James
2021-02-18  8:22 Sam James
2021-02-16 12:34 Sam James
2021-02-16 12:34 Sam James
2021-02-14  2:10 Sam James
2021-02-14  2:10 Sam James
2021-02-05 12:31 Sam James
2021-02-05 12:31 Sam James
2021-02-05 10:40 Sam James
2021-02-05 10:40 Sam James
2021-02-05  6:36 Sam James
2021-02-05  6:36 Sam James
2021-02-05  6:34 Sam James
2021-02-05  6:34 Sam James
2021-01-25 22:23 Mikle Kolyada
2021-01-06 14:35 Fabian Groffen
2020-12-27  0:05 Marek Szuba
2020-11-25  7:44 Agostino Sarubbo
2020-11-24 14:40 Sam James
2020-11-24 12:57 Agostino Sarubbo
2020-11-24 12:56 Agostino Sarubbo
2020-11-24 12:55 Agostino Sarubbo
2020-11-24 12:54 Agostino Sarubbo
2020-11-24  3:16 Sam James
2020-11-04 11:41 Andreas K. Hüttel
2020-11-04  7:29 Sam James
2020-11-04  0:44 Sam James
2020-10-15  9:53 Jeroen Roovers
2020-10-15  9:53 Jeroen Roovers
2020-10-04  6:58 Jeroen Roovers
2020-05-22 11:38 Andreas Sturmlechner
2020-05-22 10:51 Andreas Sturmlechner
2020-03-25 19:15 Thomas Deutschmann
2020-03-17 18:00 Sergei Trofimovich
2020-03-15 18:41 Agostino Sarubbo
2020-03-15 18:37 Agostino Sarubbo
2020-03-15 18:34 Agostino Sarubbo
2020-03-15 18:31 Agostino Sarubbo
2020-03-15 18:29 Agostino Sarubbo
2020-03-15 18:27 Agostino Sarubbo
2020-03-15 18:26 Agostino Sarubbo
2019-09-18  8:31 Fabian Groffen
2019-08-10 22:40 Jeroen Roovers
2019-05-31 13:00 Jeroen Roovers
2018-04-15  8:21 Jeroen Roovers
2018-04-14 11:40 Markus Meier
2018-04-08  4:58 Matt Turner
2018-04-08  4:58 Matt Turner
2018-04-01 10:00 Tobias Klausmann
2018-03-22 23:01 Sergei Trofimovich
2018-03-22 22:25 Sergei Trofimovich
2018-03-22 16:08 Jeroen Roovers
2018-03-22 14:25 Mikle Kolyada
2018-03-21 21:00 Jeroen Roovers
2018-03-21 21:00 Jeroen Roovers
2018-01-08 13:58 Ulrich Müller
2018-01-06 18:32 Ulrich Müller
2017-08-26  9:00 Jeroen Roovers
2017-08-08 12:18 Jeroen Roovers
2017-08-08 12:17 Jeroen Roovers
2017-06-20 11:58 Jeroen Roovers
2017-06-11 11:49 Jeroen Roovers
2017-06-10 15:10 Agostino Sarubbo
2017-03-25 10:08 Jeroen Roovers
2017-03-21 12:31 Michael Weber
2017-03-17 10:42 Agostino Sarubbo
2017-03-17 10:15 Agostino Sarubbo
2017-03-17  7:08 Jeroen Roovers
2017-02-10 17:40 Michael Weber
2017-01-23 17:15 Richard Farina
2017-01-22 16:48 Jeroen Roovers
2017-01-22 16:43 Jeroen Roovers
2017-01-21 11:04 Jeroen Roovers
2017-01-06 14:33 Tobias Klausmann
2017-01-04 17:09 Agostino Sarubbo
2017-01-04 16:56 Agostino Sarubbo
2017-01-03 14:09 Fabian Groffen
2016-12-23 21:09 Jeroen Roovers
2016-10-22  9:58 Jeroen Roovers
2016-09-30  9:15 Jeroen Roovers
2016-09-09  5:02 Jeroen Roovers
2016-09-03 10:56 Jeroen Roovers
2016-07-27 15:57 Jeroen Roovers
2016-07-22  5:47 Jeroen Roovers
2016-07-04 11:45 Jeroen Roovers
2016-06-30 19:24 Jeroen Roovers
2016-06-01 10:46 Tobias Klausmann
2016-05-31 19:19 Markus Meier
2016-04-07 11:41 Jeroen Roovers
2016-03-24  5:33 Jeroen Roovers
2016-03-19  7:23 Jeroen Roovers
2016-03-04  2:16 Stephen Klimaszewski
2016-02-04 20:24 Tobias Klausmann
2016-01-09 16:08 Markus Meier
2015-12-27  9:30 Mikle Kolyada
2015-12-26 10:06 Jeroen Roovers
2015-12-25 19:42 Mikle Kolyada
2015-12-25 15:55 Agostino Sarubbo
2015-12-25 15:02 Jeroen Roovers
2015-12-24 12:50 Jeroen Roovers
2015-12-16  8:15 Jeroen Roovers
2015-11-24  6:05 Jeroen Roovers
2015-11-24  6:05 Jeroen Roovers
2015-11-14  9:55 Jeroen Roovers
2015-11-14  8:56 Jeroen Roovers
2015-11-14  8:07 Jeroen Roovers
2015-11-14  8:07 Jeroen Roovers
2015-10-27  3:46 Jeroen Roovers
2015-10-16  4:38 Jeroen Roovers
2015-10-05  9:08 Julian Ospald
2015-09-29  9:09 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1673339682.a569f13b5a60aff8d82db75bedcda526728be8b1.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox