From 3e627c1432765cb6a32877e73f985e8bfb5102ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 Jul 2022 13:40:00 +0100 Subject: gentoo auto-resync : 14:07:2022 - 13:40:00 --- net-analyzer/nmap/Manifest | 6 +- net-analyzer/nmap/metadata.xml | 1 + net-analyzer/nmap/nmap-7.92-r1.ebuild | 138 ++++++++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-7.92.ebuild | 133 -------------------------------- net-analyzer/nmap/nmap-9999.ebuild | 9 ++- 5 files changed, 149 insertions(+), 138 deletions(-) create mode 100644 net-analyzer/nmap/nmap-7.92-r1.ebuild delete mode 100644 net-analyzer/nmap/nmap-7.92.ebuild (limited to 'net-analyzer/nmap') diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index cff47151cf8c..85726ad8e307 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -11,6 +11,6 @@ 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 -EBUILD nmap-7.92.ebuild 3221 BLAKE2B e9e1e318dc8e760804e5977ebbc24991b92864a81197e8f322f2e979c8feedefff4497b6833b0b0407676929a364adcb6c02e56b3ac05b321e1a9df23e7bc7b8 SHA512 691c1df075ad02e0a5d1fb229c40ae4ee21541e59012d10f34f3cb3530982c267159c6db58b83d1a027908e8992ebc972350f98cad15e7da90f7ed35bd176d7c -EBUILD nmap-9999.ebuild 3266 BLAKE2B 9631eba23f86f57f32c3cd92df31c5121379cb79e83e6592c414bfd2ebe3ec22a782071b16817bfca9a095cde5f1b449ad08b2e0f9c4d5058402c257279d54e1 SHA512 ff9b02436679b9ac0bf07a08a9879907fb85d28e4d54e4b9ca0f07ee58458dca0ac154cbcd0dacb4e1cd84f1c81c3d83f9a6636042046523cad70a8d64bd0203 -MISC metadata.xml 838 BLAKE2B a0d9278b601c719019a8c7844ffe0b0ad74ff04935b32bd164e93800785f055aa1522a59f0129b473ceb1271d1bf670c5f1d9d3ba5a1261cbf45ef97cbfb9a52 SHA512 1d1aff1360a834a5b767f384efd6fc0fbd613e7da183507f06ce550cd503b50d167384b106acc5451c0414c418b82310ecfcaf2d36b70b6b50bf8f518fbd823e +EBUILD nmap-7.92-r1.ebuild 3300 BLAKE2B 0cdb706a3590527b08bcc2fd0115d93b56e9626e1e36a773e55b9328cdbe2ac515fa703d9e4e4e37e5afaa359405243f7de09ddeb5fe308c0ca8d03a7691aa69 SHA512 13f8348001d73116dd82064a16ba27b0abd1eaea46e4ac9b84e166fd4ca1fae7698efd16847e6f7d590ba1f79bb37d899c18100e28c82298426ff4a80aa6ba64 +EBUILD nmap-9999.ebuild 3345 BLAKE2B ef52185445ca83c94c79972f54f66104c350720676a60805e7007c15c5b9543d852c6a6d2b4d654bd72fe412b64a654f279a02b69d3924569f6e9bc786bba6de SHA512 8d9096d0b6b82fde48c3efbed3376ad659a8890395eaea44a17d784af2ed3a3f2f9d6967777236da11c30e2cae1058a8581ae172f1ecfba06070b49b07754a3e +MISC metadata.xml 890 BLAKE2B 4a6a6e4eeb6cdf7165da6f69ac4d8060c73323a6736c920208f485e18606dc45c8af41f81c18f72ce3695c649c83910407f84acd2b2c6ef48bc74459ae973cd9 SHA512 bf75b72c0aa1246fedff3378e9e6fbd42009853058f37ee677213e0e2dbfa7ae6753fc891ad7c9dda5f15d694483c125d335fa8add081d6928d9c2394c2f6c45 diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index 21fee1f7bbb0..4ca312aa6de6 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -18,6 +18,7 @@ Install the ncat utility 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 diff --git a/net-analyzer/nmap/nmap-7.92-r1.ebuild b/net-analyzer/nmap/nmap-7.92-r1.ebuild new file mode 100644 index 000000000000..752a2273e4f7 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.92-r1.ebuild @@ -0,0 +1,138 @@ +# 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= ) + 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.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild deleted file mode 100644 index 8d80c56138aa..000000000000 --- a/net-analyzer/nmap/nmap-7.92.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# 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 +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" - -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= ) - 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 -} diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 2812d6599000..3b55f48a5dbd 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -29,8 +29,11 @@ else fi SLOT="0" -IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" +IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" +REQUIRED_USE=" + system-lua? ( nse ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" RDEPEND=" dev-libs/liblinear:= @@ -131,4 +134,6 @@ src_install() { install dodoc CHANGELOG HACKING docs/README docs/*.txt + + use symlink && dosym /usr/bin/ncat /usr/bin/nc } -- cgit v1.2.3