commit: bc04fe6e400be058e5727c64f07070378ce0b1c0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Feb 10 18:43:53 2026 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Feb 10 18:43:53 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc04fe6e
net-analyzer/ntopng: drop 5.2.1-r1, 5.6-r2 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-analyzer/ntopng/Manifest | 3 - .../ntopng/files/ntopng-5.2.1-build-system.patch | 89 ----------------- .../ntopng/files/ntopng-5.2.1-ndpi-linking.patch | 13 --- net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild | 98 ------------------ net-analyzer/ntopng/ntopng-5.6-r2.ebuild | 111 --------------------- 5 files changed, 314 deletions(-) diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index b2beb8993ffe..9afd078f6a17 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,5 +1,2 @@ -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 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 deleted file mode 100644 index ff05d103f22a..000000000000 --- a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://github.com/ntop/ntopng/pull/6288 - -From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Tue, 8 Feb 2022 06:07:21 +0000 -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 <[email protected]> ---- - 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 <[email protected]> -Date: Tue, 8 Feb 2022 06:08:02 +0000 -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 <[email protected]> ---- - 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 <[email protected]> -Date: Tue, 8 Feb 2022 06:09:44 +0000 -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 <[email protected]> ---- - 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-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch deleted file mode 100644 index 4940cb44b733..000000000000 --- a/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac.in -+++ b/configure.ac.in -@@ -236,8 +236,8 @@ fi - 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="-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/ntopng-5.2.1-r1.ebuild b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild deleted file mode 100644 index db6be947a818..000000000000 --- a/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2025 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.2:= - <net-libs/nDPI-4.4:= - >=net-libs/zeromq-3:= - net-misc/curl - sys-libs/libcap - virtual/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.2.1-ndpi-linking.patch - "${FILESDIR}"/${PN}-5.2.1-build-system.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 -} - -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'" -} diff --git a/net-analyzer/ntopng/ntopng-5.6-r2.ebuild b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild deleted file mode 100644 index f1a43c3edfca..000000000000 --- a/net-analyzer/ntopng/ntopng-5.6-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2025 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. 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/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.6:= - <net-libs/nDPI-4.8:= - >=net-libs/zeromq-3:= - net-misc/curl - sys-libs/libcap - virtual/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() { - # httpdocs/geoip/README.geolocation.md is a symlink, change to real file - GEOLOCATION_MD="httpdocs/geoip/README.geolocation.md" - if [[ -h "${GEOLOCATION_MD}" ]] ; then - GEOLOCATION_MD_REAL=$(readlink -m -- "${GEOLOCATION_MD}" || die) - ln -f ${GEOLOCATION_MD_REAL} ${GEOLOCATION_MD} || die - fi - - 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'" -}
