* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntop/files/, net-analyzer/ntop/
@ 2016-04-24 19:40 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2016-04-24 19:40 UTC (permalink / raw
To: gentoo-commits
commit: e84fb684085eec755093c510efab2900e9af9f4d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 19:38:55 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 19:40:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e84fb684
net-analyzer/ntop: Fix building against net-analyzer/rrdtool-1.6.0 (bug #581046).
Package-Manager: portage-2.2.28
net-analyzer/ntop/files/ntop-5.0.1-librrd.patch | 31 +++++++++++++++++++++++++
net-analyzer/ntop/ntop-5.0.1-r1.ebuild | 17 ++++++++++----
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
new file mode 100644
index 0000000..db2530c
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
@@ -0,0 +1,31 @@
+--- a/configure.in
++++ b/configure.in
+@@ -887,28 +887,6 @@
+ fi
+ fi
+
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
+-
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
+- AC_MSG_RESULT(checking for rrdtool... yes)
+-else
+- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
+- AC_MSG_RESULT(checking for rrdtool... yes)
+- else
+- if test -f "$RRD_HOME/lib/librrd_th.a"; then
+- AC_MSG_RESULT(checking for rrdtool... yes)
+- else
+- AC_CHECK_LIB([rrd_th], [main])
+- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
+- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+- else
+- RRD_LIB=
+- fi
+- fi
+- fi
+-fi
+-
+ RRD_INC=
+ if test -d "${RRD_HOME}/include"; then
+ RRD_INC="-I${RRD_HOME}/include"
diff --git a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
index 7893281..49b8f20 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils user python-single-r1
+inherit autotools eutils multilib user python-single-r1
DESCRIPTION="Network traffic analyzer with web interface"
HOMEPAGE="http://www.ntop.org/products/ntop/"
@@ -50,8 +50,11 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-includes.patch
+ epatch \
+ "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-includes.patch \
+ "${FILESDIR}"/${P}-librrd.patch
+
cp /usr/share/aclocal/libtool.m4 libtool.m4.in
cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
eautoreconf
@@ -77,10 +80,16 @@ src_configure() {
econf
popd &>/dev/null || die
+ if has_version '<net-analyzer/rrdtool-1.6'; then
+ export RRD_LIB=-lrrd_th
+ else
+ export RRD_LIB=-lrrd
+ fi
+
econf \
$(use_enable snmp) \
$(use_with ssl) \
- --with-rrd-home=/usr/lib
+ --with-rrd-home=/usr/$(get_libdir)
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntop/files/, net-analyzer/ntop/
@ 2018-01-06 14:42 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-01-06 14:42 UTC (permalink / raw
To: gentoo-commits
commit: bf5252b406cd0c436c09566105c5e05f406bd46a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 14:41:21 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 14:42:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5252b4
net-analyzer/ntop: remove last rited package
Bug: https://bugs.gentoo.org/513818
net-analyzer/ntop/Manifest | 1 -
net-analyzer/ntop/files/ntop-5.0.1-INCS.patch | 27 ---
net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch | 240 ----------------------
net-analyzer/ntop/files/ntop-5.0.1-includes.patch | 20 --
net-analyzer/ntop/files/ntop-5.0.1-librrd.patch | 31 ---
net-analyzer/ntop/files/ntop-confd | 9 -
net-analyzer/ntop/files/ntop-initd | 30 ---
net-analyzer/ntop/files/ntop-initd-r1 | 24 ---
net-analyzer/ntop/files/ntop-update-geoip-db | 21 --
net-analyzer/ntop/metadata.xml | 19 --
net-analyzer/ntop/ntop-5.0.1-r2.ebuild | 135 ------------
net-analyzer/ntop/ntop-5.0.1-r3.ebuild | 138 -------------
12 files changed, 695 deletions(-)
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
deleted file mode 100644
index 6c0873783d3..00000000000
--- a/net-analyzer/ntop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ntop-5.0.1.tar.gz 40133867 BLAKE2B a0f44114312c0d427e6d6fa75d4a19de782c670c0b47ff5e26c236fe825e089a1d706182f0e12226f55f9553e592489053d9b102652341523f0277b71925eff2 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
deleted file mode 100644
index de49a41d717..00000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -18983,7 +18983,7 @@
- else
- LIBS="${LIBS} ${PYTHON_LIBS}"
-
-- PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
-+ PYTHON_INCS=`$PYTHON_CONFIG --includes | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
-
- INCS="${INCS} ${PYTHON_INCS}"
-
-@@ -19335,15 +19335,6 @@
- for(i=NF; i>0; i--) { \
- if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
- } \
-- for(i=1; i<=NF; i++) { \
-- if (i in out) { printf("%s ", out[i]) } \
-- } \
-- print "" \
-- }'`
-- INCS=`echo ${INCS} | ${ac_cv_prog_AWK} '{ \
-- for(i=NF; i>0; i--) { \
-- if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
-- } \
- for(i=1; i<=NF; i++) { \
- if (i in out) { printf("%s ", out[i]) } \
- } \
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
deleted file mode 100644
index 57f136971cf..00000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -469,11 +469,6 @@
- LOCALEDIR="/usr/lib/locale"
- fi
-
--dnl> Add /usr/local/ /opt/local
--CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
--LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
--
- PWD=`pwd`
-
- echo
-@@ -1739,18 +1734,6 @@
- if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
- LIBS="$LIBS -lGeoIP"
-
--if test -f "GeoLiteCity.dat"; then
-- echo "GeoLiteCity.dat already present"
--else
-- if test -f "3rd_party/GeoLiteCity.dat.gz"; then
-- cp 3rd_party/GeoLiteCity.dat.gz .
-- else
-- wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-- fi
--
-- gunzip GeoLiteCity.dat.gz
--fi
--
- dnl> --------
-
- if test -f "GeoIPASNum.dat"; then
-@@ -1769,8 +1752,11 @@
- exit 1
- fi
-
--cp "3rd_party/oui.txt.gz" .
--cp "3rd_party/specialMAC.txt.gz" .
-+gunzip 3rd_party/GeoLiteCity.dat.gz &&
-+mv "3rd_party/etter.finger.os.gz" . &&
-+mv "3rd_party/oui.txt.gz" . &&
-+mv "3rd_party/specialMAC.txt.gz" . ||
-+ exit 1
-
- if test -d ./configureextra; then
-
-@@ -1931,7 +1917,6 @@
- AC_SUBST(SO_VERSION_PATCH)
- AC_SUBST(RRD_LIB)
- AC_SUBST(RRD_INC)
--AC_SUBST(GEO_DIR)
- AC_SUBST(GETOPT_H)
- AC_SUBST(GETOPT_C)
- AC_SUBST(NDPI_LIB)
---- a/globals-core.c
-+++ b/globals-core.c
-@@ -369,7 +369,7 @@
- _mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
- _headerSize[DLT_ATM_RFC1483] = 0;
-
-- /* _mtuSize[DLT_RAW] = ? raw IP */
-+ _mtuSize[DLT_RAW] = 1500; /* raw IP */
- _headerSize[DLT_RAW] = 0;
-
- /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
-@@ -470,19 +470,18 @@
- struct stat statbuf;
-
- /* Initialize GeoIP databases */
-- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+ {
- char path[256];
-
- safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- "%s%c%s",
-- myGlobals.configFileDirs[i],
-+ myGlobals.dbPath,
- CONST_PATH_SEP, GEO_IP_FILE);
- revertSlashIfWIN32(path, 0);
-
- if(stat(path, &statbuf) == 0) {
- if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
-- break;
- }
- }
- }
-@@ -491,20 +490,18 @@
- traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
-
- /* *************************** */
--
-- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+ {
- char path[256];
-
- safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- "%s%c%s",
-- myGlobals.configFileDirs[i],
-+ myGlobals.dbPath,
- CONST_PATH_SEP, GEO_IP_ASN_FILE);
- revertSlashIfWIN32(path, 0);
-
- if(stat(path, &statbuf) == 0) {
- if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
-- break;
- }
- }
- }
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,7 +36,6 @@
-
- #AM_CFLAGS =
- #AM_LDFLAGS=
--ACLOCAL_AMFLAGS=-I m4
-
- DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
- CLEANFILES = $(DISTCLEANFILES) stamp-h1
-@@ -67,9 +66,7 @@
- NTOPDATA = ntop-cert.pem \
- $(ETTER_PASSIVE) \
- oui.txt.gz \
-- specialMAC.txt.gz \
-- GeoIPASNum.dat \
-- GeoLiteCity.dat
-+ specialMAC.txt.gz
-
- NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png \
- html/*.css html/*.dtd \
-@@ -133,7 +130,7 @@
-
- libntop_la_DEPENDENCIES = config.h
- libntop_la_LIBADD = $(BASE_LIBS)
--libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
-+libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
-
- # Archive for http representation, or the 'viewer'
- libntopreport_la_SOURCES = emitter.c globals-report.c graph.c \
-@@ -145,7 +142,7 @@
-
- libntopreport_la_DEPENDENCIES = libntop.la
- libntopreport_la_LIBADD = libntop.la $(BASE_LIBS)
--libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
-+libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
-
- man_MANS = ntop.8
-
-@@ -367,30 +364,7 @@
-
- # download the vendor information table
- dnvt:
-- @echo ""
-- @echo ""
-- @echo -n "Preparing "
-- @if test -f oui.txt; then \
-- rm -rf oui.txt; \
-- fi
-- @if test -f oui.txt.gz.old; then \
-- rm -rf oui.txt.gz.old; \
-- fi;
-- @mv oui.txt.gz oui.txt.gz.old
-- @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
-- @echo ""
-- @wget -c http://standards.ieee.org/regauth/oui/oui.txt
-- @gzip oui.txt
-- @echo ""
-- @echo ""
-- @echo -n "Old file lines were: "
-- @gunzip -c oui.txt.gz.old | wc -l
-- @echo -n "New file lines are: "
-- @gunzip -c oui.txt.gz | wc -l
-- @echo ""
-- @echo ""
-- @echo "New file is:"
-- @ls -l oui.txt.gz
-+ @echo "Use included oui.txt.gz"
-
- # download the Novell SAP Protocol information table
- #dnsapt:
-@@ -398,45 +372,7 @@
-
- # download the passive ethernet fingerprint database
- dnetter:
-- @echo ""
-- @echo ""
-- @echo "Preparing "
-- @echo ""
--
-- @if test -f $(ETTER_PASSIVE).old; then \
-- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
-- rm -rf $(ETTER_PASSIVE).old; \
-- fi;
-- @if test -f $(ETTER_PASSIVE); then \
-- echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
-- mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
-- fi;
-- @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
-- $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
-- if test -f $$file; then \
-- echo "...Deleting prior file, $$file..."; \
-- rm -rf $$file; \
-- fi; \
-- done
-- @echo ""
-- @echo "...Downloading new file..."
-- @wget -O $(ETTER_PASSIVE_FILE) \
-- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
-- @echo ""
-- @echo "gziping downloaded file..."
-- @gzip $(ETTER_PASSIVE_FILE)
-- @echo ""
-- @echo ""
-- @if test -f $(ETTER_PASSIVE).old; then \
-- echo -n "Old file lines were: "; \
-- gunzip -c $(ETTER_PASSIVE).old | wc -l; \
-- fi;
-- @echo -n "New file lines are: "
-- @gunzip -c $(ETTER_PASSIVE) | wc -l
-- @echo ""
-- @echo ""
-- @echo "New file is:"
-- @ls -l $(ETTER_PASSIVE)
-+ @echo "Use included $(ETTER_PASSIVE)"
-
- # ntop census
- census-fail:
---- a/report.c
-+++ b/report.c
-@@ -2299,7 +2299,7 @@
- if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
- snprintf(dotPath, sizeof(dotPath), "%s", buf);
- } else {
-- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
- storePrefsValue("dot.path", dotPath); /* Set the default */
- }
-
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-includes.patch b/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
deleted file mode 100644
index fcd5f28d349..00000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/nDPI/src/lib/protocols/netflow.c
-+++ b/nDPI/src/lib/protocols/netflow.c
-@@ -19,6 +19,7 @@
-
-
- #include "ipq_utils.h"
-+#include <time.h> /* time() */
-
- #ifdef NTOP_PROTOCOL_NETFLOW
-
---- a/nDPI/src/lib/protocols/ssl.c
-+++ b/nDPI/src/lib/protocols/ssl.c
-@@ -22,6 +22,7 @@
-
-
- #include "ipq_utils.h"
-+#include <ctype.h> /* isalpha() isdigit() ... */
-
- #ifdef IPOQUE_PROTOCOL_SSL
-
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
deleted file mode 100644
index db2530c8a5e..00000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -887,28 +887,6 @@
- fi
- fi
-
--RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
--
--if test -f "$RRD_HOME/lib/librrd_th.so"; then
-- AC_MSG_RESULT(checking for rrdtool... yes)
--else
-- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
-- AC_MSG_RESULT(checking for rrdtool... yes)
-- else
-- if test -f "$RRD_HOME/lib/librrd_th.a"; then
-- AC_MSG_RESULT(checking for rrdtool... yes)
-- else
-- AC_CHECK_LIB([rrd_th], [main])
-- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
-- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
-- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
-- else
-- RRD_LIB=
-- fi
-- fi
-- fi
--fi
--
- RRD_INC=
- if test -d "${RRD_HOME}/include"; then
- RRD_INC="-I${RRD_HOME}/include"
diff --git a/net-analyzer/ntop/files/ntop-confd b/net-analyzer/ntop/files/ntop-confd
deleted file mode 100644
index 352a26fa9b1..00000000000
--- a/net-analyzer/ntop/files/ntop-confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/ntop
-
-# Set preferred options here
-#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0"
-
-# suggestions from bug #136983 (use it in case you experience ntop hangs)
-#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001"
-
-NTOP_OPTS="-u ntop -P /var/lib/ntop"
diff --git a/net-analyzer/ntop/files/ntop-initd b/net-analyzer/ntop/files/ntop-initd
deleted file mode 100644
index ec9afd576f3..00000000000
--- a/net-analyzer/ntop/files/ntop-initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
- eerror "You need to set a password first by running"
- eerror "ntop --set-admin-password"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ntop"
- export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
- export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
- start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ntop"
- start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
- eend $?
-}
diff --git a/net-analyzer/ntop/files/ntop-initd-r1 b/net-analyzer/ntop/files/ntop-initd-r1
deleted file mode 100644
index e303753891e..00000000000
--- a/net-analyzer/ntop/files/ntop-initd-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="ntop - a network traffic analyzer"
-pidfile="/run/ntop.pid"
-command="/usr/bin/ntop"
-command_args="-L ${NTOP_OPTS}"
-start_stop_daemon_args="-p ${pidfile} -m -b"
-
-depend() {
- need net
-}
-
-start_pre() {
- if [ ! -e /var/lib/ntop/ntop_pw.db ] ; then
- eerror "You need to set a password first by running"
- eerror "ntop --set-admin-password"
- return 1
- fi
-
- export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
- export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
-}
diff --git a/net-analyzer/ntop/files/ntop-update-geoip-db b/net-analyzer/ntop/files/ntop-update-geoip-db
deleted file mode 100644
index 2bf3faaf68c..00000000000
--- a/net-analyzer/ntop/files/ntop-update-geoip-db
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-BASE_URL=http://geolite.maxmind.com/download/geoip/database
-
-echo "Updating NTOP GeoIP databases..."
-
-cd /var/lib/ntop || exit
-
-for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
- FILE_GZ=${u#*/}
- FILE=${FILE_GZ%.gz}
- wget -nv -O ${FILE_GZ} ${BASE_URL}/${u} &&
- gunzip < ${FILE_GZ} > .${FILE} &&
- mv -f .${FILE} ${FILE} &&
- rm -f ${FILE_GZ} ||
- exit
-done
-
-/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
-
-echo "NTOP GeoIP databases were successfully updated"
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
deleted file mode 100644
index 00542da2091..00000000000
--- a/net-analyzer/ntop/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <longdescription>ntop is a network traffic probe that shows the network usage,
- similar to what the popular top Unix command does. ntop is based on libpcap
- and it has been written in a portable way in order to virtually run on every
- Unix platform and on Win32 as well.
- ntop users can use a a web browser (e.g. netscape) to navigate through ntop
- (that acts as a web server) traffic information and get a dump of the network
- status. In the latter case, ntop can be seen as a simple RMON-like agent with an
- embedded web interface.</longdescription>
- <upstream>
- <remote-id type="sourceforge">ntop</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
deleted file mode 100644
index 8d51b212322..00000000000
--- a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/products/ntop/"
-SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="snmp ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- dev-lang/lua:=
- dev-lang/perl
- dev-libs/geoip
- dev-libs/libevent
- media-libs/gd
- media-libs/libpng:0=
- net-analyzer/rrdtool[graph]
- net-libs/libpcap
- snmp? ( net-analyzer/net-snmp[ipv6] )
- ssl? ( dev-libs/openssl:0= )
- sys-libs/gdbm
- sys-libs/zlib
- virtual/awk
- ${PYTHON_DEPS}
-"
-DEPEND="
- ${COMMON_DEPEND}
- >=sys-devel/libtool-1.5.26
-"
-RDEPEND="
- ${COMMON_DEPEND}
- app-arch/gzip
- dev-libs/glib:2
- dev-python/mako
- media-gfx/graphviz
- net-misc/wget
-"
-
-pkg_setup() {
- enewgroup ntop
- enewuser ntop -1 -1 /var/lib/ntop ntop
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-includes.patch \
- "${FILESDIR}"/${P}-librrd.patch
-
- cp /usr/share/aclocal/libtool.m4 libtool.m4.in
- cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
- eautoreconf
-
- # The build system is a complete mess, so apply a configure patch here
- # instead of patching configure.in above
- epatch "${FILESDIR}"/${P}-INCS.patch
-
- # Stop make from doing autotools stuff
- sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
-}
-
-src_configure() {
- export \
- ac_cv_header_glib_h=no \
- ac_cv_header_glibconfig_h=no \
- ac_cv_header_gdome_h=no \
- ac_cv_lib_glib_g_date_julian=no \
- ac_cv_lib_xml2_xmlCheckVersion=no \
- ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
- pushd nDPI >/dev/null || die
- econf
- popd &>/dev/null || die
-
- if has_version '<net-analyzer/rrdtool-1.6'; then
- export RRD_LIB=-lrrd_th
- else
- export RRD_LIB=-lrrd
- fi
-
- econf \
- $(use_enable snmp) \
- $(use_with ssl) \
- --with-rrd-home=/usr/$(get_libdir)
-}
-
-src_compile() {
- pushd nDPI >/dev/null || die
- emake
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-
- emake DESTDIR="${D}" install
-
- keepdir /var/lib/ntop
-
- insinto /var/lib/ntop
- gunzip 3rd_party/GeoIPASNum.dat.gz
- gunzip 3rd_party/GeoLiteCity.dat.gz
- local f
- for f in GeoIPASNum.dat GeoLiteCity.dat; do
- # Don't install included GeoIP files if newer versions are available
- [ -f "${ROOT}/var/lib/ntop/${f}" ] ||
- doins "3rd_party/${f}"
- done
-
- dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
- dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
- newinitd "${FILESDIR}"/ntop-initd-r1 ntop
- newconfd "${FILESDIR}"/ntop-confd ntop
-
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
- fowners ntop:ntop /var/lib/ntop
- fperms 750 /var/lib/ntop
-}
diff --git a/net-analyzer/ntop/ntop-5.0.1-r3.ebuild b/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
deleted file mode 100644
index 02987b7d1a6..00000000000
--- a/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/products/ntop/"
-SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libressl snmp ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- dev-lang/lua:=
- dev-lang/perl
- dev-libs/geoip
- dev-libs/libevent
- media-libs/gd
- media-libs/libpng:0=
- net-analyzer/rrdtool[graph]
- net-libs/libpcap
- snmp? ( net-analyzer/net-snmp[ipv6] )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- sys-libs/gdbm
- sys-libs/zlib
- virtual/awk
- ${PYTHON_DEPS}
-"
-DEPEND="
- ${COMMON_DEPEND}
- >=sys-devel/libtool-1.5.26
-"
-RDEPEND="
- ${COMMON_DEPEND}
- app-arch/gzip
- dev-libs/glib:2
- dev-python/mako
- media-gfx/graphviz
- net-misc/wget
-"
-
-pkg_setup() {
- enewgroup ntop
- enewuser ntop -1 -1 /var/lib/ntop ntop
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-includes.patch \
- "${FILESDIR}"/${P}-librrd.patch
-
- cp /usr/share/aclocal/libtool.m4 libtool.m4.in
- cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
- eautoreconf
-
- # The build system is a complete mess, so apply a configure patch here
- # instead of patching configure.in above
- epatch "${FILESDIR}"/${P}-INCS.patch
-
- # Stop make from doing autotools stuff
- sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
-}
-
-src_configure() {
- export \
- ac_cv_header_glib_h=no \
- ac_cv_header_glibconfig_h=no \
- ac_cv_header_gdome_h=no \
- ac_cv_lib_glib_g_date_julian=no \
- ac_cv_lib_xml2_xmlCheckVersion=no \
- ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
- pushd nDPI >/dev/null || die
- econf
- popd &>/dev/null || die
-
- if has_version '<net-analyzer/rrdtool-1.6'; then
- export RRD_LIB=-lrrd_th
- else
- export RRD_LIB=-lrrd
- fi
-
- econf \
- $(use_enable snmp) \
- $(use_with ssl) \
- --with-rrd-home=/usr/$(get_libdir)
-}
-
-src_compile() {
- pushd nDPI >/dev/null || die
- emake
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-
- emake DESTDIR="${D}" install
-
- keepdir /var/lib/ntop
-
- insinto /var/lib/ntop
- gunzip 3rd_party/GeoIPASNum.dat.gz
- gunzip 3rd_party/GeoLiteCity.dat.gz
- local f
- for f in GeoIPASNum.dat GeoLiteCity.dat; do
- # Don't install included GeoIP files if newer versions are available
- [ -f "${ROOT}/var/lib/ntop/${f}" ] ||
- doins "3rd_party/${f}"
- done
-
- dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
- dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
- newinitd "${FILESDIR}"/ntop-initd-r1 ntop
- newconfd "${FILESDIR}"/ntop-confd ntop
-
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
- fowners ntop:ntop /var/lib/ntop
- fperms 750 /var/lib/ntop
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-06 14:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-24 19:40 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntop/files/, net-analyzer/ntop/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-01-06 14:42 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox