From 2ba4a5ba2151f6960d6a2c7c5df318ecc6994075 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 5 Feb 2020 13:28:26 +0100 Subject: [PATCH] net-analyzer/nmap: Drop obsolete patch Package-Manager: Portage-2.3.87, Repoman-2.3.20 Fixes: 4db35b3a2131c1973835b865106d3034d2e0635a Signed-off-by: Jeroen Roovers --- .../files/nmap-9999-constify-continued.patch | 22 ------------------- net-analyzer/nmap/nmap-9999.ebuild | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 net-analyzer/nmap/files/nmap-9999-constify-continued.patch diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch deleted file mode 100644 index 04738f408231..000000000000 --- a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libnetutil/EthernetHeader.cc -+++ b/libnetutil/EthernetHeader.cc -@@ -284,7 +284,7 @@ int EthernetHeader::setEtherType(u16 val){ - - - /** Returns destination port in HOST byte order */ --u16 EthernetHeader::getEtherType() const { -+const u16 EthernetHeader::getEtherType() const { - return ntohs(this->h.eth_type); - } /* End of getEtherType() */ - ---- a/scan_engine.cc -+++ b/scan_engine.cc -@@ -166,7 +166,7 @@ extern "C" int g_has_npcap_loopback; - #endif - - --int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const { -+const int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const { - const struct sockaddr_storage *lss, *rss; - lss = (lhs) ? lhs->target->TargetSockAddr() : ss; - rss = (rhs) ? rhs->target->TargetSockAddr() : ss; diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index c45c2c6b4ce3..e5440fa3e63e 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,7 +66,6 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-9999-constify-continued.patch "${FILESDIR}"/${PN}-9999-netutil-else.patch ) S="${WORKDIR}/${MY_P}" -- 2.26.2