gentoo auto-resync : 10:06:2024 - 00:08:04

4 files changed, 142 insertions, 0 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 473d35ae2a93..014b6ee07432 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 2486fb7d59bd..da063c0e38c6 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -2,11 +2,15 @@ AUX ntopng-5.2.1-build-system.patch 2624 BLAKE2B 5fa408c42203009152d20b207e64b41
 AUX ntopng-5.2.1-mysqltool.patch 494 BLAKE2B cff0845f604a0c73a025043417a2b70e7d8f36feb73684230e410dcf3b67c08432b79e852018299c829d36fce6d082fb7b9172d216477c8f928f720c04cba643 SHA512 0aed88a94fc21888e468c71212389f89765f5b394411e6a2838299a280a9cba8e996ebe652b8d116ddc8b9c51b66a463c206917187b138badc76246ade3a780f
 AUX ntopng-5.2.1-ndpi-linking.patch 474 BLAKE2B cacf4f42af93bc656558873f732734bac70f6732325686b8c4f4e38c9f9fb39e6fcfc3b189da29b27b155c55249717c546d408d27ba488682e364e794caba2d9 SHA512 cc5cd78e7ed6499c91f16695f45d0284ed6430a435364919d320ca80f4c7c25bbb68cdea070b8710535fd327faa6f0d62b6c0dfa605e34555c14a6cd8b4dc36b
 AUX ntopng-5.4-ndpi-linking.patch 1567 BLAKE2B 822c91e973562621665f5385ee5ab831c566f575689bdda84885ce3bac524312e6fad98a51d0de04fb87d1ebb55616ac6ca26c54661b1c839b93f3ebf573aa80 SHA512 5315da87516c40ec8440bbf82df1acedd3978433d63d70744a5f8cb234e81a7ea01a876c035c42e3b4541672e4bbe0ed2fc10ab821c8fad39fb818e387b4cb04
+AUX ntopng-6.0-dont-const-cast-argv.patch 1079 BLAKE2B 65b5a3e96ab1a10fe7e01c59f39929c7bc0f42b0d8f1b0f783c6b6c43c82517a43e96e1f7bf788c4c9366bad9d9f79272a60545107808d979207a2ed9e136899 SHA512 df2e8a7e35decbfad36d16a40d3934d0a9ce214c1f06a4991c31fb3359abf86ff81256a98e6d1187c15c1efbba332f6a08b69b60ae846343c0dac5bb656a687c
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
 DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAKE2B 5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0 SHA512 cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e
 DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
+DIST ntopng-6.0-web-34c53388e8da61e6e04b3efd8e98dcd9b9e4fe1b.tar.gz 2890924 BLAKE2B 476ce4ea83fbd1241c12e2cd486f97570457721fd7a7e78e0e7b04ae80c4a69beb37a00e6fb6e47783f9296371cc92b4c9347016bc971d815a3af83d1671eb1d SHA512 f9a1cf583c8d513a543498c9712ab40b9c1978877c5a86c0ec89bd26e9f66b8d90a0700f417bd7166b0b683e5091a3a1d30d4888564ae4220e62a9d82d17bc64
+DIST ntopng-6.0.tar.gz 68289620 BLAKE2B 7edbd1b6231fdd1592f1b6ecca9f96dc79513dce1c53db70fb7b721ea483738dc0e74107ca15629c430e14ca7e461053967abc35de09e303e36ded9ed9994b43 SHA512 d9d27bed0706d36c82a5b22b2b918014fed7d614e11c79cc47ee1033ae5fd2f703a67f3c5205c63c014bbd2839eb7c78616137ee6cc11d09ebcf6fafc7a658d2
 EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352
 EBUILD ntopng-5.6-r2.ebuild 2679 BLAKE2B 571cf56697fede8a76c11c005cf72317ac1994f409c7b52c1166eb287316cda1f091f4820602aa48e618ebb8b5cb1db994550a1e0113819c7741384b5624cc9b SHA512 ab97ba128089ad8da9dc1030f08739a1d46f21438910b943a9b78fc5a6eb585ddc8d9de6a502f232b530b32998ca72bf449ceb53552dca08440fd2b3db8bfdd7
+EBUILD ntopng-6.0.ebuild 2706 BLAKE2B e29feaeda4d9f21a41148eb67ed751538ace81ea2aba54107caa2bbe72c405b45194181c3f0bcea528d21296e71ca2a575a425ebd6ffbbf6d15f87a40d3b9782 SHA512 1e250ccb9e28dcc384df2d261dec363ba1c9eb5ee12dc4f3d794777e02f48a0a68de22e5539a03b78f8af5f1895f8d45e622de021f8c53058ba987859f98b325
 MISC metadata.xml 351 BLAKE2B f875521f57df7e8c4391c954f3343f04e0187e0aec7e20619ad077b5089c6c877a92573a3c42e0377ef82e16fe25acf4cb63e0a05f0491ddb5170c26210c2559 SHA512 4e4d54fdaf03accaa5bd183e56e8f8d4deb6316303a04586be0fbef3c0ec284b0915647bf27bbf96009d4106bde581b1635f0a94e350af4caa059252858c07c7
diff --git a/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch b/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch
new file mode 100644
index 000000000000..199db074097e
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch
@@ -0,0 +1,34 @@
+The patch is borrowed from upstream https://github.com/ntop/ntopng
+
+https://github.com/ntop/ntopng/commit/5069aa4a6259bd0830a33f2ece980612dba5ace9
+
+commit 5069aa4a6259bd0830a33f2ece980612dba5ace9 (HEAD -> 6.0-stable, origin/6.0-stable)
+Author: Denis Pronin <dannftk@yandex.ru>
+Date:   Sat Jun 8 09:29:51 2024 +0300
+
+    fix building when rrd_tune() function has const char** as the 2nd param (#8442)
+    
+    Signed-off-by: Denis Pronin <dannftk@yandex.ru>
+
+diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp
+index 42e41822c..ea8e3769f 100644
+--- a/src/LuaEngineNtop.cpp
++++ b/src/LuaEngineNtop.cpp
+@@ -21,6 +21,8 @@
+ 
+ #include "ntop_includes.h"
+ 
++#include <type_traits>
++
+ extern "C" {
+ #include "rrd.h"
+ };
+@@ -6296,7 +6298,7 @@ static int ntop_rrd_tune(lua_State *vm) {
+   filename = argv[1];
+ 
+   reset_rrd_state();
+-  status = rrd_tune(argc, (char **)argv);
++  status = rrd_tune(argc, (std::conditional<std::is_same<decltype(rrd_tune), int(int, const char **)>::value, const char **, char **>::type)argv);
+ 
+   if (status != 0) {
+     char *err = rrd_get_error();
diff --git a/net-analyzer/ntopng/ntopng-6.0.ebuild b/net-analyzer/ntopng/ntopng-6.0.ebuild
new file mode 100644
index 000000000000..1a56defdbdc9
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+# Check this on bumps, get latest commit from the relevant branch (e.g. 6.0-stable)
+# See bug #894152 and https://github.com/ntop/ntopng/issues/7203
+NTOPNG_DIST_COMMIT="34c53388e8da61e6e04b3efd8e98dcd9b9e4fe1b"
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+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"
+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.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
+	"${FILESDIR}"/${PN}-6.0-dont-const-cast-argv.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}"/httpdocs/dist
+	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
+
+	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'"
+}