commit: befab011ab1f38e37a7b93238e9d0c7071ba725a Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Dec 28 12:07:57 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Dec 28 12:08:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befab011
net-analyzer/ntopng: Old Package-Manager: Portage-2.3.84, Repoman-2.3.20 Bug: https://bugs.gentoo.org/636040 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/ntopng/Manifest | 2 - net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 42 ----------- .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 16 ---- .../ntopng/files/ntopng-2.4-mysqltool.patch | 17 ----- net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch | 60 --------------- .../ntopng/files/ntopng-3.0-mysqltool.patch | 17 ----- .../ntopng/files/ntopng-3.0-pointer-cmp.patch | 11 --- net-analyzer/ntopng/ntopng-2.4-r1.ebuild | 86 ---------------------- net-analyzer/ntopng/ntopng-3.0-r4.ebuild | 75 ------------------- 9 files changed, 326 deletions(-) diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index ecc686e168d..a4dd46d47f4 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,4 +1,2 @@ -DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a -DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch deleted file mode 100644 index 6de1a43f9b8..00000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -341,14 +341,6 @@ - GMAKE="make" - fi - --GPP=`which clang++` --if test x$GPP = x --then -- GPP="g++" --else -- GPP="$GPP -O0" --fi -- - GIT=`which git` - if test x$GIT = x - then ---- a/Makefile.in -+++ b/Makefile.in -@@ -4,7 +4,6 @@ - SHELL=/bin/sh - OS := $(shell uname -s) - PWD=@PWD@ --GPP=@GPP@ - INSTALL_DIR=$(DESTDIR)$(prefix) - MAN_DIR=$(DESTDIR)@MAN_DIR@ - -@@ -126,12 +125,12 @@ - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - - %.o: %.cpp $(HEADERS) Makefile -- $(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ - - .PRECIOUS: $(TARGET) $(OBJECTS) - - $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile -- $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@ -+ $(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@ - - $(LUAJIT_LIB): - cd $(LUAJIT_HOME); @GMAKE@ diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch deleted file mode 100644 index ef40c72d589..00000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -62,13 +62,6 @@ - fi - - NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a --AC_MSG_CHECKING(for $NDPI_LIB) --if test -f "$NDPI_LIB" ; then : -- AC_MSG_RESULT(found $NDPI_LIB) --else -- AC_MSG_RESULT(not found $NDPI_LIB: compiling) -- cd $NDPI_HOME; ./autogen.sh; make; cd - --fi - - AC_MSG_CHECKING(for ntopng professional edition) - if test -d "pro"; then : diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch deleted file mode 100644 index a80e966b85d..00000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -302,13 +302,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch deleted file mode 100644 index 90d7aace545..00000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ - # On CentOS 6 `git rev-list HEAD --count` does not work - # - # --REVISION=`git log --pretty=oneline | wc -l` - - if test -d "/usr/local/include"; then - CFLAGS="${CFLAGS} -I/usr/local/include" -@@ -48,33 +47,6 @@ - - SHORT_MACHINE=`uname -m | cut -b1-3` - --GIT_RELEASE="@GIT_RELEASE@" --GIT_DATE="@GIT_DATE@" --GIT_BRANCH="@GIT_BRANCH@" --PRO_GIT_RELEASE="@PRO_GIT_RELEASE@" --PRO_GIT_DATE="@PRO_GIT_DATE@" -- --AC_MSG_CHECKING(for nDPI) --NDPI_HOME=./nDPI --if test -d "$NDPI_HOME" ; then : -- AC_MSG_RESULT(found in $NDPI_HOME) --else -- NDPI_HOME=../nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- NDPI_HOME=$HOME/nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- AC_MSG_RESULT(not found) -- echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng" -- echo " and try again" -- exit -- fi -- fi --fi -- - if test -d "/usr/include/openssl"; then : - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) - SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -@@ -53,15 +53,6 @@ - SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" - fi - --NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a --AC_MSG_CHECKING(for $NDPI_LIB) --if test -f "$NDPI_LIB" ; then : -- AC_MSG_RESULT(found $NDPI_LIB) --else -- AC_MSG_RESULT(not found $NDPI_LIB: compiling) -- cd $NDPI_HOME; ./autogen.sh; make; cd - --fi -- - AC_MSG_CHECKING(for ntopng professional edition) - PRO_MAKEFILE_INC= - PRO_INC= diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch deleted file mode 100644 index 4d2244b582b..00000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -335,13 +335,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch deleted file mode 100644 index 171bee36e89..00000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/AddressResolution.cpp -+++ b/src/AddressResolution.cpp -@@ -52,7 +52,7 @@ - u_int numeric_ip_len; - - snprintf(query, sizeof(query), "%s", _numeric_ip); -- if((at = strchr(query, '@')) != '\0') at[0] = '\0'; -+ if((at = strchr(query, '@')) != NULL) at[0] = '\0'; - numeric_ip = query; - numeric_ip_len = strlen(numeric_ip)-1; - diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild deleted file mode 100644 index 3e53ff54518..00000000000 --- a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://www.ntop.org/"; -SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - net-misc/curl - dev-db/mysql-connector-c - !net-libs/nDPI" -RDEPEND="${DEPEND} - dev-db/redis" - -S="${WORKDIR}/${P}-stable" - -src_prepare() { - cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac" - epatch "${FILESDIR}/${P}-dont-build-ndpi.patch" - epatch "${FILESDIR}/${P}-mysqltool.patch" - epatch "${FILESDIR}/${P}-cxx.patch" - sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac" - eautoreconf - - cd "${S}/nDPI" - eautoreconf -} - -src_configure() { - tc-export CC CXX LD NM OBJDUMP PKG_CONFIG - cd "${S}/nDPI" - econf - cd "${S}" - econf -} - -src_compile() { - cd "${S}/nDPI" - emake - - cd "${S}" - emake -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/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-3.0-r4.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild deleted file mode 100644 index 2a126bff047..00000000000 --- a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/"; -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libsodium:= - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - =net-libs/nDPI-2.0 - net-misc/curl - sys-libs/binutils-libs:= - dev-db/mysql-connector-c:=" -RDEPEND="${DEPEND} - dev-db/redis" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-mysqltool.patch - "${FILESDIR}"/${P}-pointer-cmp.patch -) - -src_prepare() { - sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die - - default - - eautoreconf -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -}
