From eb509e1a15f595f667e8d177ddb73311084af6c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 May 2023 20:55:01 +0100 Subject: gentoo auto-resync : 21:05:2023 - 20:55:01 --- net-analyzer/Manifest.gz | Bin 42748 -> 42743 bytes net-analyzer/nmap/Manifest | 6 +- net-analyzer/nmap/nmap-7.94.ebuild | 184 +++++++++++++++++++++++++++++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 23 ++--- 4 files changed, 201 insertions(+), 12 deletions(-) create mode 100644 net-analyzer/nmap/nmap-7.94.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 2c0a90fa0d1c..e5fb1bc081f2 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 e975e106f48a..aa285d43be9a 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -14,7 +14,11 @@ 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 +DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5 +DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c +DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec 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 +EBUILD nmap-7.94.ebuild 4189 BLAKE2B 104191edd549470e39b4f7062b288489062ef6d84665f4d453b7e926cbddd4b262ae8dec0416c1fee7a95e942c5b0f4a7c7671ed83184749606ccdef91226c56 SHA512 07fa5468221a8f67d4a753e504b912d948f04ebfab692db969431ecaa4b0c7ec1df72f5b26fb9c5d2e32cfa26cdb37895469bb801cb4a7694d941e275155a52c +EBUILD nmap-9999.ebuild 4189 BLAKE2B 104191edd549470e39b4f7062b288489062ef6d84665f4d453b7e926cbddd4b262ae8dec0416c1fee7a95e942c5b0f4a7c7671ed83184749606ccdef91226c56 SHA512 07fa5468221a8f67d4a753e504b912d948f04ebfab692db969431ecaa4b0c7ec1df72f5b26fb9c5d2e32cfa26cdb37895469bb801cb4a7694d941e275155a52c MISC metadata.xml 888 BLAKE2B 0fa642ab34c24d35347876c96e2ab28de71d153202b14ef551c8222a808218c34fa990857cbc7273ac2551e5fe2d6afc27124a47de979872f46e30b0451d9c56 SHA512 214887e52ca334207125fb3fa534ec8f4ae4d9985c93695e798cf21625b7d3113852a2e835bbcccf833ae01c1e89e8be0ffb31d409db7ebdbc4920c3e3416a6c diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild new file mode 100644 index 000000000000..d1dbe307710b --- /dev/null +++ b/net-analyzer/nmap/nmap-7.94.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{9..11} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools lua-single plocale python-single-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+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + 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.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.94-patches +) + +pkg_setup() { + python-single-r1_pkg_setup + + use nse && lua-single_pkg_setup +} + +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + 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}" + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(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-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +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 + + if use ndiff || use zenmap ; then + python_optimize + fi + + 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 f18840ef8839..d1dbe307710b 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 ) LUA_REQ_USE="deprecated" PYTHON_COMPAT=( python3_{9..11} ) PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" @@ -22,6 +22,7 @@ else inherit verify-sig SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" 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" @@ -78,16 +79,7 @@ if [[ ${PV} != *9999* ]] ; then 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 + "${WORKDIR}"/${PN}-7.94-patches ) pkg_setup() { @@ -96,6 +88,15 @@ pkg_setup() { use nse && lua-single_pkg_setup } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + src_prepare() { default -- cgit v1.2.3