net-analyzer/ntopng: version bump to 2.4

Updated DEPEND also, as mysql client libraries are needed.

Package-Manager: portage-2.3.2

4 files changed, 116 insertions, 0 deletions

diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index b13993272f34..0a25eae3fde8 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
 DIST ntopng-1.2.1.tgz 9381092 SHA256 9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5 SHA512 816d63807fc40bcd1851fe5969b4a7d47540052c696f227b26dd38f1621bea5c48bb25a1115bdae3ec4c529d9f291d3d615a760081a90d937154a6a487194ca5 WHIRLPOOL 672fbf53108691fa0b0154ea21240445474e2e89d75004d4cd455ab2f8b5a62c5d1386670ab8ab9e6bd0304e9fe89c29a380db6d7959b4df6474e55f69892b3f
 DIST ntopng-2.0.tar.gz 35783709 SHA256 3cbfd6de1bc44d65f7c7f0de282d122d11f493f1261ba137c3b5b202e08e0251 SHA512 2208623cdc843b8e4ec285930d1ea74ac50c576888fce20f6fc4363e747e0dbef7f1808e7b77ae9b7f5316bca55a3e003a9926785c847bbea2c321d7f7e56d13 WHIRLPOOL 40438c3260a9ba16d8893ce41c494feda8e6290efc0253d4f19d354f6dd535f2d13177d1a1449abdcb5d5a212db0736540f5b92c77fcd624eb9b672ac659a2bc
+DIST ntopng-2.4.tar.gz 134074662 SHA256 f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355 SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a WHIRLPOOL ba5d9fce207d1a89e5c8b35705b0aaeb66235153b91eaf7a84b1c50bcb4b897f992c81aa7fd316ad2d87458cdfdcd4d63de37d0a00375706a036f491ba448c7b
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
new file mode 100644
index 000000000000..b189cbabe285
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -0,0 +1,16 @@
+--- configure.ac.old	2016-04-25 21:29:36.452888380 +0200
++++ configure.ac	2016-04-25 21:30:04.679554971 +0200
+@@ -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
new file mode 100644
index 000000000000..fd403a2c8bf2
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2016-11-19 19:16:20.167724203 +0100
++++ configure.ac	2016-11-19 19:16:32.684391101 +0100
+@@ -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/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
new file mode 100644
index 000000000000..2141a1abf913
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://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/geoip
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	net-misc/curl
+	virtual/libmysqlclient"
+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"
+	sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
+	eautoreconf
+
+	cd "${S}/nDPI"
+	eautoreconf
+}
+
+src_configure() {
+	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 "${EPREFIX}/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default creadential are user='admin' password='admin'"
+}