reinit the tree, so we can have metadata

12 files changed, 708 insertions, 0 deletions

diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
new file mode 100644
index 000000000000..71493325dc4d
--- /dev/null
+++ b/net-analyzer/ntop/Manifest
@@ -0,0 +1,14 @@
+AUX ntop-5.0.1-INCS.patch 951 SHA256 cd719a29f6e98ee4ba24ebd21b12ee6164e564deaa0e1a2aac93046d23ffa3f7 SHA512 396b1d8b9c99faa390615795f470221a6b2a5d9a9e4bf73ae6758e8cf4615e44571ac7c112e61f6be914a299b289f7caceffab08bbc083a5fcba069a5e1713c7 WHIRLPOOL 84825950cf4be6cc10072232776676dce2fd6a8c424637d6b4e7204b592944d9623b922e992878c4d305e42d7c94872d606d93606fdcb3b894e9e495ce7af977
+AUX ntop-5.0.1-gentoo.patch 6752 SHA256 cece982d8670c471e38e8b65c85a131a8a6ede31236e02743add5bec233d2418 SHA512 dd8309cd5c24eda0a9bb4a35b5598ff5f9a22b2af36ae9692f13b6254b2d9e624b646dda38610f6552b2694eb18d5946f0623fff76261c1d4e2ef94518fd5c69 WHIRLPOOL d7e88a7d2bb9cc92e81d2f5b019011212a8f88f551fe2fe06cf65b83e394b76ab474f3147f73a0d603e869344e7d0766f5784ad41215ce510a56498fd2cf4a2c
+AUX ntop-5.0.1-includes.patch 388 SHA256 60429cc4920da2ec387baa08e2bde1c32e999d330c6e3f921544198efb84040a SHA512 6afe8aee2dfee0c9b778a11896aa8b3341618171a74497832d2d67d76dea4374c14060c308ba9a69369b4bfd19c83ff9d5891410758b252bcc714e6031a44a30 WHIRLPOOL 31b2a2ed5fb7e2a70a887e37bc0c6e130830cd256c91f2ead57feeab242d8ad46403dfc6d2062294bb01ac390b05f96064662f05cf67560ce64a93ad4bfcd84b
+AUX ntop-5.0.1-librrd.patch 853 SHA256 b079ffa8649cc01afd8e53c6810200f6db64f344ca2ddda8c0b012c60c846cb4 SHA512 32f19b1713aa26852df31928dcfaebc8861176f175b06de1724711146b0aad7686608264f1ef9f8a1b1396b0571d5cdd53599cc7944a6cd0d08f8e2935fabbb8 WHIRLPOOL 20d51b854509bf7c8811b707072bc03bdc2f2842b510d56baa51c82b2010cb69954cf8ca11adb72a6d8d5a4d49cb33a38620aa61462c7e86e32135914542a679
+AUX ntop-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
+AUX ntop-initd 748 SHA256 e1a859b168287950d828ba4d31a9bbeb46e46d1ea3cc1e43f20fa2ef2742d478 SHA512 22b61d88e1fc30106d07ee87701ff46b7f63f1ee2aa7bb5666d9cb5cb6251c583f793c80a5d799ac27fcb63650e7ecacb37e7992feb8aa8cbc2d326b36b05a8f WHIRLPOOL 02b464c1b9131bbec34b17ce22c6e3747caf30d47bc1c42b8bc611344850bb741180e80de997368b4fdf00b726694ba7439ff954331373c5a32a695fd006cd60
+AUX ntop-initd-r1 670 SHA256 02937bf0e808b601ba5dd1e782be9f9b1a929b4d5f52353972b433c969e8de03 SHA512 22bf70d2f4f026702a123abc6da5bc08a879b554f45a301266d0eb2d1e8978f8510811138bd5ec63af29fa47b9b44624a7fc79f3740860860c86ce82717a9771 WHIRLPOOL c603f3affe2bb528e937a70b28236a4c5e6d1939c52c1a5f0b284d8354aae98d49c8a8bfce23cd3587e92a1483acea5f93b9c3b40389ffc972fc4866574a6ef8
+AUX ntop-update-geoip-db 492 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 WHIRLPOOL d96c2fa39287ed6e0ac8b76a5c09ff4485305328bfd61fd738ff82a09cde0a8f0be76474d0c5bc95f0a55aa212b092f2e7b7a3bf3d8e6ee2ec1e88f246653e78
+DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee
+EBUILD ntop-5.0.1-r2.ebuild 2986 SHA256 dbb376ca809a8481d397d3d508e60b6502202a0d7e3ab9e12fe0e215544bfe80 SHA512 d3816746937039d1105bb7b373cb0dd531dd9a820d31067dd27f9789c20aceefa5749ad6b56648bd356986a14eb2effa9b6b1022c37eb04d5410c60d161a2b30 WHIRLPOOL 937499ab64c129f088df40e9671c20426e9b7b7eca622fda012609bcb89e8323df041dc8d7829dcc11a0a0505a9ae5fe5f0431dee9ee2bc21300b5c9bf18408c
+EBUILD ntop-5.0.1-r3.ebuild 3058 SHA256 06613d001067ac7b68dc0e81b04778505b3ae116a01cf5ee3586e0e84d1841bc SHA512 2210d50bc0c4a4161e9e0f18cbf2360f9a675873b0d7ae81a10d826ab09559b94f6f4e6bd097d0bd632db9c7a5fb0afa12d645b8a42f93766788553044966ca5 WHIRLPOOL 8fac35b9d00ac494cfb32828ac6368f0670b1c0e243ea3386eccb305282d23e764b5b250a09a1fd63d73b139b95d44a951caee386c08952574df6d2f9c0ec3cd
+MISC ChangeLog 3498 SHA256 61e6a05f79405180789d74ee8c36cc4e37c994c191bc9c535fa8e3eb4be77ace SHA512 f2fdb1eb9fa7286a9065f97678c1bd1c66badec79d7edeb6d44213172529b5e174b847f7ab7be01417c4ea928513623096b71baaece674b85854ec3d445ca11b WHIRLPOOL de016a2dc03b887a18dd5a3ddf5b60768c331a7bc87ec5d3db159b4a4d4c718c9c20020daf879de8f8b5845865c2636296aeb81a6269fa921244a34210df423b
+MISC ChangeLog-2015 17251 SHA256 82ee50e6cf76d70047d005addb5c025d6d4beca25968274e486cd8d7039935ce SHA512 e9b82ded5a8ec639735813c8a04901a10c3830cdd16c13e62ca84e8512c92f3463bbc89c78275e92432bc468fba3583ede0da4405b0dce5d103de13471af0394 WHIRLPOOL 49463f3ffb42ef47adcb76a7e0e5b05188599a465424eea76b8fed9a183fa1a493e949c2dde341db4533d5d72d40a6551d67f880cd8ad7d9c14914050c4bb073
+MISC metadata.xml 925 SHA256 0cc6efd263781f8601277cff81c72e5c0c5ce6ef327d7c4746558e5857ba75c2 SHA512 cdd3a2f6b763a78e208d3be386f4d175a53a30047f4c15f1cf7a4a102325380fbf7c77bc754bf0b1b5e38d0600781c3a876c1a75ac2aa997ef1c3ff423f3bbb0 WHIRLPOOL aac8c179e27caffc746a3ec27b77c92b84c548cab951593024099f7954e13def35bd9d7d97af744775cef2f51ee5dc982fd17500f5af47c547affa2ffd6b3e99
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
new file mode 100644
index 000000000000..de49a41d7175
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
@@ -0,0 +1,27 @@
+--- 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
new file mode 100644
index 000000000000..57f136971cfc
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -0,0 +1,240 @@
+--- 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
new file mode 100644
index 000000000000..fcd5f28d3491
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..db2530c8a5e5
--- /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/files/ntop-confd b/net-analyzer/ntop/files/ntop-confd
new file mode 100644
index 000000000000..352a26fa9b1c
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-confd
@@ -0,0 +1,9 @@
+# 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
new file mode 100644
index 000000000000..ec9afd576f32
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-initd
@@ -0,0 +1,30 @@
+#!/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
new file mode 100644
index 000000000000..e303753891e6
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-initd-r1
@@ -0,0 +1,24 @@
+#!/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
new file mode 100644
index 000000000000..2bf3faaf68cb
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-update-geoip-db
@@ -0,0 +1,21 @@
+#!/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
new file mode 100644
index 000000000000..00542da20918
--- /dev/null
+++ b/net-analyzer/ntop/metadata.xml
@@ -0,0 +1,19 @@
+<?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
new file mode 100644
index 000000000000..8d51b212322b
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
@@ -0,0 +1,135 @@
+# 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
new file mode 100644
index 000000000000..02987b7d1a68
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
@@ -0,0 +1,138 @@
+# 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
+}