From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- net-analyzer/ntopng/Manifest | 6 +++--- net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch | 12 ++++++++++++ net-analyzer/ntopng/files/pointer-cmp.patch | 12 ------------ 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch delete mode 100644 net-analyzer/ntopng/files/pointer-cmp.patch (limited to 'net-analyzer/ntopng') diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 7a68f06442eb..374b15b100f7 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -3,11 +3,11 @@ AUX ntopng-2.4-dont-build-ndpi.patch 391 BLAKE2B 71db7d2236b51f6fd6933def076e404 AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6c9895310bd084d3906307fe36247a549128284a6249dd1034f87a7f138370567fb64b16ae4c1d8b624ca08da204 SHA512 9ade5fb4e8a9f9b205327d482670b87fa249ab375be3414801e46ac34f1204605be4530326836b1ded48e9a63f38d0fecaf047cde09650e380495257a0e0832a AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5 +AUX ntopng-3.0-pointer-cmp.patch 525 BLAKE2B 67e9038c49caeb8ca61cd48850f8d78c6c52a13b9768c390091e88563999ba28966b995dc10cdaff6ee5727d284dd90b9f125dc616a3bc41ad9e5872e7ce1c5a SHA512 17b3b230a94b4693aee6cb25219b6cc102d49d3029796646630e83a37db9a7417686defe810c524422e0dfc9367f2a776ca1d67dc84ed32182ff263e2e737c5b AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 -AUX pointer-cmp.patch 525 BLAKE2B 67e9038c49caeb8ca61cd48850f8d78c6c52a13b9768c390091e88563999ba28966b995dc10cdaff6ee5727d284dd90b9f125dc616a3bc41ad9e5872e7ce1c5a SHA512 17b3b230a94b4693aee6cb25219b6cc102d49d3029796646630e83a37db9a7417686defe810c524422e0dfc9367f2a776ca1d67dc84ed32182ff263e2e737c5b -DIST ntopng-2.4.tar.gz 134074662 SHA256 f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355 SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a WHIRLPOOL ba5d9fce207d1a89e5c8b35705b0aaeb66235153b91eaf7a84b1c50bcb4b897f992c81aa7fd316ad2d87458cdfdcd4d63de37d0a00375706a036f491ba448c7b -DIST ntopng-3.0.tar.gz 23017655 SHA256 3780f1e71bc7aa404f40ea9b805d195943cdb5095d712f41669eae138d388ad5 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 WHIRLPOOL 21351cd8e658826ac3bfe91e6817d4daef609f86655a2c645afcdc1eb3ec24ef3c92c99574363b2d15706abf9a7277489453fc8a2a4ff3ec625284a458ff643a +DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a +DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 EBUILD ntopng-2.4.ebuild 1721 BLAKE2B 8dd44c4a4889a5d1b448cc708ff3289f1829ce4c9aeb93b094935142e7d56a12beb8db97b66f3dc57704e6826a3e77dc4d71d9086fd56d5eb0c6e8a06abd3ad0 SHA512 3364607a3207a0997876898cfd17608c001d5576255877b4748de2eb8bb68dcdd995a1213684d5ec25389b68da9c8607b9674484178cfb3099f6e7e482df5f86 EBUILD ntopng-3.0-r1.ebuild 1575 BLAKE2B a509af2e9fc3b46deff00f1fddd605253816ea8d5cf8b42a6ae7be89720c110fb99452925bf612288779167a1c9b3585f3bd9c787fa82f038d3c17fa173ce433 SHA512 6dce8ebb056ea90c856381f8f239e48bf5387b0308c97c49cedcb5bb85d51af48d3a8663a36098f2c800f29a8cc31d8922806da3b1084c8b15e62e992bab5090 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996 diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch new file mode 100644 index 000000000000..11fb47ca3853 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch @@ -0,0 +1,12 @@ +diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp +--- ntopng-3.0-orig/src/AddressResolution.cpp 2017-06-01 00:18:57.000000000 -0700 ++++ ntopng-3.0/src/AddressResolution.cpp 2017-11-27 23:13:50.158163187 -0800 +@@ -52,7 +52,7 @@ + u_int numeric_ip_len; + + snprintf(query, sizeof(query), "%s", _numeric_ip); +- if((at = strchr(query, '@')) != '\0') at[0] = '\0'; ++ if((at = strchr(query, '@')) != NULL) at[0] = '\0'; + numeric_ip = query; + numeric_ip_len = strlen(numeric_ip)-1; + diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch b/net-analyzer/ntopng/files/pointer-cmp.patch deleted file mode 100644 index 11fb47ca3853..000000000000 --- a/net-analyzer/ntopng/files/pointer-cmp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp ---- ntopng-3.0-orig/src/AddressResolution.cpp 2017-06-01 00:18:57.000000000 -0700 -+++ ntopng-3.0/src/AddressResolution.cpp 2017-11-27 23:13:50.158163187 -0800 -@@ -52,7 +52,7 @@ - u_int numeric_ip_len; - - snprintf(query, sizeof(query), "%s", _numeric_ip); -- if((at = strchr(query, '@')) != '\0') at[0] = '\0'; -+ if((at = strchr(query, '@')) != NULL) at[0] = '\0'; - numeric_ip = query; - numeric_ip_len = strlen(numeric_ip)-1; - -- cgit v1.2.3