From 175512fa7c74d0e48a7a1b40a6e456435af0481b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 Jan 2023 23:47:29 +0000 Subject: gentoo auto-resync : 12:01:2023 - 23:47:29 --- net-analyzer/nmap/Manifest | 6 +- net-analyzer/nmap/nmap-7.92-r2.ebuild | 2 +- net-analyzer/nmap/nmap-7.93-r1.ebuild | 152 ---------------------------------- net-analyzer/nmap/nmap-7.93-r2.ebuild | 152 ++++++++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 2 +- 5 files changed, 157 insertions(+), 157 deletions(-) delete mode 100644 net-analyzer/nmap/nmap-7.93-r1.ebuild create mode 100644 net-analyzer/nmap/nmap-7.93-r2.ebuild (limited to 'net-analyzer/nmap') diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index e3912bc00cc6..1f6e80a18750 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 3306 BLAKE2B 439f5bbdc6d54397f1503520087617a619512f8733785c039fbdc5b83e48552ac5cb2097bbb7037d503ec4616ee93f19a09233c270af3a401bd5e2bf54a03581 SHA512 b3b53ece32544d1c9c6919a7cb4bf4e010074519ab18e5cd3da29a702b5ee469a8f6706a4a29adcfb2bc9c1bfeccc583dbe3357a879dc67357795914228cfb2e -EBUILD nmap-7.93-r1.ebuild 3633 BLAKE2B aee215d9ce254a5610a9125cf791a9f12bf1e76639d2a5729503b3a268b1fb8861660d5fa0e9fd6909e686a30ad9ff8348b380cbf6dd65f20c9ef0cc12fcc1a7 SHA512 b8538b502eb8a6440d8cb026e53e71c91d41cc9479be797f58dfe81119153f226f1c0c2a993b6410fd1007ed0d8a41feb4a61d01636c78a963dcfa3051509a7d -EBUILD nmap-9999.ebuild 4351 BLAKE2B 2d71061683b6bd23b68145c5d46cf04b2193ebdfb31ca868c84cc0ea8520ea48a773b78f22c91511802681dd8bb409ca275cfbd8c3fc26e358cdcb547bad4a69 SHA512 570ba9556d9e52fd1b390890c2ad41dde0dec1f044c72d2fdec4b0530b98d51bcbc0a16c27fcf2fc61763c951d326e64cbcd852ef33319e50ca02faf840dd4bb +EBUILD nmap-7.92-r2.ebuild 3316 BLAKE2B 12da03bd72fe53a0063de4995ee87d394d4f7a5ef68efa44b974d05f4d0971ab4f160ee413870525c0099c6bf595e5a6d5098c780da1a488ea5b06a43f77cad7 SHA512 3a7977e65568b7ad7f42c5cb0853cefbdd0bc0cb842ed6df307cadea4e1eddad6ed78cb946e8956387f1bb23cd596a6a18a35ad54e1f5161561f762f9e6185c3 +EBUILD nmap-7.93-r2.ebuild 3650 BLAKE2B c0d14d7fe75f28ab6d61ced0adfe43aee269f2a0ba47a574c95c9b4f1b01fe11fb687417925d11dcd737859132dd6bd082392cf07b0f45eb48cffc377a656486 SHA512 f90f8ecd4eb2640443637927f7ec18a69cfcacdcdf0e0c65e0c324d266c4e2c33688928633d094878258382e45f1915bcdb21960f2a7b8244f727ae894828c4b +EBUILD nmap-9999.ebuild 4351 BLAKE2B 12c8e6729c4ff9eeda524721520a4fc92807df2c688cf63657ce3bbb90e94c6d7478acb5443ff6177383d4189db2623fc3ff9d2dd4f99afa5547d4954fd143a8 SHA512 fb42789d9418fcfca12b08de2de770c49ac7f683a17190a12f299e0eb2579ad6e58b791a62308e3526f9d40ad95bcf9301afbdcac615945e622a053a3c7a0087 MISC metadata.xml 1087 BLAKE2B f447e02d4a3be7c9674d8352a9bd1a6bb6bf359b2e2581bdea4815be05b687a69cecf10c88943a2359f5b8374bf59aec9813a120c4fb03ffca770fabc30addbf SHA512 35f0ae4c95db6f3d6654d6b36912e725d944bc510260ba3581f39c0f5ff1247b7deebadb9402ef146051f08fa1f50a3f5b663df16a78ef48fc1c9f4fd74a1e9c diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild index b048ac202f48..2c418afbe2a5 100644 --- a/net-analyzer/nmap/nmap-7.92-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild @@ -22,7 +22,7 @@ else 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 GPL-2 )" + LICENSE="|| ( NPSL-0.92 NPSL-0.95 GPL-2 )" fi SLOT="0" diff --git a/net-analyzer/nmap/nmap-7.93-r1.ebuild b/net-analyzer/nmap/nmap-7.93-r1.ebuild deleted file mode 100644 index 58b6435c8550..000000000000 --- a/net-analyzer/nmap/nmap-7.93-r1.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_{8..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" -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-r2.ebuild b/net-analyzer/nmap/nmap-7.93-r2.ebuild new file mode 100644 index 000000000000..fd0f89bab51f --- /dev/null +++ b/net-analyzer/nmap/nmap-7.93-r2.ebuild @@ -0,0 +1,152 @@ +# 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_{8..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-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 103c09dbfcaf..446c5f2db922 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -28,7 +28,7 @@ else fi # https://github.com/nmap/nmap/issues/2199 -LICENSE="NPSL-0.94" +LICENSE="NPSL-0.95" SLOT="0" IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap" REQUIRED_USE=" -- cgit v1.2.3