diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /net-analyzer/nmap | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r-- | net-analyzer/nmap/Manifest | 5 | ||||
-rw-r--r-- | net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch | 37 | ||||
-rw-r--r-- | net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch | 30 | ||||
-rw-r--r-- | net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 | ||||
-rw-r--r-- | net-analyzer/nmap/nmap-7.91-r2.ebuild | 118 |
5 files changed, 190 insertions, 2 deletions
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 685d639e9a67..fc12a1e376e5 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -8,11 +8,14 @@ AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4 +AUX nmap-7.91-ncat-proxy.patch 1358 BLAKE2B 8b0128a47edcc67ab2df796489394e812bafd8c761a9137eafaa1547d0a6f97b76e5d9c36df59a487ce2f6a6a4b6faf54f55956fcb9942afd8912dfd27116467 SHA512 ef4236831d4497efdd59bbab1ed4a05c9c955d5a5992ab091dd9594545969c3d89abb4e1a1ff2667b4cc2afab8d7ac388ec85d304217a036936a1e604a930bd0 +AUX nmap-7.91-ncat-unix-sockets.patch 1241 BLAKE2B 6232fc69b5c1f3a93c2d25b5eb2a80e8d56741d1f7519dd6583930601b0715f82b41341c04659e6fd36242134f7a34b2c8d87987c2c31162742e24c73594d6a5 SHA512 79e8ac5cf44a2e744cafc19a63ec9f19f55103031d349595fac077bed0ccd389d548ed13b7606ad2150c1a011d661c3a26ea2dc2b96ff654d8976dcebd68aa6a AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86 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-r2.ebuild 3386 BLAKE2B fd3b88003aaab420a29745a407f07ec1a295eb47def0843a16acd3e6202068a4b3d32cb6129ee4c969c4c5c0791213e8b220e8f21332efab6425c68ae2a35e2e SHA512 df22d7061dec12102a3e3b42aac686144dc43d1a5208e5712af03e247b50d91a71c24caffe951d6ab8ff8d309443dd3f2a143d3007ecab3155a352df494a011b -EBUILD nmap-7.91-r1.ebuild 2787 BLAKE2B 09a5c9e50b10688a700c4721a92dd501a1314e8a2b5d7655ce9eee614a9de8b260e420a46fd7e2a4674417f3caae7b87e3bcd58ab0aa0475b0f4b08f8a8c061b SHA512 a49f565239fe7d4e749ae3bdab9df84d29099ca8311626266eaa572fbebd5e579d5151cb06c836ef92ac81d4fdc2cd48d35210d5c8c61d9d71f7cd20f180b8eb +EBUILD nmap-7.91-r1.ebuild 2800 BLAKE2B 593cdae269404efedf60ba475a0e9ad5d66bfd9310345daefad33bb7ac426bcab47528bcd514a5c2fce2c3aa2bc993d261dcbbb70f12d5d7106d1468722d9ee2 SHA512 74ad16d193833aa98abea4e236b8a684aabf5ad79945b0c3c9770f573531186d544a499582f2a12774a17f0e46850a711e7a1ce6e04887fc8b6a0233d31e32ae +EBUILD nmap-7.91-r2.ebuild 2888 BLAKE2B f4f835da004889bcb8de59411cb8eadd04f495ff7140fe3b6c11fbb243684139bf8a30c1aa12629c47e8a77938d11d5886b60cabc066d7779184bf2bbed517be SHA512 ebf3a616faf1e43d8b9494d2e74dd87223a0b66b9adde04e5c1b4b6ff448f15ccbd9dacd706f4155f3373a952869bc7a6ce66aaafac39204b66b74fcb2676cbf EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48 diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch new file mode 100644 index 000000000000..513c7fbd418f --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 000000000000..f617fd4b134c --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch @@ -0,0 +1,30 @@ +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.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild index 610bd50821a6..8b08d910d677 100644 --- a/net-analyzer/nmap/nmap-7.91-r1.ebuild +++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" SRC_URI="https://nmap.org/dist/${P}.tar.bz2" -LICENSE="NPSL" +LICENSE="|| ( NPSL 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 libressl libssh2 ncat nping +nse ssl +system-lua" diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild new file mode 100644 index 000000000000..09c622523f36 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 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 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 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 + "${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 +} |