From 155cc74ccaea367efa88c8acfadcf25cb7dfe89c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 3 Apr 2023 05:19:36 +0100 Subject: gentoo auto-resync : 03:04:2023 - 05:19:36 --- net-analyzer/Manifest.gz | Bin 43394 -> 43392 bytes net-analyzer/nessus-bin/Manifest | 6 +- net-analyzer/nessus-bin/nessus-bin-10.5.0.ebuild | 59 --------- net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild | 59 +++++++++ net-analyzer/nmap/Manifest | 8 +- net-analyzer/nmap/metadata.xml | 1 - net-analyzer/nmap/nmap-7.92-r2.ebuild | 139 -------------------- net-analyzer/nmap/nmap-7.92-r3.ebuild | 141 +++++++++++++++++++++ net-analyzer/nmap/nmap-7.93-r2.ebuild | 152 ---------------------- net-analyzer/nmap/nmap-7.93-r3.ebuild | 154 +++++++++++++++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 15 ++- 11 files changed, 370 insertions(+), 364 deletions(-) delete mode 100644 net-analyzer/nessus-bin/nessus-bin-10.5.0.ebuild create mode 100644 net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild delete mode 100644 net-analyzer/nmap/nmap-7.92-r2.ebuild create mode 100644 net-analyzer/nmap/nmap-7.92-r3.ebuild delete mode 100644 net-analyzer/nmap/nmap-7.93-r2.ebuild create mode 100644 net-analyzer/nmap/nmap-7.93-r3.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 4cb3dd494bf4..1cd0f5ef880b 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index d4c49913befd..070af57e47bf 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,5 +1,5 @@ AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4 -DIST Nessus-10.5.0-es8.aarch64.rpm 55558460 BLAKE2B 3840a23c109b8edfaf12ac18b1d0eec889d41fb03acd46a7bb801923c85699a4d0b050727a5665cd70357cbb439e610f0243e00e8b8fffc04318b761f1aa58ca SHA512 399e15e1cae61292350ae6aa9e79bbcb806cf39b432da651ee16c00bbc164b87e4ac1156cfa42889819dbeaa0bd2d2227aba3b885e4c32f04b69331c89c330e5 -DIST Nessus-10.5.0-es8.x86_64.rpm 56926472 BLAKE2B 5434a89ca806749aebd535b905f473dd43a7a892a5da81ccec69f6f362cbab6115c5a8001bdfdba050dff3a1b60b5e131f6aa6ff04080226565d92131977c952 SHA512 329675aa7cb727a8b7e281067489c343c22beea5ebde619208533df89dd89caaf721047fcddf2f193ce18c2748ec9cd4199e44196712427f805ba95728ee92ac -EBUILD nessus-bin-10.5.0.ebuild 1879 BLAKE2B 9b932254b61345a22cadb68106b8cf9bcb2cb00e77cb96da2c58090a142e04958981a6d015776c034b3b1737d79c1db0f911fc7022b107ed4a640cc2e4164ecc SHA512 b912df6c8e8f04b6fdf6fa04bb7a5c9f24cfda11bee61b155782df766bf4e89563d5cfb76b3f0ca58518b742be640c113d7dfd9a68ddfafcfca35b7504d43886 +DIST Nessus-10.5.1-es8.aarch64.rpm 58158604 BLAKE2B 955c11338b038d5698be40de099d1c14ff39941f64058717ab1903a40b7b641cc769536d7897dc4cc17a471f495ef1a2ee0113ab06184500b7902c92efe8e81d SHA512 bbb01f93aa0656c143fa67175cea7b76af79cb27e204806ddf69f614e49a79d8ab455f29a228f47b8370b12effb5d2f2d258e3ee961c7072bc9aa2b8aa0fc216 +DIST Nessus-10.5.1-es8.x86_64.rpm 59526592 BLAKE2B 22d6ac787a9666de75236b8c9454a2e56aa4e589750414387248ab9c13b79cd8b3efc0dd8fd9b89b9ba542e4f05b3c763d235e3303301480726788c711e933a3 SHA512 9106161bc4f1cdf493d35e936f7f01d80be6776231646dec3803fee8ea5b5431e64dc0cba1c5d1439a37a95be6863748cb5901d01cb3553ababecb28bb1073d4 +EBUILD nessus-bin-10.5.1.ebuild 1879 BLAKE2B 9b932254b61345a22cadb68106b8cf9bcb2cb00e77cb96da2c58090a142e04958981a6d015776c034b3b1737d79c1db0f911fc7022b107ed4a640cc2e4164ecc SHA512 b912df6c8e8f04b6fdf6fa04bb7a5c9f24cfda11bee61b155782df766bf4e89563d5cfb76b3f0ca58518b742be640c113d7dfd9a68ddfafcfca35b7504d43886 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82 diff --git a/net-analyzer/nessus-bin/nessus-bin-10.5.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.5.0.ebuild deleted file mode 100644 index c9c3613d91d4..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-10.5.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit rpm systemd - -MY_P="Nessus-${PV}-es8" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI=" - amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.x86_64.rpm ) - arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.aarch64.rpm ) -" - -LICENSE="GPL-2 Tenable-Master-Agreement" -SLOT="0" -KEYWORDS="-* ~amd64" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/nessus/bin/* - opt/nessus/lib/nessus/*.so - opt/nessus/lib/nessus/iconv/*.so - opt/nessus/lib/nessus/libjemalloc.so.* - opt/nessus/sbin/*" - -S="${WORKDIR}" - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - # Actually update Nessus core components. According to upstream packages, - # harmless to invoke on fresh installations too - and it may make life easier - # for people who had restored Nessus state from backups, had it lying around - # from older installations and so on. - "${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://:8834/" - else - elog "Please restart the nessusd-bin service to use the new version of Nessus" - fi -} diff --git a/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild new file mode 100644 index 000000000000..c9c3613d91d4 --- /dev/null +++ b/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm systemd + +MY_P="Nessus-${PV}-es8" + +DESCRIPTION="A remote security scanner for Linux" +HOMEPAGE="https://www.tenable.com/" +SRC_URI=" + amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.x86_64.rpm ) + arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.aarch64.rpm ) +" + +LICENSE="GPL-2 Tenable-Master-Agreement" +SLOT="0" +KEYWORDS="-* ~amd64" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/nessus/bin/* + opt/nessus/lib/nessus/*.so + opt/nessus/lib/nessus/iconv/*.so + opt/nessus/lib/nessus/libjemalloc.so.* + opt/nessus/sbin/*" + +S="${WORKDIR}" + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus/com/nessus/CA + keepdir /opt/nessus/etc/nessus + keepdir /opt/nessus/var/nessus/logs + keepdir /opt/nessus/var/nessus/tmp + + newinitd "${FILESDIR}"/nessusd-initd nessusd-bin + systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service +} + +pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To get started launch the nessusd-bin service, then point your Web browser to" + elog " https://:8834/" + else + elog "Please restart the nessusd-bin service to use the new version of Nessus" + fi +} diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index d1afc239c886..e975e106f48a 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -14,7 +14,7 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb 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 3316 BLAKE2B 12da03bd72fe53a0063de4995ee87d394d4f7a5ef68efa44b974d05f4d0971ab4f160ee413870525c0099c6bf595e5a6d5098c780da1a488ea5b06a43f77cad7 SHA512 3a7977e65568b7ad7f42c5cb0853cefbdd0bc0cb842ed6df307cadea4e1eddad6ed78cb946e8956387f1bb23cd596a6a18a35ad54e1f5161561f762f9e6185c3 -EBUILD nmap-7.93-r2.ebuild 3650 BLAKE2B 428bf50d31630f04a765f91a9b378d5b862fdcafde588ecfb48bbfc39e9af625bff876a2b5cec7596b49ce13534d954bc963cbe76851120c4001c5e22ea48022 SHA512 d3eb9dbd4e934071f8ff04ce95b896e983f7b205ad28f0f0e3395f1f37f4af6a1bf717347cb26b094aba148a54190e254baf2c5b15fb9f65cd5a1fe997ecb1d1 -EBUILD nmap-9999.ebuild 4351 BLAKE2B 43670eb22b986333b9145ad6dd09ca08adbd59f0c51e7d2b0344acefa9d35bee50f1e609e453b425b0eb0fe97240cfc340f14b422f0574d08a6fa9276f3a58ee SHA512 4c68c8487bf41bc37f3654289a392865c792e89e32753aaf5bf60561f1a6861c90de66cd19db72750f673b113d9bf1c788d317cafceb54831bfe13027f644683 -MISC metadata.xml 979 BLAKE2B 03e2593e85b39b5c718f97ebca7bd9301b55d6e379588ecb212b1321b800e86a46c3983ec7b029547684209d58e3166468fc78e67fa235126f0dd470c20eadbf SHA512 3c5914ec5f7aae6da8bcf31630a3068f85243b0ec7699f6e789473bab02d1f9c91b41c655f154039e681e592e48dcee584a663ccf9dd5e9f00a19f1313736715 +EBUILD nmap-7.92-r3.ebuild 3216 BLAKE2B 3867fc082afe912064d2768ea370296caa27dc653a8bfea2d669db4ff5f02ccae24049f3e2af8e97b027c8290eba525d7558690fbe848ea92a4403f5665d1ca5 SHA512 98229d1f5f80299ef4b6aa778b86244b997c87a0b7c3a412d84a56e435825d01cc781632d67215131482f8c2328cc0dcdc8ea6e401eb6c2e6c8cbe7b3f234902 +EBUILD nmap-7.93-r3.ebuild 3550 BLAKE2B f4cbd689bc3bd6fcfad89e1a0ff3a581c0894d5bd1037f795009d91dc4f32c7648385ad9a62557e955159064349755f5e314c0b466360a2405ca47873f7b262e SHA512 97da0620154f0ea441a44463ebf4f5c8c08d4a819585b1a718e9a2291f5a6e1a0dafdbfb9f408b4d462af3535e8f1788021d9c15538ed1437a7cd790312bac7d +EBUILD nmap-9999.ebuild 4308 BLAKE2B 03558eab8ab82a987d48b1f43a5a5b30bf43e61ba9543594fe747ec47ebed3ea62b0699c2bd5e4e8bbf38a7777bb9534d603895a862233ecebe2a27f76e54f5b SHA512 ba399a601521ea6dfaec1ecaf886edc6c71f514721863a303db54df8853f06fe93e50c3a9c72532dda78772c8a1a7029e629e1c4faaa9194351560d41181f9a2 +MISC metadata.xml 888 BLAKE2B 0fa642ab34c24d35347876c96e2ab28de71d153202b14ef551c8222a808218c34fa990857cbc7273ac2551e5fe2d6afc27124a47de979872f46e30b0451d9c56 SHA512 214887e52ca334207125fb3fa534ec8f4ae4d9985c93695e798cf21625b7d3113852a2e835bbcccf833ae01c1e89e8be0ffb31d409db7ebdbc4920c3e3416a6c diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index e31f57e3f592..c93c9fdc4493 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -16,7 +16,6 @@ Install the nping utility Include support for the Nmap Scripting Engine (NSE) Install symlink to nc - Use dev-lang/lua instead of the bundled liblua Install the GTK+ based nmap GUI, zenmap diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild deleted file mode 100644 index 2c418afbe2a5..000000000000 --- a/net-analyzer/nmap/nmap-7.92-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2023 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" -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-0.92 NPSL-0.95 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 -} diff --git a/net-analyzer/nmap/nmap-7.92-r3.ebuild b/net-analyzer/nmap/nmap-7.92-r3.ebuild new file mode 100644 index 000000000000..62e1a494d022 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.92-r3.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 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" +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-0.92 NPSL-0.95 GPL-2 )" +fi + +SLOT="0" +IUSE="ipv6 libssh2 ncat nping +nse ssl symlink" +REQUIRED_USE=" + 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? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:0= ) + symlink? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) +" +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 nse && 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 nse liblua) \ + $(use_with ssl openssl) \ + $(usex libssh2 --with-zlib) \ + $(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 +} diff --git a/net-analyzer/nmap/nmap-7.93-r2.ebuild b/net-analyzer/nmap/nmap-7.93-r2.ebuild deleted file mode 100644 index 0b02e213c5e4..000000000000 --- a/net-analyzer/nmap/nmap-7.93-r2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-3 ) -LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools lua-single python-any-r1 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 - -# https://github.com/nmap/nmap/issues/2199 -LICENSE="|| ( NPSL-0.94 NPSL-0.95 )" -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=" - ${PYTHON_DEPS} - 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}"/${P}-openssl-1.1.patch - "${FILESDIR}"/${PN}-9999-netutil-else.patch -) - -pkg_setup() { - python-any-r1_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() { - export ac_cv_path_PYTHON="${PYTHON}" - export am_cv_pathless_PYTHON="${EPYTHON}" - - # 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-7.93-r3.ebuild b/net-analyzer/nmap/nmap-7.93-r3.ebuild new file mode 100644 index 000000000000..d2a477897b76 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.93-r3.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-3 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools lua-single python-any-r1 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 + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="|| ( NPSL-0.94 NPSL-0.95 )" +SLOT="0" +IUSE="ipv6 libssh2 ncat nping +nse ssl symlink" +REQUIRED_USE=" + 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? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:0= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + 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}"/${P}-openssl-1.1.patch + "${FILESDIR}"/${PN}-9999-netutil-else.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + + use nse && 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() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + # 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 nse liblua) \ + $(use_with ssl openssl) \ + $(usex libssh2 --with-zlib) \ + $(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 8617f57210bf..f18840ef8839 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -30,10 +30,10 @@ fi # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" SLOT="0" -IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - system-lua? ( nse ${LUA_REQUIRED_USE} ) + nse? ( ${LUA_REQUIRED_USE} ) symlink? ( ncat ) " @@ -47,7 +47,10 @@ RDEPEND=" sys-libs/zlib ) nls? ( virtual/libintl ) - nse? ( sys-libs/zlib ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) ssl? ( dev-libs/openssl:= ) symlink? ( ncat? ( @@ -55,7 +58,6 @@ RDEPEND=" !net-analyzer/openbsd-netcat ) ) - system-lua? ( ${LUA_DEPS} ) zenmap? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -64,6 +66,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig @@ -90,7 +93,7 @@ PATCHES=( pkg_setup() { python-single-r1_pkg_setup - use system-lua && lua-single_pkg_setup + use nse && lua-single_pkg_setup } src_prepare() { @@ -134,10 +137,10 @@ src_configure() { $(use_with ncat) $(use_with ndiff) $(use_with nping) + $(use_with nse liblua) $(use_with ssl openssl) $(use_with zenmap) $(usex libssh2 --with-zlib) - $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) $(usex nse --with-zlib) --cache-file="${S}"/config.cache # The bundled libdnet is incompatible with the version available in the -- cgit v1.2.3