commit: e96b131c7c5036490685986a33d4711e601e3385 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Apr 27 04:36:32 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 30 04:38:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96b131c
net-analyzer/nmap: add 7.95 Closes: https://bugs.gentoo.org/916709 Closes: https://bugs.gentoo.org/927775 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nmap/Manifest | 4 ++- .../nmap/{nmap-9999.ebuild => nmap-7.95.ebuild} | 37 ++++++++++++++++------ net-analyzer/nmap/nmap-9999.ebuild | 37 ++++++++++++++++------ 3 files changed, 59 insertions(+), 19 deletions(-) diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 49124d2a35a6..633b02eaf585 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,4 +1,6 @@ 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 -DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c SHA512 3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2 +DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd +DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e +DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092 diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild similarity index 88% copy from net-analyzer/nmap/nmap-9999.ebuild copy to net-analyzer/nmap/nmap-7.95.ebuild index 043bcfa6f516..0fa4d25ff5fa 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-7.95.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 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_{10..11} ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) 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 +inherit autotools distutils-r1 lua-single plocale toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/"; @@ -27,7 +30,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz"; +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"; # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" @@ -73,6 +76,7 @@ BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) " if [[ ${PV} != *9999* ]] ; then @@ -80,12 +84,10 @@ if [[ ${PV} != *9999* ]] ; then fi PATCHES=( - "${WORKDIR}"/${PN}-7.95-patches + "${WORKDIR}"/${PN}-7.95-patches-2 ) pkg_setup() { - python-single-r1_pkg_setup - use nse && lua-single_pkg_setup } @@ -134,6 +136,8 @@ src_configure() { export ac_cv_path_PYTHON="${PYTHON}" export am_cv_pathless_PYTHON="${EPYTHON}" + python_setup + local myeconfargs=( $(use_enable ipv6) $(use_enable nls) @@ -166,6 +170,17 @@ src_compile() { emake \ AR="$(tc-getAR)" \ RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default } src_install() { @@ -179,9 +194,13 @@ src_install() { dodoc CHANGELOG HACKING docs/README docs/*.txt - if use ndiff || use zenmap ; then + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then python_optimize fi - use symlink && dosym /usr/bin/ncat /usr/bin/nc + if use zenmap ; then + distutils-r1_src_install + fi } diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 043bcfa6f516..0fa4d25ff5fa 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 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_{10..11} ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) 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 +inherit autotools distutils-r1 lua-single plocale toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/"; @@ -27,7 +30,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz"; +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"; # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" @@ -73,6 +76,7 @@ BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) " if [[ ${PV} != *9999* ]] ; then @@ -80,12 +84,10 @@ if [[ ${PV} != *9999* ]] ; then fi PATCHES=( - "${WORKDIR}"/${PN}-7.95-patches + "${WORKDIR}"/${PN}-7.95-patches-2 ) pkg_setup() { - python-single-r1_pkg_setup - use nse && lua-single_pkg_setup } @@ -134,6 +136,8 @@ src_configure() { export ac_cv_path_PYTHON="${PYTHON}" export am_cv_pathless_PYTHON="${EPYTHON}" + python_setup + local myeconfargs=( $(use_enable ipv6) $(use_enable nls) @@ -166,6 +170,17 @@ src_compile() { emake \ AR="$(tc-getAR)" \ RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default } src_install() { @@ -179,9 +194,13 @@ src_install() { dodoc CHANGELOG HACKING docs/README docs/*.txt - if use ndiff || use zenmap ; then + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then python_optimize fi - use symlink && dosym /usr/bin/ncat /usr/bin/nc + if use zenmap ; then + distutils-r1_src_install + fi }
