gentoo resync : 15.01.2020

4 files changed, 47 insertions, 1 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fc676140a74b..0bbb5424ca2b 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,10 +9,12 @@ AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
 AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276
 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4
+AUX nmap-9999-constify-continued.patch 801 BLAKE2B a11f5293343ec0d710bfb8648de5b82d5f8d2d10f21e6dcda8ebf963337fedc62248da635b66c956eb64eeb1058b65d4a4ed20e44086c84ae1898fd5c93ff753 SHA512 95f51a1def778ebea9f85a06f3908636b4a849b9e35b027f495da3a37f5293f49046f1f29c778162c8bbb5707e8288a4e37e9362f3310e4fafa238b84ee47af0
+AUX nmap-9999-netutil-else.patch 785 BLAKE2B cfa912b8a31ee26b1c0be2b63e8612794099ea9797a0bfccd56bd6a96b11ff76cb82f9fb4aaae326e845c016d9cf933b431b718b89e14a67c45f7f23d15d1cf0 SHA512 05d61d3ac52b77521fd989ff3f100089ead4af17f1e3654f07b9557b63af92f8a3adc2fccd1be2a4425735018e7f05eda9154c1fe139e3df9d10a874cf418052
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 EBUILD nmap-7.70.ebuild 4511 BLAKE2B 1a5599df259671c105270d6be62aef9d0da5c707da9ec952eea374cfeddb7674dc49d742a7ef1e895f0a13aead05ddf5c310f258f83fe1305a16d7912a95822d SHA512 03f87c2848fc01424b036006ad4628637c4fe57711b79a8dffa4047c65ab4dd8f19f4612e56334cb0aeb711c2eebe9607f14165abce431c72dec96985b92de81
 EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed
-EBUILD nmap-9999.ebuild 4269 BLAKE2B bb6b027fa1ec70811bee19603285f470b58efa83f93bd7d6ff3470363b12731b54b15709b95738a000935cfab04d5866cefafc2ffd0788a3dbeb09f0bb695e9f SHA512 ee859d47d92d21cfe8c0e0bcc24063229eb52ebce081aa6e3b3df420f7ce41e310ba1b21e50573801f728858b449eef0f882ddbc54dc085660f57093d4a62f0e
+EBUILD nmap-9999.ebuild 4365 BLAKE2B 4cefc1c460a5f0988831a3a4f966cf9ba7f235d54deb3a67a444e6b7b5f63a7e8214bfef9c830ec2bde3f7507acf552a15b6dd5c275f8d732ed5fe39d4f62e17 SHA512 5750c06832dac64095e4956c799ce9e93a12632574ed5be759b690fc0c7dff29209302168c28884e0252449aa8ebcf183cfad473ed3a313dcde857ec861e1138
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
new file mode 100644
index 000000000000..04738f408231
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 000000000000..a96a04b7a87f
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
@@ -0,0 +1,20 @@
+--- a/libnetutil/netutil.cc
++++ b/libnetutil/netutil.cc
+@@ -2571,7 +2571,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
+ 
+     /* CASE 4: where we (finally!) have a full 20 byte TCP header so we can
+      * safely print all fields */
+-    else { /* if (datalen >= 20) */
++    else if (datalen >= 20) {
+ 
+       /* 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. */
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 4c5cd498f494..c45c2c6b4ce3 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -66,6 +66,8 @@ 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}"