commit: 357253b38a46dce4aa13a6b419eed78b486ea350
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 06:44:02 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 06:44:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357253b3
net-analyzer/ntopng: fixed bug 634104
Applying patch sent by zoltan <AT> sinustrom.info
This patch is solving problem with pointer comparison
Reported by: fkrogh <AT> mathalacarte.com
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-analyzer/ntopng/files/pointer-cmp.patch | 12 ++++++++++++
net-analyzer/ntopng/ntopng-3.0-r1.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch
b/net-analyzer/ntopng/files/pointer-cmp.patch
new file mode 100644
index 00000000000..11fb47ca385
--- /dev/null
+++ b/net-analyzer/ntopng/files/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/ntopng-3.0-r1.ebuild
b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
index 3fe29fa7818..3470ef4dea2 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-mysqltool.patch
+ "${FILESDIR}"/${P}-pointer-cmp.patch
)
src_prepare() {
