subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-analyzer\/ntopng\/"

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

2023-05-30 Thread Sam James

commit: 29ba33ce83d9124e240b0e2479d017216750dc06
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 03:18:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 03:18:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ba33ce

net-analyzer/ntopng: tweak SRC_URI

Easier to click.

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

 net-analyzer/ntopng/ntopng-5.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-5.6-r2.ebuild 
b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
index 9dca5e2d0a9e..f0d95a98fcd5 100644
--- a/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
@@ -10,7 +10,7 @@ inherit autotools toolchain-funcs
 NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269"
 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"
+SRC_URI="https://github.com/ntop/ntopng/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" 
https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> 
${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz"
 
 LICENSE="GPL-3"

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

2023-05-30 Thread Sam James

commit: 0bde2535ac31fc4fd1186f38fc172c50f4202bfe
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 03:18:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 03:18:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bde2535

net-analyzer/ntopng: add github upstream metadata

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

 net-analyzer/ntopng/metadata.xml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index d267dd3ff25d..907723bdb488 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -1,10 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-net...@gentoo.org
-
-  
-ntop/ntopng
-  
+   
+   net...@gentoo.org
+   
+   
+   ntop/ntopng
+   ntop/ntopng-dist
+

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

2023-05-01 Thread Sam James

commit: ce04c8c05a0d959f87ce2216d707772ab772b1c0
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 13:10:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 13:19:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce04c8c0

net-analyzer/ntopng: drop 5.4

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

 net-analyzer/ntopng/Manifest  |  1 -
 net-analyzer/ntopng/ntopng-5.4.ebuild | 97 ---
 2 files changed, 98 deletions(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index a6864f8140eb..88d1b021acfd 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,4 +1,3 @@
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B 
e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b
 SHA512 
01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
-DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 
67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462
 SHA512 
3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb
 DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 
BLAKE2B 
5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0
 SHA512 
cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e
 DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 
48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d
 SHA512 
c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5

diff --git a/net-analyzer/ntopng/ntopng-5.4.ebuild 
b/net-analyzer/ntopng/ntopng-5.4.ebuild
deleted file mode 100644
index 57a01e79f4ab..
--- a/net-analyzer/ntopng/ntopng-5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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() {
-   tc-export PKG_CONFIG
-
-   # configure.ac.in at least has some bashisms(?) which get lost(?)
-   # in conversion to configure.ac (like [ -> nothing?) so just force
-   # bash for now. It's still not quite right but at least upstream will be
-   # testing with it. TODO: fix this!
-   CONFIG_SHELL="${BROOT}/bin/bash" econf 
--with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
-}
-
-src_compile() {
-   emake \
-   CC="$(tc-getCC)" \
-   MYCFLAGS="${CFLAGS}" \
-   MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-   insinto "${SHARE_NTOPNG_DIR}"
-   doins -r httpdocs
-   doins -r scripts
-
-   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
-}
-
-pkg_postinst() {
-   elog "ntopng default credentials are user='admin' password='admin'"
-}

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

2023-04-23 Thread Sam James

commit: 4456cdbebd00b2c9308df8b430ea5f07393584c0
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 06:42:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 06:43:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4456cdbe

net-analyzer/ntopng: install web assets to correct path

Closes: https://bugs.gentoo.org/904755
Bug: https://bugs.gentoo.org/894152
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/{ntopng-5.6-r1.ebuild => ntopng-5.6-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-5.6-r1.ebuild 
b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
similarity index 98%
rename from net-analyzer/ntopng/ntopng-5.6-r1.ebuild
rename to net-analyzer/ntopng/ntopng-5.6-r2.ebuild
index 765764836c15..9dca5e2d0a9e 100644
--- a/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
@@ -81,7 +81,7 @@ src_install() {
doins -r httpdocs
doins -r scripts
 
-   insinto "${SHARE_NTOPNG_DIR}"/httpdocs
+   insinto "${SHARE_NTOPNG_DIR}"/httpdocs/dist
doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/.
 
insinto "${SHARE_NTOPNG_DIR}/third-party"

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

2023-03-13 Thread Sam James

commit: 6e9dc95ce5410b428cb837dcdd06410cad9d2214
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 13 23:18:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 13 23:27:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9dc95c

net-analyzer/ntopng: add HTML, CSS, JS assets

Closes: https://bugs.gentoo.org/894152
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest| 1 +
 net-analyzer/ntopng/{ntopng-5.6.ebuild => ntopng-5.6-r1.ebuild} | 7 +++
 2 files changed, 8 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 072a3fc81808..a6864f8140eb 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1,4 @@
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B 
e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b
 SHA512 
01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
 DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 
67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462
 SHA512 
3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb
+DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 
BLAKE2B 
5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0
 SHA512 
cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e
 DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 
48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d
 SHA512 
c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5

diff --git a/net-analyzer/ntopng/ntopng-5.6.ebuild 
b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
similarity index 83%
rename from net-analyzer/ntopng/ntopng-5.6.ebuild
rename to net-analyzer/ntopng/ntopng-5.6-r1.ebuild
index 57a01e79f4ab..765764836c15 100644
--- a/net-analyzer/ntopng/ntopng-5.6.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
@@ -5,9 +5,13 @@ EAPI=8
 
 inherit autotools toolchain-funcs
 
+# Check this on bumps, get latest commit from the relevant branch (e.g. 
5.6-stable)
+# See bug #894152 and https://github.com/ntop/ntopng/issues/7203
+NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269"
 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"
+SRC_URI+=" 
https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> 
${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -77,6 +81,9 @@ src_install() {
doins -r httpdocs
doins -r scripts
 
+   insinto "${SHARE_NTOPNG_DIR}"/httpdocs
+   doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/.
+
insinto "${SHARE_NTOPNG_DIR}/third-party"
doins -r third-party/i18n.lua-master
doins -r third-party/lua-resty-template-master

[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/

2023-02-03 Thread Sam James

commit: 005b3a68af0fee8be7085de48d7c9c1f6a7a713d
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 16:51:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 16:51:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005b3a68

net-analyzer/ntopng: add 5.6

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

 net-analyzer/ntopng/Manifest  |  1 +
 net-analyzer/ntopng/ntopng-5.6.ebuild | 97 +++
 2 files changed, 98 insertions(+)

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

diff --git a/net-analyzer/ntopng/ntopng-5.6.ebuild 
b/net-analyzer/ntopng/ntopng-5.6.ebuild
new file mode 100644
index ..57a01e79f4ab
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.6.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() {
+   tc-export PKG_CONFIG
+
+   # configure.ac.in at least has some bashisms(?) which get lost(?)
+   # in conversion to configure.ac (like [ -> nothing?) so just force
+   # bash for now. It's still not quite right but at least upstream will be
+   # testing with it. TODO: fix this!
+   CONFIG_SHELL="${BROOT}/bin/bash" econf 
--with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
+}
+
+src_compile() {
+   emake \
+   CC="$(tc-getCC)" \
+   MYCFLAGS="${CFLAGS}" \
+   MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+   insinto "${SHARE_NTOPNG_DIR}"
+   doins -r httpdocs
+   doins -r scripts
+
+   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
+}
+
+pkg_postinst() {
+   elog "ntopng default credentials are user='admin' password='admin'"
+}

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

2022-08-17 Thread Sam James

commit: 242e1c014bc6ad66793c8cc0440237ad2bd03de5
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 18 00:29:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 18 00:30:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242e1c01

net-analyzer/ntopng: add max version on nDPI

Huge pain w/ API changes as often happens with these,
but hopefully new release soon.

Closes: https://bugs.gentoo.org/857768
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/{ntopng-5.2.1.ebuild => ntopng-5.2.1-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/ntopng/ntopng-5.2.1.ebuild 
b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild
similarity index 99%
rename from net-analyzer/ntopng/ntopng-5.2.1.ebuild
rename to net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild
index b1e0ebb11864..84dd505dc13f 100644
--- a/net-analyzer/ntopng/ntopng-5.2.1.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="dev-db/mysql-connector-c:=
net-analyzer/rrdtool
net-libs/libpcap
>=net-libs/nDPI-4.2:=
+   =net-libs/zeromq-3:=
net-misc/curl
sys-libs/libcap

[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/

2022-01-03 Thread Sam James

commit: 39868efcc6779ea5e5272c3434e4a59f0bae9aa1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  3 11:20:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  3 11:21:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39868efc

net-analyzer/ntopng: add 5.0

As with nDPI, aware of the ar-directly and other similar bugs,
but am trying to address this first upstream & go from there.

Bug: https://bugs.gentoo.org/799782
Bug: https://bugs.gentoo.org/830403
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest  |  1 +
 net-analyzer/ntopng/ntopng-5.0.ebuild | 92 +++
 2 files changed, 93 insertions(+)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 29da3cb09be7..9a94093e2365 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1 +1,2 @@
 DIST ntopng-4.2.tar.gz 57554819 BLAKE2B 
a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8
 SHA512 
e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
+DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 
420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f
 SHA512 
e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6

diff --git a/net-analyzer/ntopng/ntopng-5.0.ebuild 
b/net-analyzer/ntopng/ntopng-5.0.ebuild
new file mode 100644
index ..e879c8456307
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 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-3.0:=
+   >=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}-4.2-mysqltool.patch
+   "${FILESDIR}"/${PN}-4.2-parallel-make.patch
+   "${FILESDIR}"/${PN}-4.0-ndpi-includes.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.seed" \
+   > "${S}/configure.ac" || die
+
+   eautoreconf
+}
+
+src_configure() {
+   tc-export PKG_CONFIG
+   default
+}
+
+src_compile() {
+   emake \
+   CC="$(tc-getCC)" \
+   MYCFLAGS="${CFLAGS}" \
+   MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+   SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+   insinto "${SHARE_NTOPNG_DIR}"
+   doins -r httpdocs
+   doins -r scripts
+
+   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
+}
+
+pkg_postinst() {
+   elog "ntopng default credentials are user='admin' password='admin'"
+}

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

2021-06-22 Thread Sam James

commit: 60234f86b6142c9b06c105fa9db5261a399ae7dc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jun 21 22:12:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 22 18:18:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60234f86

net-analyzer/ntopng: use binding := for dev-libs/openssl

Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI.

Acked-by: David Seifert  gentoo.org>
Signed-off-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/{ntopng-4.2.ebuild => ntopng-4.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-4.2.ebuild 
b/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
similarity index 99%
rename from net-analyzer/ntopng/ntopng-4.2.ebuild
rename to net-analyzer/ntopng/ntopng-4.2-r1.ebuild
index de038c42e39..539835c3e07 100644
--- a/net-analyzer/ntopng/ntopng-4.2.ebuild
+++ b/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-db/mysql-connector-c:=
dev-libs/json-c:=
dev-libs/libmaxminddb
dev-libs/libsodium:=
-   dev-libs/openssl
+   dev-libs/openssl:=
net-analyzer/rrdtool
net-libs/libpcap
>=net-libs/nDPI-3.0:=

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

2021-04-13 Thread John Helmert III

commit: 5ced7e912eed74c16aec44873a8ac8478be2caf5
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Apr 13 12:49:24 2021 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Apr 13 12:49:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ced7e91

net-analyzer/ntopng: cleanup <4.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: John Helmert III  gentoo.org>

 net-analyzer/ntopng/Manifest   |   2 -
 .../ntopng/files/ntopng-3.8-mysqltool.patch|  17 ---
 .../ntopng/files/ntopng-3.8-ndpi-includes.patch|  14 ---
 .../ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch |  95 
 .../ntopng/files/ntopng-3.8.1-parallel-make.patch  |  15 ---
 .../ntopng/files/ntopng-4.0-PKG_CONFIG.patch   | 124 -
 net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild |  99 
 net-analyzer/ntopng/ntopng-4.0.ebuild  |  99 
 8 files changed, 465 deletions(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 854955fed75..29da3cb09be 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1 @@
-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-3.8-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
deleted file mode 100644
index 62c328a3505..000
--- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 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-includes.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
deleted file mode 100644
index cdd5e827147..000
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 a/configure.seed
-+++ b/configure.seed
-@@ -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 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-3.8.1-PKG_CONFIG.patch 
b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
deleted file mode 100644
index 12117d791bc..000
--- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
+++ /dev/null
@@ -1,95 +0,0 @@
 a/configure.seed
-+++ b/configure.seed
-@@ -6,6 +6,8 @@
- 
- AC_PROG_CXX
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl> Add /usr/local/ /opt/local
- CFLAGS="-I${PWD} -I${PWD}/include"
- CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include"
-@@ -179,10 +179,10 @@
- fi
- dnl finish: nDPI handling
- 
--if test -z `pkg-config --exists libssl`; then
-+if ${PKG_CONFIG} --exists libssl; 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"
- fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
 a/Makefile.in
-+++ b/Makefile.in
-@@ -44,10 +44,10 @@
- 
- ##
- LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
--HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?)
-+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?)
- ifeq ($(HAS_LIBRRDTOOL), 0)
--  LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
--

[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/

2020-12-26 Thread Sam James

commit: 4f508dca41761376f074e5d2e4c633b11da662c3
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 27 00:50:22 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 00:50:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f508dca

net-analyzer/ntopng: fix UnknownManifest

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/ntopng/Manifest | 1 -
 1 file changed, 1 deletion(-)

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

[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/

2020-03-23 Thread Jeroen Roovers

commit: 404a83b8264bda805e7f214ef047830ea0446427
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Mar 23 12:44:53 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Mar 23 12:45:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=404a83b8

net-analyzer/ntopng: Depend on dev-libs/hiredis:=

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

 net-analyzer/ntopng/{ntopng-3.8.1-r3.ebuild => ntopng-3.8.1-r4.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild
similarity index 98%
rename from net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild
rename to net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild
index 25938565c76..b4562c2a6b2 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild
@@ -16,7 +16,7 @@ DEPEND="
>=net-libs/nDPI-3.0:=
dev-db/mysql-connector-c:=
dev-db/sqlite:3
-   dev-libs/hiredis
+   dev-libs/hiredis:=
dev-libs/json-c:=
dev-libs/libmaxminddb
dev-libs/libsodium:=

[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/

2020-01-19 Thread Jeroen Roovers

commit: 44bbe2f83871bdca15b05bcf4ebd2f63e16279f5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 19 12:10:30 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 19 12:13:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bbe2f8

net-analyzer/ntopng: Depend on >=net-libs/zeromq-3

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

 net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
index fb5e82a0194..25938565c76 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ DEPEND="
dev-libs/openssl
net-analyzer/rrdtool
net-libs/libpcap
-   net-libs/zeromq:=
+   >=net-libs/zeromq-3:=
net-misc/curl
sys-libs/libcap
sys-libs/zlib

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

2019-12-30 Thread Jeroen Roovers

commit: 9e3ab652b2a50bfe001fe6326cf5ae1d94f2ac32
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Dec 30 09:21:46 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Dec 30 09:23:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3ab652

net-analyzer/ntopng: Set Makefile overrides

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

 .../ntopng/{ntopng-3.8.1-r1.ebuild => ntopng-3.8.1-r2.ebuild}  | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
similarity index 94%
rename from net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
rename to net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
index 999edd283b2..fb5e82a0194 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
@@ -64,6 +64,13 @@ src_configure() {
default
 }
 
+src_compile() {
+   emake \
+   CC="$(tc-getCC)" \
+   MYCFLAGS="${CFLAGS}" \
+   MYLDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
dodir ${SHARE_NTOPNG_DIR}

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

2019-12-29 Thread Jeroen Roovers

commit: 919a2b7edd0ef2ed9763ccbb7022336fdba5b8a0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 14:46:59 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 15:20:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919a2b7e

net-analyzer/ntopng: Use PKG_CONFIG, drop test phase

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

 .../ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch | 95 ++
 ...{ntopng-3.8.1.ebuild => ntopng-3.8.1-r1.ebuild} | 12 ++-
 2 files changed, 106 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..91811d66bbd
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
@@ -0,0 +1,95 @@
+--- a/configure.seed
 b/configure.seed
+@@ -6,6 +6,8 @@
+ 
+ AC_PROG_CXX
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl> Add /usr/local/ /opt/local
+ CFLAGS="-I${PWD} -I${PWD}/include"
+ CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include"
+@@ -179,10 +179,10 @@
+ fi
+ dnl finish: nDPI handling
+ 
+-if test -z `pkg-config --exists libssl`; then
++if ${PKG_CONFIG} --exists libssl; 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"
+ fi
+ 
+ AC_MSG_CHECKING(for ntopng professional edition)
+--- a/Makefile.in
 b/Makefile.in
+@@ -44,10 +44,10 @@
+ 
+ ##
+ LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
+-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?)
++HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?)
+ ifeq ($(HAS_LIBRRDTOOL), 0)
+-  LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
+-  LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th
++  LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd)
++  LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th
+ else
+   LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
+   ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD))
+@@ -70,10 +70,10 @@
+ 
+ ##
+ 
+-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
++HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?)
+ ifeq ($(HAS_JSON), 0)
+-  JSON_INC = $(shell pkg-config --cflags json-c)
+-  JSON_LIB = $(shell pkg-config --libs json-c)
++  JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c)
++  JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c)
+ else
+   JSON_HOME=${PWD}/third-party/json-c
+   JSON_INC=-I$(JSON_HOME)
+@@ -83,21 +83,21 @@
+ ##
+ 
+ ifeq (@NEDGE@, 0)
+- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?)
++ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?)
+  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 $$?)
++ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?)
+  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
+@@ -107,9 +107,9 @@
+   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)
+-  ZSTD_LIB = $(shell pkg-config --libs libzstd)
++  ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd)
+  endif
+ endif
+ 

diff --git a/net-analyzer/ntopng/ntopng-3.8.1.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
similarity index 92%
rename from net-analyzer/ntopng/ntopng-3.8.1.ebuild
rename to net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
index 0e41d4cf7c9..fceffce2d77 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
@@ -34,12 +34,17 @@ RDEPEND="
${DEPEND}
dev-db/redis
 "
+BDEPEND="
+   virtual/pkgconfig
+"
 PATCHES=(
+   "${FILESDIR}"/${PN}-3.8-missing-min.patch
"${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-PKG_CONFIG.patch

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

2019-12-29 Thread Jeroen Roovers

commit: 1343a920652c3953ee5fdffdb272c1ce01a94578
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 15:07:25 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 15:20:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1343a920

net-analyzer/ntopng: Fix dependencies

* Do not patch third-party/zeromq-*
* Depend on dev-libs/openssl net-libs/zeromq:= sys-libs/libcap
  sys-libs/zlib
* Drop obsolete dependencies and those needed for third-party/*
* Sort dependency list

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

 net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
index fceffce2d77..999edd283b2 100644
--- a/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r1.ebuild
@@ -13,22 +13,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
+   >=net-libs/nDPI-3.0:=
+   dev-db/mysql-connector-c:=
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/json-c:=
dev-libs/libmaxminddb
+   dev-libs/libsodium:=
+   dev-libs/openssl
net-analyzer/rrdtool
net-libs/libpcap
-   >=net-libs/nDPI-3.0
+   net-libs/zeromq:=
net-misc/curl
-   sys-libs/binutils-libs
-   dev-db/mysql-connector-c:=
+   sys-libs/libcap
+   sys-libs/zlib
 "
 RDEPEND="
${DEPEND}
@@ -38,7 +36,6 @@ BDEPEND="
virtual/pkgconfig
 "
 PATCHES=(
-   "${FILESDIR}"/${PN}-3.8-missing-min.patch
"${FILESDIR}"/${PN}-3.8-mysqltool.patch
"${FILESDIR}"/${PN}-3.8-ndpi-includes.patch
"${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch

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

2019-12-28 Thread Jeroen Roovers

commit: eab423ded8cef06c7dc7ef3f3386148db0121c28
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 28 13:10:28 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 28 13:10:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab423de

net-analyzer/ntopng: Set sub-SLOT for net-libs/nDPI

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

 net-analyzer/ntopng/{ntopng-3.8.ebuild => ntopng-3.8-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild 
b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
similarity index 98%
rename from net-analyzer/ntopng/ntopng-3.8.ebuild
rename to net-analyzer/ntopng/ntopng-3.8-r1.ebuild
index adb578b7ff8..37e007de41e 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="dev-db/sqlite:3
dev-libs/libmaxminddb
net-analyzer/rrdtool
net-libs/libpcap
-   >=net-libs/nDPI-2.4
+   >=net-libs/nDPI-2.4:=
net-misc/curl
sys-libs/binutils-libs
dev-db/mysql-connector-c:="

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

2019-12-28 Thread Jeroen Roovers

commit: fe1f58ff9b07d7d7792a7b2786b5a97eb500b3bd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 28 12:11:40 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 28 12:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1f58ff

net-analyzer/ntopng: Clean up patch

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

 net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch 
b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
index 068f1e9fa9b..cdd5e827147 100644
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -1,5 +1,5 @@
 a/configure.seed   2018-10-08 21:33:09.403001834 -0600
-+++ b/configure.seed   2018-10-08 21:35:47.404002203 -0600
+--- a/configure.seed
 b/configure.seed
 @@ -129,9 +129,9 @@
  fi

[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/

2019-12-27 Thread Jeroen Roovers

commit: 879db73169006aefa4637ada9deed3ec0d7955ea
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 28 01:02:45 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 28 01:03:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879db731

net-analyzer/ntopng: Add maintainer

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

 net-analyzer/ntopng/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index 712b0dbc678..f31113c67cc 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -1,7 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+
+net...@gentoo.org
+
   
 ntop/ntopng

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

2019-08-28 Thread Michał Górny

commit: a5e7ab21be9466cec932058afb1f7ba0938db6d8
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug 28 17:57:54 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug 28 19:41:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e7ab21

net-analyzer/ntopng: Fix fowners call not to use EPREFIX

Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/ntopng/ntopng-2.4-r1.ebuild | 2 +-
 net-analyzer/ntopng/ntopng-3.0-r4.ebuild | 2 +-
 net-analyzer/ntopng/ntopng-3.8.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild 
b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
index 1e888605a06..3e53ff54518 100644
--- a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
@@ -74,7 +74,7 @@ src_install() {
newconfd "${FILESDIR}/ntopng.conf.d" ntopng
 
dodir "/var/lib/ntopng"
-   fowners ntopng "${EPREFIX}/var/lib/ntopng"
+   fowners ntopng "/var/lib/ntopng"
 }
 
 pkg_setup() {

diff --git a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
index 5670739bea2..2a126bff047 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
@@ -63,7 +63,7 @@ src_install() {
newconfd "${FILESDIR}/ntopng.conf.d" ntopng
 
dodir "/var/lib/ntopng"
-   fowners ntopng "${EPREFIX}/var/lib/ntopng"
+   fowners ntopng "/var/lib/ntopng"
 }
 
 pkg_setup() {

diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.ebuild
index 132b23563ef..adb578b7ff8 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -64,7 +64,7 @@ src_install() {
newconfd "${FILESDIR}/ntopng.conf.d" ntopng
 
dodir "/var/lib/ntopng"
-   fowners ntopng "${EPREFIX}/var/lib/ntopng"
+   fowners ntopng "/var/lib/ntopng"
 }
 
 pkg_setup() {

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

2019-08-28 Thread Thomas Deutschmann

commit: 29c36e086175327c309e012a29b9637d9e234a5d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 28 10:56:22 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 28 11:17:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c36e08

net-analyzer/ntopng: rev bump to ease migration to dev-db/mysql-connector-c

Commit 4ba9925d873b5f7e9562f5e3d67f11a89ee8a6e3 replaced
virtual/libmysqlclient dependency with dev-db/mysql-connector-c atom
without a rev bump.

To avoid unecessary user interaction for users not using emerge's
--changed-deps=y because we are already pushing towards removal of
virtual/libmysqlclient (see commit 08b83d736f77fd5dffa9cd5f6b1b44771726ce94),
this commit will now force the re-installation through rev bump
to ease migration.

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

 net-analyzer/ntopng/{ntopng-2.4.ebuild => ntopng-2.4-r1.ebuild}| 0
 net-analyzer/ntopng/{ntopng-3.0-r3.ebuild => ntopng-3.0-r4.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
similarity index 100%
rename from net-analyzer/ntopng/ntopng-2.4.ebuild
rename to net-analyzer/ntopng/ntopng-2.4-r1.ebuild

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

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

2019-08-28 Thread Slawek Lis

commit: b476720f82f6376175a6d75420593c4a4c2ec574
Author: Slawomir Lis  gentoo  org>
AuthorDate: Wed Aug 28 11:11:21 2019 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Wed Aug 28 11:11:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b476720f

net-analyzer/ntopng: fixed version info

It seems that version format is strictly required, and was
wrongly recognized as not being latest.
Upgraded according to autogen.sh script.

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

 net-analyzer/ntopng/ntopng-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.ebuild
index d494609c7f0..132b23563ef 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
 
 src_prepare() {
default
-   sed -e "s/@VERSION@/${PV}/g" -e "s/@SHORT_VERSION@/${PV}/g" < 
"${S}/configure.seed" > "${S}/configure.ac" > configure.ac
+   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
 }

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

2019-08-26 Thread Slawek Lis

commit: 381ef2e24ed92f8e976a5ce534e53b2970d21ea9
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Aug 27 05:00:54 2019 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Aug 27 05:00:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381ef2e2

net-analyzer/ntopng:  Migrate to mysql-connector-c

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

 net-analyzer/ntopng/ntopng-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild 
b/net-analyzer/ntopng/ntopng-3.8.ebuild
index 8a3edd12418..d494609c7f0 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -27,7 +27,7 @@ DEPEND="dev-db/sqlite:3
>=net-libs/nDPI-2.4
net-misc/curl
sys-libs/binutils-libs
-   virtual/libmysqlclient"
+   dev-db/mysql-connector-c:="
 RDEPEND="${DEPEND}
dev-db/redis"
 PATCHES=(

[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/

2019-08-24 Thread Thomas Deutschmann

commit: 4ba9925d873b5f7e9562f5e3d67f11a89ee8a6e3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug 24 10:16:44 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 24 10:30:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba9925d

net-analyzer/ntopng: migrate to dev-db/mysql-connector-c

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

 net-analyzer/ntopng/ntopng-2.4.ebuild| 4 ++--
 net-analyzer/ntopng/ntopng-3.0-r3.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index d024ad1f63d..1e888605a06 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ DEPEND="dev-db/sqlite:3
net-analyzer/rrdtool
net-libs/libpcap
net-misc/curl
-   virtual/libmysqlclient
+   dev-db/mysql-connector-c
!net-libs/nDPI"
 RDEPEND="${DEPEND}
dev-db/redis"

diff --git a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
index 18736380ba1..5670739bea2 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ DEPEND="dev-db/sqlite:3
=net-libs/nDPI-2.0
net-misc/curl
sys-libs/binutils-libs:=
-   virtual/libmysqlclient"
+   dev-db/mysql-connector-c:="
 RDEPEND="${DEPEND}
dev-db/redis"
 PATCHES=(

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

2018-10-05 Thread Jeroen Roovers

commit: e85a03b53d10d92169fc7c8ead73fba1acade498
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Oct  5 12:48:38 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Oct  5 14:25:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85a03b5

net-analyzer/ntopng: Clean up patches.

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

 net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 2 +-
 net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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
index ec628cd3224..ef40c72d589 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -1,4 +1,4 @@
 a/configure.ac.old
+--- a/configure.ac
 +++ b/configure.ac
 @@ -62,13 +62,6 @@
  fi

diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch 
b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
index 11fb47ca385..171bee36e89 100644
--- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
@@ -1,6 +1,5 @@
-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.0 
-0700
-+++ ntopng-3.0/src/AddressResolution.cpp   2017-11-27 23:13:50.158163187 
-0800
+--- a/src/AddressResolution.cpp
 b/src/AddressResolution.cpp
 @@ -52,7 +52,7 @@
u_int numeric_ip_len;

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

2018-06-09 Thread Jeroen Roovers

commit: 537527d273736c630c057489eb4d6171ad6cab87
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun  9 10:34:17 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun  9 10:34:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537527d2

net-analyzer/ntopng: Depend on sys-libs/binutils-libs:=.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/ntopng/{ntopng-3.0-r2.ebuild => ntopng-3.0-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
similarity index 98%
rename from net-analyzer/ntopng/ntopng-3.0-r2.ebuild
rename to net-analyzer/ntopng/ntopng-3.0-r3.ebuild
index bbf5c8da937..18736380ba1 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
@@ -25,7 +25,7 @@ DEPEND="dev-db/sqlite:3
net-libs/libpcap
=net-libs/nDPI-2.0
net-misc/curl
-   sys-libs/binutils-libs
+   sys-libs/binutils-libs:=
virtual/libmysqlclient"
 RDEPEND="${DEPEND}
dev-db/redis"

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

2018-06-03 Thread Aaron Bauman

commit: cf21bacc348d28876c51c72e7890200d52bbe284
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun  3 09:26:29 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jun  3 13:48:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf21bacc

net-analyzer/ntopng: use HTTPs

 net-analyzer/ntopng/ntopng-2.4.ebuild| 4 ++--
 net-analyzer/ntopng/ntopng-3.0-r2.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 0e383ae5ce4..d024ad1f63d 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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/;
+HOMEPAGE="https://www.ntop.org/;
 SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"

diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index 0fc8da9c632..bbf5c8da937 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/;
+HOMEPAGE="https://www.ntop.org/;
 SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"

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

2018-01-23 Thread Slawek Lis

commit: e7f82a8eedbb20edd935ff420d91fdbcc3576d69
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Jan 23 19:06:40 2018 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Jan 23 19:06:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f82a8e

net-analyzer/ntopng: fixed dependencies for net-libs/nDPI library

Closes: https://bugs.gentoo.org/645478
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/ntopng/ntopng-3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index 68765c032bd..0fc8da9c632 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-db/sqlite:3
dev-libs/libxml2
net-analyzer/rrdtool
net-libs/libpcap
-   net-libs/nDPI
+   =net-libs/nDPI-2.0
net-misc/curl
sys-libs/binutils-libs
virtual/libmysqlclient"

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

2018-01-22 Thread Slawek Lis

commit: 47316be9937674510b62d56065bacc467660d31f
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Jan 22 20:55:44 2018 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Jan 22 21:00:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47316be9

net-analyzer/ntopng: added sys-libs/binutils-libs dependency

Closes: https://bugs.gentoo.org/634104
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/ntopng/ntopng-3.0-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index bdb49f1374a..68765c032bd 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DEPEND="dev-db/sqlite:3
net-libs/libpcap
net-libs/nDPI
net-misc/curl
+   sys-libs/binutils-libs
virtual/libmysqlclient"
 RDEPEND="${DEPEND}
dev-db/redis"

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

2017-12-19 Thread Thomas Deutschmann

commit: 3561d9a3c675ddd32600cd7697ef5ced5a40d474
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec 19 21:29:44 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec 19 21:44:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3561d9a3

net-analyzer/ntopng: Add subslot operator on dev-libs/json-c atom

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/ntopng/ntopng-2.4.ebuild| 2 +-
 net-analyzer/ntopng/ntopng-3.0-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 844b5a81060..0e383ae5ce4 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND="dev-db/sqlite:3
dev-python/pyzmq
dev-lang/luajit:2
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/geoip
dev-libs/glib:2
dev-libs/hiredis

diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index dbaa1f1914f..bdb49f1374a 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="dev-db/sqlite:3
dev-python/pyzmq
dev-lang/luajit:2
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/geoip
dev-libs/glib:2
dev-libs/hiredis

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

2017-12-18 Thread Richard Farina

commit: b5b83df50a09e53a5568e283644dda9aaeaacf17
Author: Zero_Chaos  gentoo  org>
AuthorDate: Mon Dec 18 19:35:18 2017 +
Commit: Richard Farina  gentoo  org>
CommitDate: Mon Dec 18 19:36:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b83df5

net-analyzer/ntopng: less work for preserve-lib

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 net-analyzer/ntopng/{ntopng-3.0-r1.ebuild => ntopng-3.0-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
similarity index 98%
rename from net-analyzer/ntopng/ntopng-3.0-r1.ebuild
rename to net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index 3470ef4dea2..dbaa1f1914f 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -19,6 +19,7 @@ DEPEND="dev-db/sqlite:3
dev-libs/geoip
dev-libs/glib:2
dev-libs/hiredis
+   dev-libs/libsodium:=
dev-libs/libxml2
net-analyzer/rrdtool
net-libs/libpcap

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

2017-12-11 Thread Slawek Lis

commit: 4b9aefe0775d3f55aa7f7adb453aa3d5d839e0db
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Dec 11 09:26:13 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Dec 11 09:26:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9aefe0

net-analyzer/ntopng: fixed wrong patch filename

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../ntopng/files/{pointer-cmp.patch => ntopng-3.0-pointer-cmp.patch}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch 
b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
similarity index 100%
rename from net-analyzer/ntopng/files/pointer-cmp.patch
rename to net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch

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

2017-12-06 Thread Slawek Lis

commit: 357253b38a46dce4aa13a6b419eed78b486ea350
Author: Slawomir Lis  gentoo  org>
AuthorDate: Thu Dec  7 06:44:02 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Thu Dec  7 06:44:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357253b3

net-analyzer/ntopng: fixed bug 634104

Applying patch sent by zoltan  sinustrom.info
This patch is solving problem with pointer comparison

Reported by: fkrogh  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 000..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.0 
-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() {

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

2017-09-13 Thread Slawek Lis

commit: 7fee51f85a073f0ba622355ba683441f4ae790b1
Author: Slawomir Lis  gentoo  org>
AuthorDate: Wed Sep 13 11:22:00 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Wed Sep 13 11:28:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee51f8

net-analyzer/ntopng: blocking net-libs/nDPI as it causes errors in this version

Reported in bug 630056

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/ntopng/ntopng-2.4.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index ca40a0e93d4..844b5a81060 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,8 @@ DEPEND="dev-db/sqlite:3
net-analyzer/rrdtool
net-libs/libpcap
net-misc/curl
-   virtual/libmysqlclient"
+   virtual/libmysqlclient
+   !net-libs/nDPI"
 RDEPEND="${DEPEND}
dev-db/redis"

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

2017-09-06 Thread Jeroen Roovers

commit: c69e9b1346e6c0e02b363de277e5b60986bf1789
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep  6 11:36:23 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep  6 11:36:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69e9b13

net-analyzer/ntopng: Clean up patches.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 10 +++---
 .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch  |  4 +--
 .../ntopng/files/ntopng-2.4-mysqltool.patch|  4 +--
 ...configure-3.0.patch => ntopng-3.0-gentoo.patch} |  6 ++--
 .../ntopng/files/ntopng-3.0-mysqltool.patch|  4 +--
 .../{ntopng-3.0.ebuild => ntopng-3.0-r1.ebuild}| 40 ++
 6 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
index 330f681e754..6de1a43f9b8 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
@@ -1,6 +1,5 @@
-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
+--- a/configure.ac
 b/configure.ac
 @@ -341,14 +341,6 @@
GMAKE="make"
  fi
@@ -16,9 +15,8 @@ diff -ru ntopng-2.4-stable.orig/configure.ac 
ntopng-2.4-stable/configure.ac
  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
+--- a/Makefile.in
 b/Makefile.in
 @@ -4,7 +4,6 @@
  SHELL=/bin/sh
  OS := $(shell uname -s)

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
index b189cbabe28..ec628cd3224 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -1,5 +1,5 @@
 configure.ac.old   2016-04-25 21:29:36.452888380 +0200
-+++ configure.ac   2016-04-25 21:30:04.679554971 +0200
+--- a/configure.ac.old
 b/configure.ac
 @@ -62,13 +62,6 @@
  fi
  

diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
index fd403a2c8bf..a80e966b85d 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
@@ -1,5 +1,5 @@
 configure.ac.orig  2016-11-19 19:16:20.167724203 +0100
-+++ configure.ac   2016-11-19 19:16:32.684391101 +0100
+--- 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"

diff --git a/net-analyzer/ntopng/files/configure-3.0.patch 
b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
similarity index 87%
rename from net-analyzer/ntopng/files/configure-3.0.patch
rename to net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
index a2476f5b407..90d7aace545 100644
--- a/net-analyzer/ntopng/files/configure-3.0.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
@@ -1,5 +1,5 @@
 configure.ac.orig  2017-06-09 06:47:34.214516588 +0200
-+++ configure.ac   2017-06-09 06:48:01.547849759 +0200
+--- a/configure.ac
 b/configure.ac
 @@ -19,7 +19,6 @@
  # On CentOS 6 `git rev-list HEAD --count` does not work
  #
@@ -42,8 +42,6 @@
  if test -d "/usr/include/openssl"; then :
   AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
   SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
 configure.ac.orig  2017-06-09 09:58:17.021114895 +0200
-+++ configure.ac   2017-06-09 09:58:24.227781519 +0200
 @@ -53,15 +53,6 @@
   SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
  fi

diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
index e433f4e9559..4d2244b582b 100644
--- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
@@ -1,5 +1,5 @@
 configure.ac.orig  2017-06-09 09:52:26.387783657 +0200
-+++ configure.ac   2017-06-09 09:54:53.361116113 +0200
+--- a/configure.ac
 b/configure.ac
 @@ -335,13 +335,7 @@
  if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
 MYSQLTOOL="mariadb_config"

diff --git a/net-analyzer/ntopng/ntopng-3.0.ebuild 
b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
similarity index 61%
rename from net-analyzer/ntopng/ntopng-3.0.ebuild
rename to net-analyzer/ntopng/ntopng-3.0-r1.ebuild
index 234efdce69c..3fe29fa7818 100644
--- a/net-analyzer/ntopng/ntopng-3.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, app-editors/atom/, dev-python/pythondialog/

2017-07-07 Thread Ulrich Müller

commit: 723bdfbfc739207210224fe9f78300123f182698
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jul  7 17:07:03 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jul  7 17:07:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723bdfbf

[QA] Drop $Id$ lines that were added back to headers.

Bug: 611234

 app-editors/atom/atom-1.18.0.ebuild   | 1 -
 dev-python/pythondialog/pythondialog-3.4.0.ebuild | 1 -
 net-analyzer/ntopng/files/ntopng.init.d   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-editors/atom/atom-1.18.0.ebuild 
b/app-editors/atom/atom-1.18.0.ebuild
index de21a05484a..a5bf085f0cf 100644
--- a/app-editors/atom/atom-1.18.0.ebuild
+++ b/app-editors/atom/atom-1.18.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 

diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild 
b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
index 8863d9d8b64..79cfdd6d343 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 

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

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

2017-06-22 Thread Slawek Lis

commit: 9d31277f6928bbb4f49b265cf62fb25338579151
Author: Slawomir Lis  gentoo  org>
AuthorDate: Thu Jun 22 06:51:22 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Thu Jun 22 06:51:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d31277f

net-analyzer/ntopng: installing missing lua files

Reported in bug 622392
Reported-By: ffelix  inode64.com
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/ntopng/ntopng-3.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-analyzer/ntopng/ntopng-3.0.ebuild 
b/net-analyzer/ntopng/ntopng-3.0.ebuild
index b4b23cb72ad..234efdce69c 100644
--- a/net-analyzer/ntopng/ntopng-3.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0.ebuild
@@ -67,6 +67,11 @@ src_install() {
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

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

2017-06-20 Thread Slawek Lis

commit: 95791999df7cec9742de97dd87e0ecb3afeb1d94
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Jun 20 06:16:20 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Jun 20 06:16:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95791999

net-analyzer/ntopng: added missing files

Reported in 581256

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/ntopng/files/configure-3.0.patch  | 62 ++
 .../ntopng/files/ntopng-3.0-mysqltool.patch| 17 ++
 2 files changed, 79 insertions(+)

diff --git a/net-analyzer/ntopng/files/configure-3.0.patch 
b/net-analyzer/ntopng/files/configure-3.0.patch
new file mode 100644
index 000..a2476f5b407
--- /dev/null
+++ b/net-analyzer/ntopng/files/configure-3.0.patch
@@ -0,0 +1,62 @@
+--- configure.ac.orig  2017-06-09 06:47:34.214516588 +0200
 configure.ac   2017-06-09 06:48:01.547849759 +0200
+@@ -19,7 +19,6 @@
+ # On CentOS 6 `git rev-list HEAD --count` does not work
+ #
+ #
+-REVISION=`git log --pretty=oneline | wc -l`
+ 
+ if test -d "/usr/local/include"; then
+ CFLAGS="${CFLAGS} -I/usr/local/include"
+@@ -48,33 +47,6 @@
+ 
+ SHORT_MACHINE=`uname -m | cut -b1-3`
+ 
+-GIT_RELEASE="@GIT_RELEASE@"
+-GIT_DATE="@GIT_DATE@"
+-GIT_BRANCH="@GIT_BRANCH@"
+-PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
+-PRO_GIT_DATE="@PRO_GIT_DATE@"
+-
+-AC_MSG_CHECKING(for nDPI)
+-NDPI_HOME=./nDPI
+-if test -d "$NDPI_HOME" ; then :
+-   AC_MSG_RESULT(found in $NDPI_HOME)
+-else
+-   NDPI_HOME=../nDPI
+-   if test -d "$NDPI_HOME"; then :
+-  AC_MSG_RESULT(found in $NDPI_HOME)
+-   else
+-  NDPI_HOME=$HOME/nDPI
+-  if test -d "$NDPI_HOME"; then :
+-AC_MSG_RESULT(found in $NDPI_HOME)
+-  else
+-AC_MSG_RESULT(not found)
+-echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd 
nDPI; ./autogen.sh; make; cd ../ntopng"
+-echo " and try again"
+-exit
+-  fi
+-   fi
+-fi
+-
+ if test -d "/usr/include/openssl"; then :
+  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+  SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
+--- configure.ac.orig  2017-06-09 09:58:17.021114895 +0200
 configure.ac   2017-06-09 09:58:24.227781519 +0200
+@@ -53,15 +53,6 @@
+  SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
+ 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)
+ PRO_MAKEFILE_INC=
+ PRO_INC=

diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch 
b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
new file mode 100644
index 000..e433f4e9559
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig  2017-06-09 09:52:26.387783657 +0200
 configure.ac   2017-06-09 09:54:53.361116113 +0200
+@@ -335,13 +335,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

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

2017-06-19 Thread Slawek Lis

commit: 9aa11e9dde33e9fbde4ef8eff046bf410ec517b0
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Jun 19 11:58:22 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Jun 19 11:58:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa11e9d

net-analyzer/ntopng: updated metadata remote-id

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/ntopng/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index cab61f7e001..334443b640d 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -5,6 +5,6 @@
 s...@gentoo.org
   
   
-ntop
+ntop/ntopng

[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/

2017-01-15 Thread David Seifert

commit: 470c92bbd3101545ce507f4f125e22b74b4a1b72
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Jan 15 09:10:20 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 15 09:49:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470c92bb

net-analyzer/ntopng: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3487

 .../ntopng/files/ntopng-2.0-dont-build-ndpi.patch| 16 
 1 file changed, 16 deletions(-)

diff --git a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch 
b/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
deleted file mode 100644
index b189cba..
--- a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 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 :

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

2016-11-21 Thread Slawek Lis

commit: 4482012f5bd8f2a753509d6214ec284466731d59
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Nov 21 14:12:26 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Nov 21 19:48:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4482012f

net-analyzer/ntopng: updated dependencies

Added missing dependencies: dev-libs/json-c
and added redis use flag, and dependency to dev-libs/hiredis

I'm not sure if dev-db/redis is still needed

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/metadata.xml  | 3 +++
 net-analyzer/ntopng/ntopng-2.4.ebuild | 6 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index cab61f7..9b7a6e8 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -7,4 +7,7 @@
   
 ntop
   
+  
+Enable REDIS support
+  
 

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index f6c9071..6f8199c 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -12,20 +12,22 @@ SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz 
-> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="redis"
 
 DEPEND="dev-db/sqlite:3
dev-python/pyzmq
dev-lang/luajit:2
+   dev-libs/json-c
dev-libs/geoip
dev-libs/glib:2
+   redis? ( dev-libs/hiredis )
dev-libs/libxml2
net-analyzer/rrdtool
net-libs/libpcap
net-misc/curl
virtual/libmysqlclient"
 RDEPEND="${DEPEND}
-   dev-db/redis"
+   redis? ( dev-db/redis )"
 
 S="${WORKDIR}/${P}-stable"

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

2016-11-21 Thread Slawek Lis

commit: c461e99503e7a3c3c8d83773fdbbcb70c79897a1
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Nov 21 19:47:25 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Nov 21 19:48:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c461e995

net-analyzer/ntopng: Drop old versions

Dropped version 2.0 and 1.2.1

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/Manifest|  2 -
 net-analyzer/ntopng/ntopng-1.2.1.ebuild | 52 --
 net-analyzer/ntopng/ntopng-2.0.ebuild   | 77 -
 3 files changed, 131 deletions(-)

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 0a25eae..e529401 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1 @@
-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/ntopng-1.2.1.ebuild 
b/net-analyzer/ntopng/ntopng-1.2.1.ebuild
deleted file mode 100644
index b5725ca..
--- a/net-analyzer/ntopng/ntopng-1.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools user
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/;
-SRC_URI="mirror://sourceforge/ntop/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-   dev-libs/geoip
-   dev-libs/glib:2
-   net-libs/libpcap"
-RDEPEND="${DEPEND}
-   dev-db/redis"
-
-src_prepare() {
-   eautoreconf
-}
-
-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'"
-}

diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild 
b/net-analyzer/ntopng/ntopng-2.0.ebuild
deleted file mode 100644
index eca802c..
--- a/net-analyzer/ntopng/ntopng-2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-   dev-lang/luajit:2
-   dev-libs/geoip
-   dev-libs/glib:2
-   dev-libs/libxml2
-   net-analyzer/rrdtool
-   net-libs/libpcap
-   dev-python/pyzmq"
-RDEPEND="${DEPEND}
-   dev-db/redis"
-
-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"
-   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
-   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

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

2016-11-21 Thread Slawek Lis

commit: 0662802372a980e6e5863f230ab6d976745d2723
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Nov 21 19:46:22 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Nov 21 19:48:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06628023

net-analyzer/ntopng: fixes problems with hardcoded g++ calls

Thanks to Thomas Deutschmann this should finally fixes problems with 600246.

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/metadata.xml  | 3 ---
 net-analyzer/ntopng/ntopng-2.4.ebuild | 9 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index 9b7a6e8..cab61f7 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -7,7 +7,4 @@
   
 ntop
   
-  
-Enable REDIS support
-  
 

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild 
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 6f8199c..75e58cc 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils user
+inherit autotools eutils user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/;
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz 
-> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="redis"
+IUSE=""
 
 DEPEND="dev-db/sqlite:3
dev-python/pyzmq
@@ -20,14 +20,14 @@ DEPEND="dev-db/sqlite:3
dev-libs/json-c
dev-libs/geoip
dev-libs/glib:2
-   redis? ( dev-libs/hiredis )
+   dev-libs/hiredis
dev-libs/libxml2
net-analyzer/rrdtool
net-libs/libpcap
net-misc/curl
virtual/libmysqlclient"
 RDEPEND="${DEPEND}
-   redis? ( dev-db/redis )"
+   dev-db/redis"
 
 S="${WORKDIR}/${P}-stable"
 
@@ -44,6 +44,7 @@ src_prepare() {
 }
 
 src_configure() {
+   tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
cd "${S}/nDPI"
econf
cd "${S}"

[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
+

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

2016-11-11 Thread Slawek Lis

commit: dd304cf7d48da6beecc0beb5c6496bda0e177c94
Author: Slawomir Lis  gentoo  org>
AuthorDate: Fri Nov 11 20:30:50 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Fri Nov 11 20:30:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd304cf7

net-analyzer/ntopng: fixed bug with configuration

Fixed a bug (#599528) caused when building without libpcap.
Configuration script does not return an error code, so configure
phase was completed succesfully.

Reported-By: Toralf Förster  gmx.de>

Package-Manager: portage-2.3.2

 net-analyzer/ntopng/ntopng-2.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild 
b/net-analyzer/ntopng/ntopng-2.0.ebuild
index 1f16266..eca802c 100644
--- a/net-analyzer/ntopng/ntopng-2.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.0.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 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"
+   sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
eautoreconf
 
cd "${S}/nDPI"

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

2016-04-26 Thread Slawek Lis

commit: 112d5999d85b36db4a7443df08e21df5f2e579f7
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Apr 26 11:56:43 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Apr 26 11:56:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112d5999

added missing patch (#581256)

Package-Manager: portage-2.2.28

 .../ntopng/files/ntopng-2.0-dont-build-ndpi.patch| 16 
 1 file changed, 16 insertions(+)

diff --git a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch 
b/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
new file mode 100644
index 000..b189cba
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.0-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 :

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

2015-09-01 Thread Slawek Lis

commit: 1bd5096cf5cc86a5cc8dee2a702a564927a6e3b5
Author: Sławomir Lis  gentoo  org>
AuthorDate: Wed Sep  2 05:38:00 2015 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Wed Sep  2 05:38:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd5096c

Fixed deps (#558828)

Package-Manager: portage-2.2.20.1

 net-analyzer/ntopng/ntopng-2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild 
b/net-analyzer/ntopng/ntopng-2.0.ebuild
index 9c9a60d..b8aa18d 100644
--- a/net-analyzer/ntopng/ntopng-2.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="dev-db/sqlite:3
dev-libs/libxml2
net-analyzer/rrdtool
net-libs/libpcap
-   net-libs/zeromq"
+   dev-python/pyzmq"
 RDEPEND="${DEPEND}
dev-db/redis"

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

2015-08-23 Thread Slawek Lis

commit: 81d6e3ca5e59a3b3e92b5afe3bf0019b62134996
Author: Sławomir Lis slis AT gentoo DOT org
AuthorDate: Mon Aug 24 05:52:51 2015 +
Commit: Slawek Lis slis AT gentoo DOT org
CommitDate: Mon Aug 24 05:52:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d6e3ca

Fixed #558470

Package-Manager: portage-2.2.20

 net-analyzer/ntopng/ntopng-2.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild 
b/net-analyzer/ntopng/ntopng-2.0.ebuild
index 120d0e0..9c9a60d 100644
--- a/net-analyzer/ntopng/ntopng-2.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.0.ebuild
@@ -15,10 +15,13 @@ KEYWORDS=~amd64 ~x86
 IUSE=
 
 DEPEND=dev-db/sqlite:3
+   dev-lang/luajit:2
dev-libs/geoip
dev-libs/glib:2
+   dev-libs/libxml2
+   net-analyzer/rrdtool
net-libs/libpcap
-   dev-libs/libxml2
+   net-libs/zeromq
 RDEPEND=${DEPEND}
dev-db/redis

60 matches

Mail list logo