Version bump (fixes bug #430428). Removed old

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 174 insertions, 182 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index f32418b051ca..1ab3a4a09573 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.115 2013/03/10 01:38:36 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.116 2013/07/04 12:47:51 polynomial-c Exp $
+
+*ntop-5.0.1 (04 Jul 2013)
+
+  04 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -ntop-4.0.1.ebuild,
+  +ntop-5.0.1.ebuild, -files/ntop-4.0.1-gentoo.patch,
+  +files/ntop-5.0.1-gentoo.patch:
+  Non-maintainer commit: Version bump (fixes bug #430428). Removed old.
 
   10 Mar 2013; Christoph Junghans <ottxor@gentoo.org> ntop-4.0.1.ebuild,
   ntop-4.0.3.ebuild, ntop-4.1.0.ebuild:
diff --git a/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
index a68c664d2994..dee04ed96de8 100644
--- a/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -1,15 +1,6 @@
-diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
---- ntop-4.0.1.orig/configure.in	2010-08-07 00:44:41.000000000 +0200
-+++ ntop-4.0.1/configure.in	2010-09-24 01:42:46.000000000 +0200
-@@ -57,6 +57,7 @@
- dnl>
- umask 002
- AM_CONFIG_HEADER(config.h)
-+AM_MAINTAINER_MODE
- 
- HAS_ERROR=
- HAS_WARNING=
-@@ -497,11 +498,6 @@
+--- ntop-5.0.1/configure.in
++++ ntop-5.0.1/configure.in
+@@ -469,11 +469,6 @@
      LOCALEDIR="/usr/lib/locale"
  fi
  
@@ -21,11 +12,10 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
  PWD=`pwd`
  
  echo
-@@ -1809,39 +1805,17 @@
- 
+@@ -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
@@ -38,27 +28,15 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
 -   gunzip GeoLiteCity.dat.gz
 -fi
 -
--dnl> --------
--
--if test -f "GeoIPASNum.dat"; then
--   echo "GeoIPASNum.dat already present"
--else
--   if test -f "3rd_party/GeoIPASNum.dat.gz"; then
--     cp 3rd_party/GeoIPASNum.dat.gz .
--   else
--     wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
--   fi
--
--   gunzip GeoIPASNum.dat.gz
--fi
- else
- AC_MSG_RESULT(Please install GeoIP (http://www.maxmind.com/))
+ 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/GeoIPASNum.dat.gz &&
 +gunzip 3rd_party/GeoLiteCity.dat.gz &&
 +mv "3rd_party/etter.finger.os.gz" . &&
 +mv "3rd_party/oui.txt.gz" . &&
@@ -67,27 +45,26 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
  
  if test -d ./configureextra; then
  
-@@ -2002,7 +1976,6 @@
+@@ -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)
- 
-diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
---- ntop-4.0.1.orig/globals-core.c	2010-04-25 14:52:28.000000000 +0200
-+++ ntop-4.0.1/globals-core.c	2010-09-24 01:42:46.000000000 +0200
-@@ -372,7 +372,7 @@
+ AC_SUBST(NDPI_LIB)
+--- ntop-5.0.1/globals-core.c
++++ ntop-5.0.1/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 */;
++  _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
-@@ -491,19 +491,18 @@
+@@ -470,19 +470,18 @@
    struct stat statbuf;
  
    /* Initialize GeoIP databases */
@@ -98,7 +75,7 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
      safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
  		  "%s%c%s",
 -		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
++		  myGlobals.dbPath,
  		  CONST_PATH_SEP, GEO_IP_FILE);
      revertSlashIfWIN32(path, 0);
  
@@ -109,10 +86,11 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
        }
      }
    }
-@@ -513,19 +512,18 @@
+@@ -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];
@@ -120,7 +98,7 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
      safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
  		  "%s%c%s",
 -		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
++		  myGlobals.dbPath,
  		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
      revertSlashIfWIN32(path, 0);
  
@@ -131,18 +109,17 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
        }
      }
    }
-diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
---- ntop-4.0.1.orig/Makefile.am	2010-04-25 14:52:28.000000000 +0200
-+++ ntop-4.0.1/Makefile.am	2010-09-24 01:43:07.000000000 +0200
-@@ -43,7 +43,6 @@
+--- ntop-5.0.1/Makefile.am
++++ ntop-5.0.1/Makefile.am
+@@ -36,7 +36,6 @@
  
  #AM_CFLAGS =
- #AM_LDFLAGS= 
+ #AM_LDFLAGS=
 -ACLOCAL_AMFLAGS=-I m4
  
  DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
  CLEANFILES     = $(DISTCLEANFILES) stamp-h1
-@@ -74,9 +73,7 @@
+@@ -67,9 +66,7 @@
  NTOPDATA = ntop-cert.pem \
             $(ETTER_PASSIVE) \
             oui.txt.gz \
@@ -153,7 +130,25 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
             html/*.css html/*.dtd \
-@@ -370,30 +367,7 @@
+@@ -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:
@@ -185,7 +180,7 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  # download the Novell SAP Protocol information table
  #dnsapt:
-@@ -401,45 +375,7 @@
+@@ -398,45 +372,7 @@
  
  # download the passive ethernet fingerprint database
  dnetter:
@@ -232,10 +227,9 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  # ntop census
  census-fail:
-diff -Nru ntop-4.0.1.orig/report.c ntop-4.0.1/report.c
---- ntop-4.0.1.orig/report.c	2010-08-07 00:22:05.000000000 +0200
-+++ ntop-4.0.1/report.c	2010-09-24 01:42:46.000000000 +0200
-@@ -2353,7 +2353,7 @@
+--- ntop-5.0.1/report.c
++++ ntop-5.0.1/report.c
+@@ -2299,7 +2299,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
    } else {
diff --git a/net-analyzer/ntop/ntop-4.0.1.ebuild b/net-analyzer/ntop/ntop-4.0.1.ebuild
deleted file mode 100644
index a09dab3db918..000000000000
--- a/net-analyzer/ntop/ntop-4.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.0.1.ebuild,v 1.8 2013/03/10 01:38:36 ottxor Exp $
-
-EAPI="2"
-
-inherit autotools eutils user
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-SRC_URI="mirror://sourceforge/ntop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 ssl"
-#snmp support is disabled
-
-#snmp? ( net-analyzer/net-snmp )
-COMMON_DEPEND="virtual/awk
-	dev-lang/perl
-	sys-libs/gdbm
-	dev-libs/libevent
-	net-libs/libpcap
-	media-libs/gd
-	media-libs/libpng
-	net-analyzer/rrdtool
-	ssl? ( dev-libs/openssl )
-	sys-libs/zlib
-	>=dev-libs/geoip-1.4.5
-	>=dev-lang/lua-5.1.4"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-1.4"
-
-# Needed by xmldumpPlugin - couldn't get it to work
-#	dev-libs/gdome2
-#	>=dev-libs/glib-2"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/corefonts
-	media-gfx/graphviz
-	net-misc/wget
-	app-arch/gzip"
-
-pkg_setup() {
-	# snmp doesn't compile in this release, disabled for now
-	#if use snmp ; then
-	#	ewarn "snmp plugin is under development and upstream does not recommend"
-	#	ewarn "it for usage in production environment."
-	#	if ! use ipv6 ; then
-	#		echo
-	#		eerror "snmp plugin has compilation problems without ipv6 support."
-	#		eerror "For additional information see bug #121497."
-	#		die "snmp without ipv6 is broken"
-	#	else
-	#		if ! built_with_use net-analyzer/net-snmp ipv6 ; then
-	#			echo
-	#			eerror "You have both ipv6 and snmp enabled."
-	#			eerror "This require ipv6 support in net-analyzer/net-snmp."
-	#			eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
-	#			eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
-	#			die "net-analyzer/net-snmp was build without ipv6."
-	#		fi
-	#	fi
-	#fi
-
-	enewgroup ntop
-	enewuser ntop -1 -1 /var/lib/ntop ntop
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
-	eautoreconf
-}
-
-src_configure() {
-	# force disable xmldumpPlugin
-	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
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_with ssl) \
-		--with-rrd-home=/usr/lib \
-		--disable-snmp \
-		|| die "configure problem"
-		# $(use_enable snmp)
-}
-
-src_install() {
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /var/lib/ntop &&
-		fowners ntop:ntop /var/lib/ntop &&
-		fperms 750 /var/lib/ntop ||
-		die "failed to prepare /var/lib/ntop dir"
-	insinto /var/lib/ntop
-	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}" ||
-			die "failed to install ${f}"
-	done
-
-	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
-	newinitd "${FILESDIR}"/ntop-initd ntop
-	newconfd "${FILESDIR}"/ntop-confd ntop
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
-	elog "If this is the first time you install ntop, you need to run"
-	elog "following command before starting ntop service:"
-	elog "   ntop --set-admin-password"
-}
diff --git a/net-analyzer/ntop/ntop-5.0.1.ebuild b/net-analyzer/ntop/ntop-5.0.1.ebuild
new file mode 100644
index 000000000000..d0f91976d288
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1.ebuild,v 1.1 2013/07/04 12:47:51 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils 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-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="snmp ssl"
+
+COMMON_DEPEND="
+	virtual/awk
+	dev-lang/perl
+	sys-libs/gdbm
+	dev-libs/libevent
+	net-libs/libpcap
+	media-libs/gd
+	media-libs/libpng
+	net-analyzer/rrdtool
+	ssl? ( dev-libs/openssl )
+	sys-libs/zlib
+	dev-libs/geoip
+	dev-lang/lua
+	snmp? ( net-analyzer/net-snmp[ipv6] )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/libtool-1.5.26
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/corefonts
+	media-gfx/graphviz
+	net-misc/wget
+	app-arch/gzip
+	dev-libs/glib:2
+	dev-python/mako"
+
+pkg_setup() {
+	enewgroup ntop
+	enewuser ntop -1 -1 /var/lib/ntop ntop
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
+	eautoreconf
+}
+
+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
+
+	econf \
+		$(use_enable snmp) \
+		$(use_with ssl) \
+		--with-rrd-home=/usr/lib
+
+}
+
+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 &&
+		fowners ntop:ntop /var/lib/ntop &&
+		fperms 750 /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 ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
+
+	exeinto /etc/cron.monthly
+	doexe "${FILESDIR}"/ntop-update-geoip-db
+}
+
+pkg_postinst() {
+	elog "If this is the first time you install ntop, you need to run"
+	elog "following command before starting ntop service:"
+	elog "   ntop --set-admin-password"
+}