From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- net-analyzer/nmap/Manifest | 6 +- net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +- net-analyzer/nmap/nmap-7.80-r2.ebuild | 137 ++++++++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-7.91-r1.ebuild | 116 ++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 18 +++-- 5 files changed, 271 insertions(+), 8 deletions(-) create mode 100644 net-analyzer/nmap/nmap-7.80-r2.ebuild create mode 100644 net-analyzer/nmap/nmap-7.91-r1.ebuild (limited to 'net-analyzer/nmap') diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 3c74e917bd24..5c29a3e5458a 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -12,7 +12,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.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d -EBUILD nmap-7.80-r1.ebuild 3280 BLAKE2B 1b3d8c48bbade2616fd4a53ab89fc968fbd8e4ffa31700ba66c6592270bb38dd665a309d8ab1f51f80d6e5e39d6abc3e5b70e206eec1d37144496ecb4df8a87a SHA512 c7e22900976d09f03403250b2edcc51a840129a2fa3c4aef9632369c43f1bf81e36ae87b52a96d9fac3db6aba0aee518bd0e7ba9f3ad6cbf520c84d3122883fa +EBUILD nmap-7.80-r1.ebuild 3281 BLAKE2B d277a1597097ea347b9db3df69f31bb6066026be423700713465eed02ae248f8f74d3551676eca6c187568ff349989151cbfd67fac3f206ec73d05cc6c8011cd SHA512 01f28d2fce6ddb1b59fd6b7004b153e0ecbd8683b34531fae2d4c27ab7cd4f1a6a122244af4dafe76b9e58615283da89dd15259458ae39440b078ca071e7579f +EBUILD nmap-7.80-r2.ebuild 3404 BLAKE2B b180659a51f2083041e8171220661b4ac917a9244717baf740a7d4b664e7f3ddf023dae8cc24518e672d6dd55dffff5fb4633946d0128cfa506239237a7ee5ff SHA512 9efcc8d4a1ab4dfd65bae55ce7a670c5d79b9afd1f920635975af40cd566f0717ceeb1af5d387d71a71082cf431012de722d93fdb8e87318c35ca962ef62d4a9 +EBUILD nmap-7.91-r1.ebuild 2805 BLAKE2B 00d6834383ed8847adb5076cfd77a5196798d79f50ff0fa2f7852b654f7d4117db1d598597abbbef075ced5e971e5eb6bc015ca5a05f9960817e1fce17778f65 SHA512 af5e870b4748c2a0273ba79b074b0c7e23d40350cfa70de7314a066556d94b09637ada85606c7c9fb52f36619cd525d04153facf1f569d3f4940ac8bff75a8cd EBUILD nmap-7.91.ebuild 2682 BLAKE2B 823a879c2be6f0af191bad0def13abb115803983e7c53c03e7fd301378424c93ceab6e389ce9978c4382b1e8def9ec1dc3a1cba5b056d51937cfb2ee07a91162 SHA512 b5cee4212391eae167b987ec441fb00464827e042f4783e4fb82b6455bb2d842a6b13bc168f4446a0add7e5f144c9c804c9a2b6c79dd951f8f6e10251ca134c9 -EBUILD nmap-9999.ebuild 2600 BLAKE2B 4083277666f8b3806e35b4d9abc5a85a1df81cb37d5dc2abf5b1fed0d46fdbee5bc411523ef273ebd9363a0bcbec539ca9028ea6db1d1c6e07dd15710c76aed7 SHA512 61b17ca127dd806c5191a07c58fd35379db5fd2f5878f513791b9cca2ad703c7190e3db900e5360c8c7fa441dbd38df9cbfeafaf4be0f609aef0da4ddc540ecd +EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824 MISC metadata.xml 1012 BLAKE2B b759966f2b8f8beab43c892441824430605fdd2fda075af8a0fbeebdec6bc781496ca4da93767265a18727d35d287f53ab00da17ac30ca7fec83e01d5cd251c0 SHA512 238dbddb537409cd4f3ff2f0146f3b917206209cd87435cb495eb8f12807b5df91e210f28d2a60326fd3a2bcf02068fd3b1dddca2b2a8874db91956bd7d9781d diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild index baade24ff440..a70d5648057b 100644 --- a/net-analyzer/nmap/nmap-7.80-r1.ebuild +++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua" REQUIRED_USE="system-lua? ( nse )" diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild new file mode 100644 index 000000000000..7b40515497d4 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2020 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 desktop flag-o-matic lua-single toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="ipv6 libressl libssh2 ncat nmap-update 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 + ) + nmap-update? ( + dev-libs/apr + dev-vcs/subversion + ) + nse? ( sys-libs/zlib ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + system-lua? ( ${LUA_DEPS} ) +" +DEPEND="${RDEPEND}" + +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-no-FORTIFY_SOURCE.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 +) + +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 + # Fix desktop files wrt bug #432714 + sed -i \ + -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ + zenmap/install_scripts/unix/zenmap-root.desktop \ + zenmap/install_scripts/unix/zenmap.desktop || 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) \ + --without-ndiff \ + $(use_with nmap-update) \ + $(use_with nping) \ + $(use_with ssl openssl) \ + --without-zenmap \ + $(usex libssh2 --with-zlib) \ + $(usex nse --with-zlib) \ + $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ + --cache-file="${S}"/config.cache \ + --with-libdnet=included \ + --with-pcre=/usr + # Commented out because configure does weird things + # --with-liblinear=/usr \ +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src \ + $(usex ncat ncat '') \ + $(usex nmap-update nmap-update '') \ + $(usex nping nping '') + do + emake -C "${directory}" makefile.dep + done + + emake \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) +} + +src_install() { + LC_ALL=C emake -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + if use nmap-update;then + LC_ALL=C emake -j1 \ + -C nmap-update \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + fi + + dodoc CHANGELOG HACKING docs/README docs/*.txt +} diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild new file mode 100644 index 000000000000..3b611d01445e --- /dev/null +++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2020 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 flag-o-matic lua-single toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + +LICENSE="NPSL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="ipv6 libressl 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? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + system-lua? ( ${LUA_DEPS} ) +" +DEPEND="${RDEPEND}" + +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=/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() { + 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 00bb4385aaa9..782f91bf13e1 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -2,7 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic git-r3 toolchain-funcs + +LUA_COMPAT=( lua5-3 ) +LUA_REQ_USE="deprecated" + +inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" @@ -11,8 +15,8 @@ EGIT_REPO_URI="https://github.com/nmap/nmap" LICENSE="NPSL" SLOT="0" -IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" -REQUIRED_USE="system-lua? ( nse )" +IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" +REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" RDEPEND=" dev-libs/liblinear:= @@ -27,7 +31,7 @@ RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) + system-lua? ( ${LUA_DEPS} ) " DEPEND="${RDEPEND}" @@ -44,6 +48,10 @@ PATCHES=( "${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 @@ -75,7 +83,7 @@ src_configure() { $(use_with nping) \ $(use_with ssl openssl) \ $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ + $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ $(usex nse --with-zlib) \ --cache-file="${S}"/config.cache \ --with-libdnet=included \ -- cgit v1.2.3