From fe2f8d9da0555e4ed15cc203d8dd99dd60b3117e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Sep 2022 10:18:49 +0100 Subject: gentoo auto-resync : 03:09:2022 - 10:18:49 --- net-analyzer/Manifest.gz | Bin 45058 -> 45061 bytes net-analyzer/nmap/Manifest | 5 +- net-analyzer/nmap/nmap-7.93.ebuild | 141 +++++++++++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 18 ++--- 4 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 net-analyzer/nmap/nmap-7.93.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 11f41bff3cab..e735bbc36980 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 9316d6458e00..762dd6ee261a 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -11,6 +11,9 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1 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 EBUILD nmap-7.92-r2.ebuild 3369 BLAKE2B 0cb845bf418d6d93c42c59e480457cbc002dddb8721983d0ce18e22673a108a00db37f16fae5c0c138e461426191b50ce3e6b70e80c7d938b4d3f1343d436e80 SHA512 bc4f57e19ca735af6cde2459f163f7c99ea094ccca0b72c29f4bf4a6b14d4de96ff9e9bf070ef0f8e890d899e4f0c91e99b05115bdc0225ff7040621a0191d5d -EBUILD nmap-9999.ebuild 3437 BLAKE2B 10a0c8cec2474578528de844a295cb4e3f9e4ac8a431738a5bb172968e85406aff8771cdf879bd0cd2c03a00352b71d47247600000180f239d224b7e6005caa8 SHA512 826b0d05a47206cb2d1f015e3931000576d7f6bbfb969f3d8a8323c7e87f20d91ef0e48354a8f56f3077b22f5d081f7ef39c674797a707bcba530334e69c82e0 +EBUILD nmap-7.93.ebuild 3392 BLAKE2B 6a6eed04c3385906809b451adda327ad366022cda7aea833b2e750965fae4b48430ced0bc23a5a56cef53ee933ebc3405abcd3261750a55fcaa67f5938ee2b8d SHA512 0a6f1c6bb18a83437b83e8383eed6211535cacc68e5acf8043186b0f0c704b079ddfe4855fb3665924d04b7e426a4227d6e49f228baf7eaa5958355ce82c025e +EBUILD nmap-9999.ebuild 3392 BLAKE2B 6a6eed04c3385906809b451adda327ad366022cda7aea833b2e750965fae4b48430ced0bc23a5a56cef53ee933ebc3405abcd3261750a55fcaa67f5938ee2b8d SHA512 0a6f1c6bb18a83437b83e8383eed6211535cacc68e5acf8043186b0f0c704b079ddfe4855fb3665924d04b7e426a4227d6e49f228baf7eaa5958355ce82c025e MISC metadata.xml 964 BLAKE2B be7a2b72cd346cdcf83df81cab6c28666067a17516e58bb0570572fcc4467258de1e913cb9448635080e0c3915c9efd0a4b2e19c6a480d70afda149574f725eb SHA512 fd3ef56d6a5513553a934348712ad0e9c5a6578f3eb8d9069cb5ea7076eafd58c207a1f5007371bedb60e9319c221280d37f129804eb3072b1fb4adb8e4da184 diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild new file mode 100644 index 000000000000..9470b5ddbf08 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.93.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +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" +fi + +LICENSE="|| ( NPSL GPL-2 )" +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? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + system-lua? ( ${LUA_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +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 + "${FILESDIR}"/${PN}-9999-netutil-else.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-dpdk \ + --without-ndiff \ + --without-zenmap +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev 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 +} diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 62661ccfa927..9470b5ddbf08 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" @@ -14,8 +14,6 @@ if [[ ${PV} == *9999* ]] ; then 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 @@ -24,10 +22,9 @@ else 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 +LICENSE="|| ( NPSL GPL-2 )" SLOT="0" IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" REQUIRED_USE=" @@ -54,9 +51,10 @@ RDEPEND=" system-lua? ( ${LUA_DEPS} ) " DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" if [[ ${PV} != *9999* ]] ; then - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" fi PATCHES=( @@ -92,7 +90,7 @@ src_prepare() { eautoreconf if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 + # We need the original for a Darwin-specific fix, bug #604432 mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die fi } @@ -112,16 +110,14 @@ src_configure() { --cache-file="${S}"/config.cache \ --with-libdnet=included \ --with-pcre="${ESYSROOT}"/usr \ + --without-dpdk \ --without-ndiff \ --without-zenmap } src_compile() { local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nping nping '') - do + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do emake -C "${directory}" makefile.dep done -- cgit v1.2.3