public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2016-11-21 19:48 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2016-11-21 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c461e99503e7a3c3c8d83773fdbbcb70c79897a1
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 19:47:25 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 19:48:18 2016 +0000
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..00000000
--- 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..00000000
--- 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 "${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'"
-}


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2024-06-09 16:13 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2024-06-09 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     96b9512fe20183bdab340c9ac81752cddefac07c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 15:57:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 16:06:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b9512f

net-analyzer/ntopng: crank copyright

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/net-analyzer/ntopng/ntopng-6.0.ebuild b/net-analyzer/ntopng/ntopng-6.0.ebuild
index 53fcd2cf27ae..1a56defdbdc9 100644
--- a/net-analyzer/ntopng/ntopng-6.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-05-31  3:26 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-05-31  3:26 UTC (permalink / raw
  To: gentoo-commits

commit:     29ba33ce83d9124e240b0e2479d017216750dc06
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 03:18:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 03:18:19 2023 +0000
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 <sam <AT> 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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-05-31  3:26 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-05-31  3:26 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/ntopng: add github upstream metadata

Signed-off-by: Sam James <sam <AT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
-  <upstream>
-    <remote-id type="github">ntop/ntopng</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ntop/ntopng</remote-id>
+		<remote-id type="github">ntop/ntopng-dist</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-05-01 13:19 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-05-01 13:19 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/ntopng: drop 5.4

Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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/nDPI-4.8:=
-	>=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'"
-}


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-04-23  6:43 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-04-23  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4456cdbebd00b2c9308df8b430ea5f07393584c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 06:42:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 06:43:13 2023 +0000
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 <sam <AT> 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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-03-13 23:27 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-03-13 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     6e9dc95ce5410b428cb837dcdd06410cad9d2214
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 23:18:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 23:27:01 2023 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2023-02-03 16:53 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-02-03 16:53 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/ntopng: add 5.6

Signed-off-by: Sam James <sam <AT> 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 000000000000..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/nDPI-4.8:=
+	>=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'"
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2022-08-18  0:30 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2022-08-18  0:30 UTC (permalink / raw
  To: gentoo-commits

commit:     242e1c014bc6ad66793c8cc0440237ad2bd03de5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 00:29:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 00:30:05 2022 +0000
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 <sam <AT> 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/nDPI-4.4:=
 	>=net-libs/zeromq-3:=
 	net-misc/curl
 	sys-libs/libcap


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2022-01-03 11:23 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2022-01-03 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     39868efcc6779ea5e5272c3434e4a59f0bae9aa1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 11:20:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 11:21:21 2022 +0000
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 <sam <AT> 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 000000000000..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'"
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2021-06-22 18:19 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2021-06-22 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     60234f86b6142c9b06c105fa9db5261a399ae7dc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 22:12:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 18:18:46 2021 +0000
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 <soap <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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:=


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2020-12-27  0:50 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-12-27  0:50 UTC (permalink / raw
  To: gentoo-commits

commit:     4f508dca41761376f074e5d2e4c633b11da662c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 00:50:22 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 00:50:26 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2020-03-23 12:45 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2020-03-23 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     404a83b8264bda805e7f214ef047830ea0446427
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 12:44:53 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 12:45:26 2020 +0000
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 <jer <AT> 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:=


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2020-01-19 12:13 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2020-01-19 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     44bbe2f83871bdca15b05bcf4ebd2f63e16279f5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 12:10:30 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 12:13:01 2020 +0000
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 <jer <AT> 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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-12-30  9:23 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2019-12-30  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9e3ab652b2a50bfe001fe6326cf5ae1d94f2ac32
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 09:21:46 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 09:23:11 2019 +0000
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 <jer <AT> 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}


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-12-29 15:20 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2019-12-29 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     1343a920652c3953ee5fdffdb272c1ce01a94578
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 15:07:25 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 15:20:23 2019 +0000
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 <jer <AT> 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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-12-28 13:10 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2019-12-28 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     eab423ded8cef06c7dc7ef3f3386148db0121c28
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 13:10:28 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 13:10:45 2019 +0000
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 <jer <AT> 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:="


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-12-28  1:03 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2019-12-28  1:03 UTC (permalink / raw
  To: gentoo-commits

commit:     879db73169006aefa4637ada9deed3ec0d7955ea
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 01:02:45 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 01:03:54 2019 +0000
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 <jer <AT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
   <upstream>
     <remote-id type="github">ntop/ntopng</remote-id>
   </upstream>


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-08-28 19:41 Michał Górny
  0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2019-08-28 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     a5e7ab21be9466cec932058afb1f7ba0938db6d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 17:57:54 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 19:41:14 2019 +0000
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 <mgorny <AT> 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() {


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-08-28 11:17 Thomas Deutschmann
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Deutschmann @ 2019-08-28 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     29c36e086175327c309e012a29b9637d9e234a5d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 10:56:22 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 11:17:20 2019 +0000
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 <whissi <AT> 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


^ permalink raw reply	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-08-28 11:11 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2019-08-28 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b476720f82f6376175a6d75420593c4a4c2ec574
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 11:11:21 2019 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 11:11:35 2019 +0000
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 <slis <AT> 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
 }


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-08-27  5:01 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2019-08-27  5:01 UTC (permalink / raw
  To: gentoo-commits

commit:     381ef2e24ed92f8e976a5ce534e53b2970d21ea9
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 05:00:54 2019 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 05:00:54 2019 +0000
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 <slis <AT> 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=(


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2019-08-24 10:30 Thomas Deutschmann
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Deutschmann @ 2019-08-24 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4ba9925d873b5f7e9562f5e3d67f11a89ee8a6e3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 10:16:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 10:30:10 2019 +0000
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 <whissi <AT> 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=(


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2018-06-09 10:34 Jeroen Roovers
  0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2018-06-09 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     537527d273736c630c057489eb4d6171ad6cab87
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  9 10:34:17 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 10:34:17 2018 +0000
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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2018-06-03 13:49 Aaron Bauman
  0 siblings, 0 replies; 37+ messages in thread
From: Aaron Bauman @ 2018-06-03 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     cf21bacc348d28876c51c72e7890200d52bbe284
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun  3 09:26:29 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 13:48:19 2018 +0000
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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2018-01-23 19:06 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2018-01-23 19:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e7f82a8eedbb20edd935ff420d91fdbcc3576d69
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 19:06:40 2018 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 19:06:40 2018 +0000
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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2018-01-22 21:03 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2018-01-22 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     47316be9937674510b62d56065bacc467660d31f
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 20:55:44 2018 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 21:00:30 2018 +0000
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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2017-12-19 21:45 Thomas Deutschmann
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Deutschmann @ 2017-12-19 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3561d9a3c675ddd32600cd7697ef5ced5a40d474
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 21:29:44 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 21:44:33 2017 +0000
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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2017-12-18 19:36 Richard Farina
  0 siblings, 0 replies; 37+ messages in thread
From: Richard Farina @ 2017-12-18 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b5b83df50a09e53a5568e283644dda9aaeaacf17
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 19:35:18 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 19:36:18 2017 +0000
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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2017-09-13 11:39 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2017-09-13 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7fee51f85a073f0ba622355ba683441f4ae790b1
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 11:22:00 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 11:28:14 2017 +0000
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"
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2017-06-22  6:51 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2017-06-22  6:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9d31277f6928bbb4f49b265cf62fb25338579151
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 06:51:22 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 06:51:22 2017 +0000
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 <AT> 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


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2017-06-19 11:59 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2017-06-19 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     9aa11e9dde33e9fbde4ef8eff046bf410ec517b0
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 11:58:22 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 11:58:56 2017 +0000
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 @@
     <email>slis@gentoo.org</email>
   </maintainer>
   <upstream>
-    <remote-id type="sourceforge">ntop</remote-id>
+    <remote-id type="github">ntop/ntopng</remote-id>
   </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2016-11-21 19:48 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2016-11-21 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4482012f5bd8f2a753509d6214ec284466731d59
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 14:12:26 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 19:48:06 2016 +0000
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 @@
   <upstream>
     <remote-id type="sourceforge">ntop</remote-id>
   </upstream>
+  <use>
+    <flag name="redis">Enable REDIS support</flag>
+  </use>
 </pkgmetadata>

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"
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2016-11-21 19:48 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2016-11-21 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0662802372a980e6e5863f230ab6d976745d2723
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 19:46:22 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 19:48:16 2016 +0000
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 @@
   <upstream>
     <remote-id type="sourceforge">ntop</remote-id>
   </upstream>
-  <use>
-    <flag name="redis">Enable REDIS support</flag>
-  </use>
 </pkgmetadata>

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}"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2016-11-11 20:31 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2016-11-11 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     dd304cf7d48da6beecc0beb5c6496bda0e177c94
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 20:30:50 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 20:30:50 2016 +0000
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 <toralf.foerster <AT> 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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2015-09-02  5:36 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2015-09-02  5:36 UTC (permalink / raw
  To: gentoo-commits

commit:     1bd5096cf5cc86a5cc8dee2a702a564927a6e3b5
Author:     Sławomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 05:38:00 2015 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 05:38:00 2015 +0000
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"
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
@ 2015-08-24  5:52 Slawek Lis
  0 siblings, 0 replies; 37+ messages in thread
From: Slawek Lis @ 2015-08-24  5:52 UTC (permalink / raw
  To: gentoo-commits

commit:     81d6e3ca5e59a3b3e92b5afe3bf0019b62134996
Author:     Sławomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 05:52:51 2015 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 05:52:51 2015 +0000
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"
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread

end of thread, other threads:[~2024-06-09 16:13 UTC | newest]

Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 19:48 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/ Slawek Lis
  -- strict thread matches above, loose matches on Subject: below --
2024-06-09 16:13 Sam James
2023-05-31  3:26 Sam James
2023-05-31  3:26 Sam James
2023-05-01 13:19 Sam James
2023-04-23  6:43 Sam James
2023-03-13 23:27 Sam James
2023-02-03 16:53 Sam James
2022-08-18  0:30 Sam James
2022-01-03 11:23 Sam James
2021-06-22 18:19 Sam James
2020-12-27  0:50 Sam James
2020-03-23 12:45 Jeroen Roovers
2020-01-19 12:13 Jeroen Roovers
2019-12-30  9:23 Jeroen Roovers
2019-12-29 15:20 Jeroen Roovers
2019-12-28 13:10 Jeroen Roovers
2019-12-28  1:03 Jeroen Roovers
2019-08-28 19:41 Michał Górny
2019-08-28 11:17 Thomas Deutschmann
2019-08-28 11:11 Slawek Lis
2019-08-27  5:01 Slawek Lis
2019-08-24 10:30 Thomas Deutschmann
2018-06-09 10:34 Jeroen Roovers
2018-06-03 13:49 Aaron Bauman
2018-01-23 19:06 Slawek Lis
2018-01-22 21:03 Slawek Lis
2017-12-19 21:45 Thomas Deutschmann
2017-12-18 19:36 Richard Farina
2017-09-13 11:39 Slawek Lis
2017-06-22  6:51 Slawek Lis
2017-06-19 11:59 Slawek Lis
2016-11-21 19:48 Slawek Lis
2016-11-21 19:48 Slawek Lis
2016-11-11 20:31 Slawek Lis
2015-09-02  5:36 Slawek Lis
2015-08-24  5:52 Slawek Lis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox