From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C0C7138350 for ; Wed, 5 Feb 2020 12:28:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38F25E0A5E; Wed, 5 Feb 2020 12:28:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F185E0A5E for ; Wed, 5 Feb 2020 12:28:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C581434E605 for ; Wed, 5 Feb 2020 12:28:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4643B0 for ; Wed, 5 Feb 2020 12:28:49 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1580905728.2ba4a5ba2151f6960d6a2c7c5df318ecc6994075.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/files/nmap-9999-constify-continued.patch net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/files/ net-analyzer/nmap/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 2ba4a5ba2151f6960d6a2c7c5df318ecc6994075 X-VCS-Branch: master Date: Wed, 5 Feb 2020 12:28:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d103a90b-1091-48e0-bb39-eabeab114214 X-Archives-Hash: 656a663501d8ea87dd9d57c6d8d9e201 commit: 2ba4a5ba2151f6960d6a2c7c5df318ecc6994075 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 5 12:28:26 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Feb 5 12:28:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba4a5ba net-analyzer/nmap: Drop obsolete patch Package-Manager: Portage-2.3.87, Repoman-2.3.20 Fixes: 4db35b3a2131c1973835b865106d3034d2e0635a Signed-off-by: Jeroen Roovers gentoo.org> .../nmap/files/nmap-9999-constify-continued.patch | 22 ---------------------- net-analyzer/nmap/nmap-9999.ebuild | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) 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 04738f40823..00000000000 --- 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 c45c2c6b4ce..e5440fa3e63 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}"