commit: dcd047efaa0460385bc7a93d99b8ed7f0510bb5c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 17 16:39:00 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 17 16:39:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd047ef
net-analyzer/nmap: drop 7.80-r2, 7.91-r2 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nmap/Manifest | 3 - .../nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch | 77 ------------ net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch | 37 ------ .../nmap/files/nmap-7.91-ncat-unix-sockets.patch | 30 ----- net-analyzer/nmap/nmap-7.80-r2.ebuild | 134 --------------------- net-analyzer/nmap/nmap-7.91-r2.ebuild | 132 -------------------- 6 files changed, 413 deletions(-) diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 335efc4b01d6..49819935ca25 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,5 +1,2 @@ -DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b -DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d -DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch deleted file mode 100644 index 85594038bf6f..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/nbase/Makefile.in -+++ b/nbase/Makefile.in -@@ -12,7 +12,7 @@ - CCOPT = - DEFS = @DEFS@ - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) - STATIC = ---- a/ncat/Makefile.in -+++ b/ncat/Makefile.in -@@ -53,7 +53,7 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) - RM = rm -f - STRIP = @STRIP@ ---- a/nsock/src/Makefile.in -+++ b/nsock/src/Makefile.in -@@ -13,7 +13,7 @@ - CCOPT = - DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I../include - CFLAGS = @CFLAGS@ $(CCOPT) - # CFLAGS = -g -Wall $(DEFS) $(INCLS) ---- a/libnetutil/Makefile.in -+++ b/libnetutil/Makefile.in -@@ -5,7 +5,7 @@ - CXXFLAGS = @CXXFLAGS@ - CPPFLAGS = @CPPFLAGS@ $(DEFS) - DEFS = @DEFS@ --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - AR = ar - RANLIB = @RANLIB@ - ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nping/Makefile.in -+++ b/nping/Makefile.in -@@ -38,7 +38,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nmap-update/Makefile.in -+++ b/nmap-update/Makefile.in -@@ -12,7 +12,7 @@ - LDFLAGS = @LDFLAGS@ - MAC_FLAGS = - LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS) --DEFS = @DEFS@ -D_FORTIFY_SOURCE=2 -+DEFS = @DEFS@ - APR_LIBS = @APR_LIBS@ - SVN_LIBS = @SVN_LIBS@ - diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch deleted file mode 100644 index 513c7fbd418f..000000000000 --- a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/770808 -https://github.com/nmap/nmap/commit/169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 - -From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001 -From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419> -Date: Thu, 19 Nov 2020 17:34:24 +0000 -Subject: [PATCH] Restore call to post_connect in non-ssl case. Fixes #2149 - ---- - ncat/ncat_connect.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c -index 606eac412f..f59dd4372f 100644 ---- a/ncat/ncat_connect.c -+++ b/ncat/ncat_connect.c -@@ -1064,12 +1064,17 @@ int ncat_connect(void) - bye("Failed to set hostname on iod."); - if (o.ssl) - { -+ /* connect_handler creates stdin_nsi and calls post_connect */ - nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, o.conntimeout, NULL, NULL); - } -+ else -+ { -+ /* Create IOD for nsp->stdin */ -+ if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) -+ bye("Failed to create stdin nsiod."); - -- /* Create IOD for nsp->stdin */ -- if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) -- bye("Failed to create stdin nsiod."); -+ post_connect(mypool, cs.sock_nsi); -+ } - } - - /* connect */ diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch deleted file mode 100644 index f617fd4b134c..000000000000 --- a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/765148 -https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323 - -From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001 -From: nnposter <nnposter@e0a8ed71-7df4-0310-8962-fdc924857419> -Date: Fri, 16 Oct 2020 02:54:52 +0000 -Subject: [PATCH] Fix a Unix domain socket crash. Fixes #2154 - -diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c -index 8942d83cb9..2792a6ac24 100644 ---- a/ncat/ncat_main.c -+++ b/ncat/ncat_main.c -@@ -846,7 +846,7 @@ int main(int argc, char *argv[]) - targetaddrs->addr.un.sun_family = AF_UNIX; - strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path)); - targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } else - #endif -@@ -865,7 +865,7 @@ int main(int argc, char *argv[]) - targetaddrs->addr.vm.svm_cid = long_cid; - - targetaddrs->addrlen = sizeof(targetaddrs->addr.vm); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } - } else diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild deleted file mode 100644 index 1734ec441e00..000000000000 --- a/net-analyzer/nmap/nmap-7.80-r2.ebuild +++ /dev/null @@ -1,134 +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/"; -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" -IUSE="ipv6 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? ( dev-libs/openssl:0= ) - 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-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild deleted file mode 100644 index 1af1818ce083..000000000000 --- a/net-analyzer/nmap/nmap-7.91-r2.ebuild +++ /dev/null @@ -1,132 +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 )" - - LICENSE="|| ( NPSL GPL-2 )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -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 - "${FILESDIR}"/${P}-ncat-proxy.patch - "${FILESDIR}"/${P}-ncat-unix-sockets.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 -}
