gentoo resync : 05.02.2020

2 files changed, 0 insertions, 31 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 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/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
index a96a04b7a87f..c9b3350d9865 100644
--- a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
+++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
@@ -9,12 +9,3 @@
  
        /* TCP Flags */
        p = tflags;
-@@ -2633,7 +2633,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
-           (tcpoptinfo[0]!='\0') ? " " : "",
-           tcpoptinfo, ipinfo);
-       }
--    } else{
-+    } else {
-       /* If the packet does not fall into any other category, then we have a
-          really screwed-up packet. */
-       /* This ought to be unreachable; if static analysis flags it as such, delete it. */