[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2023-02-03 Thread Sam James 
commit: 25646dfc75b15c2bcc9c80ab3aba7a6bab5eec68
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 16:49:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 16:51:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25646dfc

net-analyzer/ntopng: add 5.4

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest   |  1 +
 .../ntopng/files/ntopng-5.4-ndpi-linking.patch | 49 +++
 net-analyzer/ntopng/ntopng-5.4.ebuild  | 97 ++
 3 files changed, 147 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 7a0c02596f71..7ff71e335ae9 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1 +1,2 @@
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B 
e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b
 SHA512 
01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
+DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 
67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462
 SHA512 
3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb

diff --git a/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch 
b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch
new file mode 100644
index ..8a50b7cb1a10
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch
@@ -0,0 +1,49 @@
+--- a/configure.ac.in
 b/configure.ac.in
+@@ -231,31 +231,8 @@ NDPI_LIB=
+ NDPI_LIB_DEP=
+ 
+ AC_MSG_CHECKING(for nDPI source)
+-  if test -d "./nDPI" ; then :
+- NDPI_HOME=./nDPI
+-  elif test -d "../nDPI" ; then :
+- NDPI_HOME=../nDPI
+-  elif test -d "$HOME/nDPI" ; then :
+- NDPI_HOME=$HOME/nDPI
+-  fi
+-
+-  if test ! -z "$NDPI_HOME" ; then :
+- AC_MSG_RESULT(found in $NDPI_HOME)
+- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
+- AC_MSG_CHECKING(for $NDPI_LIB)
+- if test -r $NDPI_LIB ; then :
+-AC_MSG_RESULT(found $NDPI_LIB)
+- else
+-AC_MSG_RESULT(not found $NDPI_LIB: compiling)
+-cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd -
+- fi
+- NDPI_INC="-I$NDPI_HOME/src/include 
-I$NDPI_HOME/src/lib/third_party/include"
+- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
+- NDPI_LIB_DEP=$NDPI_LIB
+-  else
+- AC_MSG_RESULT(not found)
+-  fi
+-
++  NDPI_LIB="-lndpi"
++  NDPI_LIB_DEP=$NDPI_LIB
+ 
+ if test ! -z "$NDPI_CUST_INC" ; then :
+   NDPI_INC=$NDPI_CUST_INC
+diff --git a/configure.ac.in b/configure.ac.in
+index ed906b1..3e70bec 100644
+--- a/configure.ac.in
 b/configure.ac.in
+@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then :
+   NDPI_LIB=$NDPI_CUST_LIB
+ fi
+ 
+-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then :
++if test -z "$NDPI_LIB" ; then :
+   echo "Could not find nDPI"
+   echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; 
./autogen.sh; ${MAKE}; cd ../ntopng"
+   echo "and try again"

diff --git a/net-analyzer/ntopng/ntopng-5.4.ebuild 
b/net-analyzer/ntopng/ntopng-5.4.ebuild
new file mode 100644
index ..57a01e79f4ab
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/;
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/mysql-connector-c:=
+   dev-db/sqlite:3
+   dev-libs/hiredis:=
+   dev-libs/json-c:=
+   dev-libs/libmaxminddb
+   dev-libs/libsodium:=
+   dev-libs/openssl:=
+   net-analyzer/rrdtool
+   net-libs/libpcap
+   >=net-libs/nDPI-4.6:=
+   =net-libs/zeromq-3:=
+   net-misc/curl
+   sys-libs/libcap
+   sys-libs/zlib"
+RDEPEND="${DEPEND}
+   acct-user/ntopng
+   acct-group/ntopng
+   dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
+   "${FILESDIR}"/${PN}-5.4-ndpi-linking.patch
+)
+
+src_prepare() {
+   default
+
+   # Follows upstream's autogen.sh
+   sed \
+   -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+   -e "s/@SHORT_VERSION@/${PV}/g" \
+   -e "s/@GIT_DATE@/$(date)/g" \
+   -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
+   -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
+   > "${S}/configure.ac" || die
+
+   eautoreconf
+}
+
+src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2022-08-17 Thread Sam James 
commit: 37eb6adfc311553431857cc3f1602143bcf98f1c
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 18 00:29:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 00:30:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37eb6adf

net-analyzer/ntopng: drop 4.2-r1, 5.0

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest   |   2 -
 .../ntopng/files/ntopng-4.0-ndpi-includes.patch|  11 --
 .../ntopng/files/ntopng-4.2-PKG_CONFIG.patch   | 125 -
 .../ntopng/files/ntopng-4.2-mysqltool.patch|  19 
 net-analyzer/ntopng/files/ntopng-4.2-nogit.patch   |  44 
 .../ntopng/files/ntopng-4.2-parallel-make.patch|  16 ---
 net-analyzer/ntopng/ntopng-4.2-r1.ebuild   |  94 
 net-analyzer/ntopng/ntopng-5.0.ebuild  |  92 ---
 8 files changed, 403 deletions(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index c97edb42bb7e..7a0c02596f71 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1 @@
-DIST ntopng-4.2.tar.gz 57554819 BLAKE2B 
a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8
 SHA512 
e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
-DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 
420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f
 SHA512 
e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B 
e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b
 SHA512 
01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd

diff --git a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch 
b/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch
deleted file mode 100644
index d1f61ce52abe..
--- a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/configure.seed
-+++ b/configure.seed
-@@ -134,7 +134,7 @@
- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
-NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
-# Use static libndpi library as building against the dynamic library fails
--   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
-+   NDPI_LIB="$NDPI_LIBS"
-NDPI_LIB_DEP=
-], [
-   AC_MSG_CHECKING(for nDPI source)

diff --git a/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch 
b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
deleted file mode 100644
index 8218c948b178..
--- a/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
+++ /dev/null
@@ -1,125 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -44,9 +44,9 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
- 
- ##
- LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
--HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd && echo 0)
-+HAS_LIBRRDTOOL=$(shell ${PKG_CONFIG} --atleast-version=1.4.8 librrd && echo 0)
- ifeq ($(HAS_LIBRRDTOOL), 0)
--  LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-+  LIBRRDTOOL_INC = $(shell ${PKG_CONFIG} --cflags librrd)
-   LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@
- else
-   LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
-@@ -74,21 +74,21 @@ SNMP_LIB=@SNMP_LIB@
- ##
- 
- ifeq (@NEDGE@, 0)
-- HAS_SODIUM=$(shell pkg-config --exists libsodium && echo 0)
-+ HAS_SODIUM=$(shell ${PKG_CONFIG} --exists libsodium && echo 0)
-  ifeq ($(HAS_SODIUM), 0)
--  SODIUM_INC = $(shell pkg-config --cflags libsodium)
--  SODIUM_LIB = $(shell pkg-config --libs libsodium)
-+  SODIUM_INC = $(shell ${PKG_CONFIG} --cflags libsodium)
-+  SODIUM_LIB = $(shell ${PKG_CONFIG} --libs libsodium)
-  else
-   SODIUM_INC=
-   SODIUM_LIB=
-  endif
- 
-- HAS_ZEROMQ=$(shell pkg-config --exists libzmq && echo 0)
-+ HAS_ZEROMQ=$(shell ${PKG_CONFIG} --exists libzmq && echo 0)
-  ifeq ($(HAS_ZEROMQ), 0)
--  ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
-+  ZEROMQ_INC = $(shell ${PKG_CONFIG} --cflags libzmq)
-   ZMQ_STATIC=/usr/local/lib/libzmq.a
-   ifeq ($(wildcard $(ZMQ_STATIC)),)
--  ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
-+  ZEROMQ_LIB = $(shell ${PKG_CONFIG} --libs libzmq)
-   else
-   ZEROMQ_LIB = $(ZMQ_STATIC)
-   endif
-@@ -98,9 +98,9 @@ ifeq (@NEDGE@, 0)
-   ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
-  endif
- 
-- HAS_ZSTD=$(shell pkg-config --exists libzstd && echo 0)
-+ HAS_ZSTD=$(shell ${PKG_CONFIG} --exists libzstd && echo 0)
-  ifeq ($(HAS_ZSTD), 0)
--  ZSTD_LIB = $(shell pkg-config --libs libzstd)
-+  ZSTD_LIB = $(shell

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2022-02-07 Thread Sam James 
commit: f885f314661f613af15d46b79217b602fed28472
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  8 06:31:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  8 06:31:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f885f314

net-analyzer/ntopng: add 5.2.1

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest   |  1 +
 .../ntopng/files/ntopng-5.2.1-build-system.patch   | 89 
 .../ntopng/files/ntopng-5.2.1-mysqltool.patch  | 17 
 .../ntopng/files/ntopng-5.2.1-ndpi-linking.patch   | 13 +++
 net-analyzer/ntopng/ntopng-5.2.1.ebuild| 97 ++
 5 files changed, 217 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 9a94093e2365..c97edb42bb7e 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-4.2.tar.gz 57554819 BLAKE2B 
a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8
 SHA512 
e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
 DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 
420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f
 SHA512 
e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
+DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B 
e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b
 SHA512 
01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd

diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch 
b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
new file mode 100644
index ..ff05d103f22a
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
@@ -0,0 +1,89 @@
+https://github.com/ntop/ntopng/pull/6288
+
+From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 8 Feb 2022 06:07:21 +
+Subject: [PATCH 1/3] build: fail configure if ZMQ can't be found
+
+We already "fail" (makefile won't be generated) when ZMQ can't be found but
+the exit code doesn't represent this until now.
+
+Signed-off-by: Sam James 
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index b032d7faa34..0b30e9480c7 100644
+--- a/configure.ac.in
 b/configure.ac.in
+@@ -132,7 +132,7 @@ if test "x$ac_cv_lib_zmq_zmq_socket_monitor" = xyes; then :
+   AC_DEFINE_UNQUOTED(HAVE_ZMQ, 1, [ZMQ is present])
+ else
+   echo "ZMQ not present or too old (< v. 3.x)"
+-  exit
++  exit 1
+ fi
+ 
+ AC_CHECK_LIB([sodium], [sodium_init], LIBS="${LIBS} -lsodium")
+
+From 75206e5a3fdc289a2229770595fbf588de79402b Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 8 Feb 2022 06:08:02 +
+Subject: [PATCH 2/3] build: avoid bashism in configure
+
+[[ ]] and == are both Bashisms and /bin/sh may be a POSIX compliant
+shell (Debian notably uses dash for /bin/sh which wouldn't be
+happy with this).
+
+This will continue to work on Bash.
+
+Signed-off-by: Sam James 
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0b30e9480c7..3dc6ef4a539 100644
+--- a/configure.ac.in
 b/configure.ac.in
+@@ -187,7 +187,7 @@ fi
+ 
+ if [ test -f /usr/bin/lsb_release ]; then
+   CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+-  if [[ $CODENAME == "wheezy" ]]; then :
++  if test $CODENAME = "wheezy" ; then
+ CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
+   fi
+ fi
+
+From 6e355cb98078dbfc379ba178ec99b7e351afdfe9 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 8 Feb 2022 06:09:44 +
+Subject: [PATCH 3/3] build: use $(MAKE)
+
+This allows parallel builds to work properly as we'll be calling 'make ...'
+with any additional arguments it internally passes down rather than literally
+just make.
+
+Signed-off-by: Sam James 
+---
+ configure.ac.in | 5 +
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 3dc6ef4a539..3ff06c4efd4 100644
+--- a/configure.ac.in
 b/configure.ac.in
+@@ -720,10 +720,7 @@ fi
+ 
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+ 
+-GMAKE=`which gmake`
+-if test x$GMAKE = x; then
+-  GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+ 
+ GIT=`which git`
+ if test x$GIT = x; then

diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch
new file mode 100644
index ..48551589f022
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2021-04-07 Thread John Helmert III 
commit: 19d49e3700780ece993de9f0a7e418aa09d3a47f
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Apr  6 17:30:36 2021 +
Commit: John Helmert III  gentoo  org>
CommitDate: Wed Apr  7 15:31:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d49e37

net-analyzer/ntopng: bump to 4.2

Bug: https://bugs.gentoo.org/719084
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: John Helmert III  gentoo.org>

 net-analyzer/ntopng/Manifest   |   1 +
 .../ntopng/files/ntopng-4.2-PKG_CONFIG.patch   | 129 +
 .../ntopng/files/ntopng-4.2-mysqltool.patch|  19 +++
 net-analyzer/ntopng/files/ntopng-4.2-nogit.patch   |  44 +++
 .../ntopng/files/ntopng-4.2-parallel-make.patch|  16 +++
 net-analyzer/ntopng/ntopng-4.2.ebuild  |  94 +++
 6 files changed, 303 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index b42fe71c99f..854955fed75 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 
3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742
 SHA512 
4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
 DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 
689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82
 SHA512 
a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9
+DIST ntopng-4.2.tar.gz 57554819 BLAKE2B 
a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8
 SHA512 
e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff

diff --git a/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch 
b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
new file mode 100644
index 000..40d81ad9d2e
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch
@@ -0,0 +1,129 @@
+diff --git a/Makefile.in b/Makefile.in
+index 1435357..38209c7 100755
+--- a/Makefile.in
 b/Makefile.in
+@@ -44,9 +44,9 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
+ 
+ ##
+ LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
+-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd && echo 0)
++HAS_LIBRRDTOOL=$(shell ${PKG_CONFIG} --atleast-version=1.4.8 librrd && echo 0)
+ ifeq ($(HAS_LIBRRDTOOL), 0)
+-  LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
++  LIBRRDTOOL_INC = $(shell ${PKG_CONFIG} --cflags librrd)
+   LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@
+ else
+   LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
+@@ -74,21 +74,21 @@ SNMP_LIB=@SNMP_LIB@
+ ##
+ 
+ ifeq (@NEDGE@, 0)
+- HAS_SODIUM=$(shell pkg-config --exists libsodium && echo 0)
++ HAS_SODIUM=$(shell ${PKG_CONFIG} --exists libsodium && echo 0)
+  ifeq ($(HAS_SODIUM), 0)
+-  SODIUM_INC = $(shell pkg-config --cflags libsodium)
+-  SODIUM_LIB = $(shell pkg-config --libs libsodium)
++  SODIUM_INC = $(shell ${PKG_CONFIG} --cflags libsodium)
++  SODIUM_LIB = $(shell ${PKG_CONFIG} --libs libsodium)
+  else
+   SODIUM_INC=
+   SODIUM_LIB=
+  endif
+ 
+- HAS_ZEROMQ=$(shell pkg-config --exists libzmq && echo 0)
++ HAS_ZEROMQ=$(shell ${PKG_CONFIG} --exists libzmq && echo 0)
+  ifeq ($(HAS_ZEROMQ), 0)
+-  ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
++  ZEROMQ_INC = $(shell ${PKG_CONFIG} --cflags libzmq)
+   ZMQ_STATIC=/usr/local/lib/libzmq.a
+   ifeq ($(wildcard $(ZMQ_STATIC)),)
+-  ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
++  ZEROMQ_LIB = $(shell ${PKG_CONFIG} --libs libzmq)
+   else
+   ZEROMQ_LIB = $(ZMQ_STATIC)
+   endif
+@@ -98,9 +98,9 @@ ifeq (@NEDGE@, 0)
+   ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
+  endif
+ 
+- HAS_ZSTD=$(shell pkg-config --exists libzstd && echo 0)
++ HAS_ZSTD=$(shell ${PKG_CONFIG} --exists libzstd && echo 0)
+  ifeq ($(HAS_ZSTD), 0)
+-  ZSTD_LIB = $(shell pkg-config --libs libzstd)
++  ZSTD_LIB = $(shell ${PKG_CONFIG} --libs libzstd)
+  endif
+ endif
+ 
+diff --git a/configure.seed b/configure.seed
+index a321f9b..f1a7740 100644
+--- a/configure.seed
 b/configure.seed
+@@ -190,10 +190,10 @@ if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then :
+ fi
+ dnl finish: nDPI handling
+ 
+-pkg-config --exists json-c
++${PKG_CONFIG} --exists json-c
+ if test "$?" -ne 1; then
+-  JSON_INC=`pkg-config --cflags json-c`
+-  JSON_LIB=`pkg-config --libs json-c`
++  JSON_INC=`${PKG_CONFIG} --cflags json-c`
++  JSON_LIB=`${PKG_CONFIG} --libs json-c`
+ else
+   echo "Please install libjson-c-dev package prerequisite"
+   exit -1
+@@ -211,11 +211,11 @@ dnl>

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2020-12-26 Thread Marek Szuba 
commit: d35b20af0e1326b05b0ea2e30f0b91934c01fa90
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 27 00:24:38 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 27 00:25:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35b20af

net-analyzer/ntopng: remove 3.8-r1

The oldest of the three versions currently in the tree and the only one
to actually depend on Lua.

Signed-off-by: Marek Szuba  gentoo.org>

 .../ntopng/files/ntopng-3.8-missing-min.patch  | 19 --
 .../ntopng/files/ntopng-3.8-ndpi-call.patch| 12 
 net-analyzer/ntopng/ntopng-3.8-r1.ebuild   | 76 --
 3 files changed, 107 deletions(-)

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
deleted file mode 100644
index 303826a918d..000
--- a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
-+++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
-@@ -31,6 +31,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #include "tcp_connecter.hpp"
- #include "stream_engine.hpp"
-@@ -207,7 +208,7 @@
- options.reconnect_ivl_max > options.reconnect_ivl)
- //  Calculate the next interval
- current_reconnect_ivl =
--min (current_reconnect_ivl * 2, options.reconnect_ivl_max);
-+std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max);
- return interval;
- }
- 

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
deleted file mode 100644
index 1308a5c2c03..000
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/src/NetworkInterface.cpp
-+++ b/src/NetworkInterface.cpp
-@@ -1604,7 +1604,8 @@
- ndpi_protocol icmp_proto = flow->get_detected_protocol();
- 
- if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) {
--  ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr 
*)ip, _proto);
-+  ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr 
*)ip)->saddr,
-+ ((struct ndpi_iphdr*)ip)->daddr, 
_proto);
-   flow->setDetectedProtocol(icmp_proto, false);
- }
-   }

diff --git a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild 
b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
deleted file mode 100644
index 37e007de41e..000
--- a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools user toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/;
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/sqlite:3
-   dev-python/pyzmq
-   dev-lang/luajit:2
-   dev-libs/json-c:=
-   dev-libs/geoip
-   dev-libs/glib:2
-   dev-libs/hiredis
-   dev-libs/libsodium:=
-   dev-libs/libxml2
-   dev-libs/libmaxminddb
-   net-analyzer/rrdtool
-   net-libs/libpcap
-   >=net-libs/nDPI-2.4:=
-   net-misc/curl
-   sys-libs/binutils-libs
-   dev-db/mysql-connector-c:="
-RDEPEND="${DEPEND}
-   dev-db/redis"
-PATCHES=(
-   "${FILESDIR}"/${P}-mysqltool.patch
-   "${FILESDIR}"/${P}-ndpi-includes.patch
-   "${FILESDIR}"/${P}-missing-min.patch
-   "${FILESDIR}"/${P}-ndpi-call.patch
-)
-
-src_prepare() {
-   default
-   sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e 
"s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > 
configure.ac
-   eapply_user
-   eautoreconf
-}
-
-src_install() {
-   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-   dodir ${SHARE_NTOPNG_DIR}
-   insinto ${SHARE_NTOPNG_DIR}
-   doins -r httpdocs
-   doins -r scripts
-
-   dodir ${SHARE_NTOPNG_DIR}/third-party
-   insinto ${SHARE_NTOPNG_DIR}/third-party
-   doins -r third-party/i18n.lua-master
-   doins -r third-party/lua-resty-template-master
-
-   exeinto /usr/bin
-   doexe ${PN}
-   doman ${PN}.8
-
-   newinitd "${FILESDIR}/ntopng.init.d" ntopng
-   newconfd "${FILESDIR}/ntopng.conf.d" ntopng
-
-   dodir "/var/lib/ntopng"
-   fowners ntopng "/var/lib/ntopng"
-}
-
-pkg_setup() {
-   enewuser ntopng
-}
-
-pkg_postinst() {
-   elog "ntopng default credentials are user='admin' password='admin'"
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2020-05-16 Thread Jeroen Roovers 
commit: 7103a4ff70e61ce7c34cd0120b459b86bc092127
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat May 16 11:48:14 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat May 16 11:49:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7103a4ff

net-analyzer/ntopng: Version 4.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Bug: https://bugs.gentoo.org/show_bug.cgi?id=716350
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/ntopng/Manifest   |   1 +
 .../ntopng/files/ntopng-4.0-PKG_CONFIG.patch   | 124 +
 .../ntopng/files/ntopng-4.0-ndpi-includes.patch|  11 ++
 net-analyzer/ntopng/ntopng-4.0.ebuild  |  99 
 4 files changed, 235 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index a4dd46d47f4..73a4c9aaf1b 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 
3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742
 SHA512 
4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B 
a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2
 SHA512 
2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
+DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 
689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82
 SHA512 
a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9

diff --git a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch 
b/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch
new file mode 100644
index 000..cc97d387567
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch
@@ -0,0 +1,124 @@
+--- a/configure.seed
 b/configure.seed
+@@ -182,21 +182,21 @@
+ fi
+ dnl finish: nDPI handling
+ 
+-pkg-config --exists json-c
++${PKG_CONFIG} --exists json-c
+ if test "$?" -ne 1; then
+-  JSON_INC=`pkg-config --cflags json-c`
+-  JSON_LIB=`pkg-config --libs json-c`
++  JSON_INC=`${PKG_CONFIG} --cflags json-c`
++  JSON_LIB=`${PKG_CONFIG} --libs json-c`
+ else
+   echo "Please install libjson-c-dev package prerequisite"
+   exit -1
+ fi
+ 
+ 
+-pkg-config --exists libssl
++${PKG_CONFIG} --exists libssl
+ if test "$?" -ne 1; then
+  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
+- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
++ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl"
++ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto"
+ else
+  dnl Workaround for MacOS Brew
+  if test -d "/usr/local/opt/openssl/lib"; then
+@@ -303,8 +303,8 @@
+ AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT 
Release])
+ AC_DEFINE_UNQUOTED(NTOPNG_GIT_DATE, "${GIT_DATE}", [Last GIT change])
+ 
+-if test -z `which pkg-config`; then
+-   echo "#!/bin/sh\n" > pkg-config
++if test -z `which ${PKG_CONFIG}`; then
++   echo "#!/bin/sh\n" > ${PKG_CONFIG}
+ fi
+ 
+ if test -f ".git/index"; then
+@@ -336,8 +336,8 @@
+ 
+ if test -d "/usr/include/hiredis"; then
+  AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present])
+- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
+- HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis"
++ HIREDIS_INC="`${PKG_CONFIG} --cflags hiredis` -I/usr/include/hiredis"
++ HIREDIS_LIB="`${PKG_CONFIG} --libs hiredis` -lhiredis"
+ else
+  HIREDIS_INC="-I ${PWD}/third-party/hiredis"
+ fi
+@@ -433,7 +433,7 @@
+UGLIFYJS_MAJOR_VERSION="${UGLIFYJS_VERSION%%.*}"
+ fi
+ 
+-AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], 
[LIBRRD_LD_FLAGS=`pkg-config --libs librrd`])
++AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], 
[LIBRRD_LD_FLAGS=`${PKG_CONFIG} --libs librrd`])
+ 
+ AC_CHECK_LIB([nl], [nl_handle_alloc], [LDFLAGS="${LDFLAGS} -lnl"])
+ AC_CHECK_LIB([rt], [clock_gettime],   [LDFLAGS="${LDFLAGS} -lrt"])
+@@ -452,7 +452,7 @@
+ dnl> https://github.com/curl/curl/blob/curl-7_20_0/TODO-RELEASE
+ 
+ AC_MSG_CHECKING(for curl SMTP support)
+-if `pkg-config --atleast-version="7.20.0" libcurl` ; then
++if `${PKG_CONFIG} --atleast-version="7.20.0" libcurl` ; then
+ AC_DEFINE_UNQUOTED(HAVE_CURL_SMTP, 1, [curl supports SMTP])
+   AC_MSG_RESULT(yes)
+ else
+--- a/Makefile.in
 b/Makefile.in
+@@ -45,9 +45,9 @@
+ 
+ ##
+ LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
+-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd && echo 0)

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2020-01-19 Thread Jeroen Roovers 
commit: 6a2c57bb6f4e96b56a7917e05d3fb93c7b973584
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 19 12:58:37 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 19 13:39:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2c57bb

net-analyzer/ntopng: Remove false libzstd dependency

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch  | 12 ++--
 .../{ntopng-3.8.1-r2.ebuild => ntopng-3.8.1-r3.ebuild}   |  0
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch 
b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
index 91811d66bbd..12117d791bc 100644
--- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
@@ -81,15 +81,15 @@
else
ZEROMQ_LIB = $(ZMQ_STATIC)
endif
-@@ -107,9 +107,9 @@
+@@ -106,11 +106,6 @@
+   ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
   endif
- 
+-
 - HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?)
-+ HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd; echo $$?)
-  ifeq ($(HAS_ZSTD), 0)
+- ifeq ($(HAS_ZSTD), 0)
 -  ZSTD_LIB = $(shell pkg-config --libs libzstd)
-+  ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd)
-  endif
+- endif
  endif
  
+ ##

diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild
similarity index 100%
rename from net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
rename to net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2019-12-28 Thread Jeroen Roovers 
commit: befab011ab1f38e37a7b93238e9d0c7071ba725a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 28 12:07:57 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 28 12:08:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befab011

net-analyzer/ntopng: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Bug: https://bugs.gentoo.org/636040
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/ntopng/Manifest   |  2 -
 net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 42 ---
 .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch  | 16 
 .../ntopng/files/ntopng-2.4-mysqltool.patch| 17 -
 net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch  | 60 ---
 .../ntopng/files/ntopng-3.0-mysqltool.patch| 17 -
 .../ntopng/files/ntopng-3.0-pointer-cmp.patch  | 11 ---
 net-analyzer/ntopng/ntopng-2.4-r1.ebuild   | 86 --
 net-analyzer/ntopng/ntopng-3.0-r4.ebuild   | 75 ---
 9 files changed, 326 deletions(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index ecc686e168d..a4dd46d47f4 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,4 +1,2 @@
-DIST ntopng-2.4.tar.gz 134074662 BLAKE2B 
dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da
 SHA512 
515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
-DIST ntopng-3.0.tar.gz 23017655 BLAKE2B 
f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7
 SHA512 
d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 
3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742
 SHA512 
4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B 
a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2
 SHA512 
2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
deleted file mode 100644
index 6de1a43f9b8..000
--- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -341,14 +341,6 @@
-   GMAKE="make"
- fi
- 
--GPP=`which clang++`
--if test x$GPP = x
--then
--  GPP="g++"
--else
--  GPP="$GPP -O0"
--fi
--
- GIT=`which git`
- if test x$GIT = x
- then
 a/Makefile.in
-+++ b/Makefile.in
-@@ -4,7 +4,6 @@
- SHELL=/bin/sh
- OS := $(shell uname -s)
- PWD=@PWD@
--GPP=@GPP@
- INSTALL_DIR=$(DESTDIR)$(prefix)
- MAN_DIR=$(DESTDIR)@MAN_DIR@
- 
-@@ -126,12 +125,12 @@
-   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- %.o: %.cpp $(HEADERS) Makefile
--  $(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- .PRECIOUS: $(TARGET) $(OBJECTS)
- 
- $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
--  $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
-+  $(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
- 
- $(LUAJIT_LIB):
-   cd $(LUAJIT_HOME); @GMAKE@

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
deleted file mode 100644
index ef40c72d589..000
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -62,13 +62,6 @@
- fi
- 
- NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
- if test -d "pro"; then :

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
deleted file mode 100644
index a80e966b85d..000
--- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -302,13 +302,7 @@
- if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
-MYSQLTOOL="mariadb_config"
- else
--   PATH=$PATH:/usr/local/mysql/bin
--   AC_CHECK_TOOL(MYSQL, mysql_config)
--   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
-- MYSQLTOOL="mysql_config"
--   else
--

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2019-12-28 Thread Jeroen Roovers 
commit: 10f1982d276738ad4f4f48d2805eb1ed5b30e713
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 28 10:13:06 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 28 10:14:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f1982d

net-analyzer/ntopng: Version 3.8.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=704058
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/ntopng/Manifest   |  1 +
 .../ntopng/files/ntopng-3.8.1-parallel-make.patch  | 15 
 net-analyzer/ntopng/ntopng-3.8.1.ebuild| 85 ++
 3 files changed, 101 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 8d3e6828dfd..ecc686e168d 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1,4 @@
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B 
dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da
 SHA512 
515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B 
f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7
 SHA512 
d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
+DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 
3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742
 SHA512 
4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B 
a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2
 SHA512 
2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f

diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch 
b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
new file mode 100644
index 000..9089c0a9b04
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
@@ -0,0 +1,15 @@
+--- a/configure.seed
 b/configure.seed
+@@ -526,11 +520,7 @@
+ 
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+ 
+-GMAKE=`which gmake`
+-if test x$GMAKE = x
+-then
+-  GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+ 
+ GIT=`which git`
+ if test x$GIT = x

diff --git a/net-analyzer/ntopng/ntopng-3.8.1.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1.ebuild
new file mode 100644
index 000..0e41d4cf7c9
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.8.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/;
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-db/sqlite:3
+   dev-python/pyzmq
+   dev-lang/luajit:2
+   dev-libs/json-c:=
+   dev-libs/geoip
+   dev-libs/glib:2
+   dev-libs/hiredis
+   dev-libs/libsodium:=
+   dev-libs/libxml2
+   dev-libs/libmaxminddb
+   net-analyzer/rrdtool
+   net-libs/libpcap
+   >=net-libs/nDPI-3.0
+   net-misc/curl
+   sys-libs/binutils-libs
+   dev-db/mysql-connector-c:=
+"
+RDEPEND="
+   ${DEPEND}
+   dev-db/redis
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.8-mysqltool.patch
+   "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch
+   "${FILESDIR}"/${PN}-3.8-missing-min.patch
+   "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch
+)
+
+pkg_setup() {
+   enewuser ntopng
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+   -e "s/@SHORT_VERSION@/${PV}/g" \
+   < "${S}/configure.seed" \
+   > "${S}/configure.ac" || die
+
+   eautoreconf
+}
+
+src_install() {
+   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+   dodir ${SHARE_NTOPNG_DIR}
+   insinto ${SHARE_NTOPNG_DIR}
+   doins -r httpdocs
+   doins -r scripts
+
+   dodir ${SHARE_NTOPNG_DIR}/third-party
+   insinto ${SHARE_NTOPNG_DIR}/third-party
+   doins -r third-party/i18n.lua-master
+   doins -r third-party/lua-resty-template-master
+
+   exeinto /usr/bin
+   doexe ${PN}
+   doman ${PN}.8
+
+   newinitd "${FILESDIR}"/ntopng.init.d ntopng
+   newconfd "${FILESDIR}"/ntopng.conf.d ntopng
+
+   keepdir /var/lib/ntopng
+   fowners ntopng /var/lib/ntopng
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2019-08-26 Thread Slawek Lis 
commit: e4e99e0656d03398959b89cccdd9d1ec8211
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Aug 27 03:42:07 2019 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Aug 27 03:42:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e99e06

net-analyzer/ntopng: version bump to 3.8

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Slawek Lis  gentoo.org>

 net-analyzer/ntopng/Manifest   |  1 +
 .../ntopng/files/ntopng-3.8-missing-min.patch  | 19 ++
 .../ntopng/files/ntopng-3.8-mysqltool.patch| 17 +
 .../ntopng/files/ntopng-3.8-ndpi-call.patch| 12 
 .../ntopng/files/ntopng-3.8-ndpi-includes.patch| 14 
 net-analyzer/ntopng/ntopng-3.8.ebuild  | 76 ++
 6 files changed, 139 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 944ce61a695..8d3e6828dfd 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B 
dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da
 SHA512 
515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B 
f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7
 SHA512 
d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
+DIST ntopng-3.8.tar.gz 33910329 BLAKE2B 
a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2
 SHA512 
2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
new file mode 100644
index 000..303826a918d
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
@@ -0,0 +1,19 @@
+--- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
 b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #include "tcp_connecter.hpp"
+ #include "stream_engine.hpp"
+@@ -207,7 +208,7 @@
+ options.reconnect_ivl_max > options.reconnect_ivl)
+ //  Calculate the next interval
+ current_reconnect_ivl =
+-min (current_reconnect_ivl * 2, options.reconnect_ivl_max);
++std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max);
+ return interval;
+ }
+ 

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
new file mode 100644
index 000..62c328a3505
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.seed
 b/configure.seed
+@@ -355,13 +355,7 @@
+  if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+MYSQLTOOL="mariadb_config"
+  else
+-   PATH=$PATH:/usr/local/mysql/bin
+-   AC_CHECK_TOOL(MYSQL, mysql_config)
+-   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+- MYSQLTOOL="mysql_config"
+-   else
+- MYSQLTOOL=""
+-   fi
++   MYSQLTOOL="mysql_config"
+  fi
+ 
+ if test -n "$MYSQLTOOL"; then

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
new file mode 100644
index 000..1308a5c2c03
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
@@ -0,0 +1,12 @@
+--- a/src/NetworkInterface.cpp
 b/src/NetworkInterface.cpp
+@@ -1604,7 +1604,8 @@
+ ndpi_protocol icmp_proto = flow->get_detected_protocol();
+ 
+ if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) {
+-  ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr 
*)ip, _proto);
++  ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr 
*)ip)->saddr,
++ ((struct ndpi_iphdr*)ip)->daddr, 
_proto);
+   flow->setDetectedProtocol(icmp_proto, false);
+ }
+   }

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
new file mode 100644
index 000..068f1e9fa9b
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -0,0 +1,14 @@
+--- a/configure.seed   2018-10-08 21:33:09.403001834 -0600
 b/configure.seed   2018-10-08 21:35:47.404002203 -0600
+@@ -129,9 +129,9 @@
+ fi
+ 
+ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
+-   NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi
++   NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
+# Use static libndpi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2017-06-19 Thread Slawek Lis 
commit: eca4bb921bc687293a9568c8c92400252caac86a
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Jun 19 11:57:29 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Jun 19 11:58:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca4bb92

net-analyzer/ntopng: version bump to 3.0

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/ntopng/Manifest|  1 +
 net-analyzer/ntopng/files/ntopng.init.d |  3 +-
 net-analyzer/ntopng/ntopng-3.0.ebuild   | 87 +
 3 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index e529401e453..2d28aa2bc7a 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1 +1,2 @@
 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

diff --git a/net-analyzer/ntopng/files/ntopng.init.d 
b/net-analyzer/ntopng/files/ntopng.init.d
index ffec852cb7e..a5984b18eba 100644
--- a/net-analyzer/ntopng/files/ntopng.init.d
+++ b/net-analyzer/ntopng/files/ntopng.init.d
@@ -1,6 +1,7 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
 depend() {
 need net redis

diff --git a/net-analyzer/ntopng/ntopng-3.0.ebuild 
b/net-analyzer/ntopng/ntopng-3.0.ebuild
new file mode 100644
index 000..b4b23cb72ad
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/;
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+   dev-python/pyzmq
+   dev-lang/luajit:2
+   dev-libs/json-c
+   dev-libs/geoip
+   dev-libs/glib:2
+   dev-libs/hiredis
+   dev-libs/libxml2
+   net-analyzer/rrdtool
+   net-libs/libpcap
+   net-libs/nDPI
+   net-misc/curl
+   virtual/libmysqlclient"
+RDEPEND="${DEPEND}
+   dev-db/redis"
+
+src_prepare() {
+   default
+   cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed 
"s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+   epatch "${FILESDIR}/configure-${PV}.patch"
+   epatch "${FILESDIR}/${P}-mysqltool.patch"
+#  epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
+#  epatch "${FILESDIR}/${P}-mysqltool.patch"
+#  epatch "${FILESDIR}/${P}-cxx.patch"
+#  sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
+   eautoreconf
+
+#  cd "${S}/nDPI"
+#  eautoreconf
+}
+
+# src_configure() {
+#  tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
+#  cd "${S}/nDPI"
+#  econf
+#  cd "${S}"
+#  econf
+# }
+# 
+# src_compile() {
+#  cd "${S}/nDPI"
+#  emake
+# 
+#  cd "${S}"
+#  emake
+# }
+
+src_install() {
+   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+   dodir ${SHARE_NTOPNG_DIR}
+   insinto ${SHARE_NTOPNG_DIR}
+   doins -r httpdocs
+   doins -r scripts
+
+   exeinto /usr/bin
+   doexe ${PN}
+   doman ${PN}.8
+
+   newinitd "${FILESDIR}/ntopng.init.d" ntopng
+   newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+   dodir "/var/lib/ntopng"
+   fowners ntopng "${EPREFIX}/var/lib/ntopng"
+}
+
+pkg_setup() {
+   enewuser ntopng
+}
+
+pkg_postinst() {
+   elog "ntopng default creadential are user='admin' password='admin'"
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2016-11-20 Thread Slawek Lis 
commit: 45ccd11f3680e49e765acc6329181555c0911350
Author: Slawomir Lis  gentoo  org>
AuthorDate: Sun Nov 20 18:54:26 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Sun Nov 20 18:54:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ccd11f

net-analyzer/ntopng: Patch to use CC/CXX variables

This fixes a bug 600246, where clang++ was used directly.
Thanks to Chris White.

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 44 ++
 net-analyzer/ntopng/ntopng-2.4.ebuild  |  1 +
 2 files changed, 45 insertions(+)

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
new file mode 100644
index ..330f681
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
@@ -0,0 +1,44 @@
+diff -ru ntopng-2.4-stable.orig/configure.ac ntopng-2.4-stable/configure.ac
+--- ntopng-2.4-stable.orig/configure.ac2016-11-20 03:59:19.928851928 
-0800
 ntopng-2.4-stable/configure.ac 2016-11-20 03:59:53.717850915 -0800
+@@ -341,14 +341,6 @@
+   GMAKE="make"
+ fi
+ 
+-GPP=`which clang++`
+-if test x$GPP = x
+-then
+-  GPP="g++"
+-else
+-  GPP="$GPP -O0"
+-fi
+-
+ GIT=`which git`
+ if test x$GIT = x
+ then
+diff -ru ntopng-2.4-stable.orig/Makefile.in ntopng-2.4-stable/Makefile.in
+--- ntopng-2.4-stable.orig/Makefile.in 2016-06-27 12:31:18.0 -0700
 ntopng-2.4-stable/Makefile.in  2016-11-20 04:00:31.037849796 -0800
+@@ -4,7 +4,6 @@
+ SHELL=/bin/sh
+ OS := $(shell uname -s)
+ PWD=@PWD@
+-GPP=@GPP@
+ INSTALL_DIR=$(DESTDIR)$(prefix)
+ MAN_DIR=$(DESTDIR)@MAN_DIR@
+ 
+@@ -126,12 +125,12 @@
+   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ %.o: %.cpp $(HEADERS) Makefile
+-  $(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ .PRECIOUS: $(TARGET) $(OBJECTS)
+ 
+ $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
+-  $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
++  $(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
+ 
+ $(LUAJIT_LIB):
+   cd $(LUAJIT_HOME); @GMAKE@

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 2141a1a..f6c9071 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed 
"s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
epatch "${FILESDIR}/${P}-mysqltool.patch"
+   epatch "${FILESDIR}/${P}-cxx.patch"
sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/

2016-11-19 Thread Slawek Lis 
commit: 4faac7f802c590fb18dce2ff5d0bf25549664e51
Author: Slawomir Lis  gentoo  org>
AuthorDate: Sat Nov 19 18:24:26 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Sat Nov 19 18:24:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4faac7f8

net-analyzer/ntopng: version bump to 2.4

Updated DEPEND also, as mysql client libraries are needed.

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/Manifest   |  1 +
 .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch  | 16 +
 .../ntopng/files/ntopng-2.4-mysqltool.patch| 17 +
 net-analyzer/ntopng/ntopng-2.4.ebuild  | 82 ++
 4 files changed, 116 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index b139932..0a25eae 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-1.2.1.tgz 9381092 SHA256 
9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5 SHA512 
816d63807fc40bcd1851fe5969b4a7d47540052c696f227b26dd38f1621bea5c48bb25a1115bdae3ec4c529d9f291d3d615a760081a90d937154a6a487194ca5
 WHIRLPOOL 
672fbf53108691fa0b0154ea21240445474e2e89d75004d4cd455ab2f8b5a62c5d1386670ab8ab9e6bd0304e9fe89c29a380db6d7959b4df6474e55f69892b3f
 DIST ntopng-2.0.tar.gz 35783709 SHA256 
3cbfd6de1bc44d65f7c7f0de282d122d11f493f1261ba137c3b5b202e08e0251 SHA512 
2208623cdc843b8e4ec285930d1ea74ac50c576888fce20f6fc4363e747e0dbef7f1808e7b77ae9b7f5316bca55a3e003a9926785c847bbea2c321d7f7e56d13
 WHIRLPOOL 
40438c3260a9ba16d8893ce41c494feda8e6290efc0253d4f19d354f6dd535f2d13177d1a1449abdcb5d5a212db0736540f5b92c77fcd624eb9b672ac659a2bc
+DIST ntopng-2.4.tar.gz 134074662 SHA256 
f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355 SHA512 
515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 WHIRLPOOL 
ba5d9fce207d1a89e5c8b35705b0aaeb66235153b91eaf7a84b1c50bcb4b897f992c81aa7fd316ad2d87458cdfdcd4d63de37d0a00375706a036f491ba448c7b

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
new file mode 100644
index ..b189cba
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -0,0 +1,16 @@
+--- configure.ac.old   2016-04-25 21:29:36.452888380 +0200
 configure.ac   2016-04-25 21:30:04.679554971 +0200
+@@ -62,13 +62,6 @@
+ fi
+ 
+ NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
+-AC_MSG_CHECKING(for $NDPI_LIB)
+-if test -f "$NDPI_LIB" ; then :
+-  AC_MSG_RESULT(found $NDPI_LIB)
+-else
+-  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
+-  cd $NDPI_HOME; ./autogen.sh; make; cd -
+-fi
+ 
+ AC_MSG_CHECKING(for ntopng professional edition)
+ if test -d "pro"; then :

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
new file mode 100644
index ..fd403a2
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig  2016-11-19 19:16:20.167724203 +0100
 configure.ac   2016-11-19 19:16:32.684391101 +0100
+@@ -302,13 +302,7 @@
+ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+MYSQLTOOL="mariadb_config"
+ else
+-   PATH=$PATH:/usr/local/mysql/bin
+-   AC_CHECK_TOOL(MYSQL, mysql_config)
+-   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+- MYSQLTOOL="mysql_config"
+-   else
+- MYSQLTOOL=""
+-   fi
++   MYSQLTOOL="mysql_config"
+ fi
+ 
+ if test -n "$MYSQLTOOL"; then

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
new file mode 100644
index ..2141a1a
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/;
+SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+   dev-python/pyzmq
+   dev-lang/luajit:2
+   dev-libs/geoip
+   dev-libs/glib:2
+   dev-libs/libxml2
+   net-analyzer/rrdtool
+   net-libs/libpcap
+   net-misc/curl
+   virtual/libmysqlclient"
+RDEPEND="${DEPEND}
+   dev-db/redis"
+
+S="${WORKDIR}/${P}-stable"
+
+src_prepare() {
+   cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed 
"s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+   epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
+   epatch "${FILESDIR}/${P}-mysqltool.patch"
+   sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
+   eautoreconf
+
+   cd "${S}/nDPI"
+   eautoreconf
+}
+
+src_configure() {
+   cd "${S}/nDPI"
+   econf
+