6 files changed, 142 insertions, 9 deletions
diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index 41f0fa9bfd75..c0b0b447465a 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/darkstat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.25 2007/02/02 11:18:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.26 2007/11/01 13:29:39 jokey Exp $
+
+*darkstat-3.0.707 (01 Nov 2007)
+
+  01 Nov 2007; Markus Ullmann <jokey@gentoo.org> +files/darkstat-confd2,
+  +files/darkstat-init2, +darkstat-3.0.707.ebuild:
+  Version bump, reported on irc by drear
 
   02 Feb 2007; Markus Ullmann <jokey@gentoo.org> darkstat-3.0.540-r1.ebuild:
   Fix for bug #164957
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 7ac19d89a1b4..148f182a447f 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -5,19 +5,32 @@ AUX darkstat-confd 370 RMD160 8b1d0d49d166d838ec2c0edf013baf6fc5778f85 SHA1 4d72
 MD5 5f93f0d6f8195564db2a529bf1a85e55 files/darkstat-confd 370
 RMD160 8b1d0d49d166d838ec2c0edf013baf6fc5778f85 files/darkstat-confd 370
 SHA256 76f5ba28a04dbf578bd1ed3b40831eaa4a17813de5f270d05b149eaa40ed622e files/darkstat-confd 370
+AUX darkstat-confd2 429 RMD160 552993ae6e6ae2c98008784a0a64580b45b8ff1c SHA1 e0dc4cac6a44860f6868f95e5b8bec23763deb27 SHA256 3194336efeff069fdc6dd853190bb26f0a49819455ae214fdf355afee2835186
+MD5 fa204e41a06f8f0cb11ce7bab40f736c files/darkstat-confd2 429
+RMD160 552993ae6e6ae2c98008784a0a64580b45b8ff1c files/darkstat-confd2 429
+SHA256 3194336efeff069fdc6dd853190bb26f0a49819455ae214fdf355afee2835186 files/darkstat-confd2 429
 AUX darkstat-init 1543 RMD160 726e65702c2d9586f5a19fca3d1da3ea4274aed8 SHA1 595f5269781c69c4152637b4940d834b5e5b8d92 SHA256 feec5b290774634ecfbd848e67c97ed9ddc508ab30a74f03f953d5c5392a40f4
 MD5 41a8e29d2c4341f28f05f4ac3ab47edd files/darkstat-init 1543
 RMD160 726e65702c2d9586f5a19fca3d1da3ea4274aed8 files/darkstat-init 1543
 SHA256 feec5b290774634ecfbd848e67c97ed9ddc508ab30a74f03f953d5c5392a40f4 files/darkstat-init 1543
+AUX darkstat-init2 1529 RMD160 c7ebe02fb9b183efc8fe19f0840140a66e4f0409 SHA1 3805ea0d2f6217f57c460854b86eb3788422360d SHA256 575144945064e4b95716fdb99d93181b0ae1fedd4bd6ea14e5b7be3bf0ebd5dd
+MD5 45d7752ab9dc446111e98c2ef08a9fab files/darkstat-init2 1529
+RMD160 c7ebe02fb9b183efc8fe19f0840140a66e4f0409 files/darkstat-init2 1529
+SHA256 575144945064e4b95716fdb99d93181b0ae1fedd4bd6ea14e5b7be3bf0ebd5dd files/darkstat-init2 1529
 DIST darkstat-3.0.540.tar.bz2 75293 RMD160 c9ee36a5381bfc26c81759f4cde6153abac4264c SHA1 aaca2ba07c8479b7bf2393261b0093f568746766 SHA256 0db1b2684ea8871c587c89c3ddc4d9302f7e885ff0ec401510c42445f5a77bb4
+DIST darkstat-3.0.707.tar.bz2 90459 RMD160 91a19ef837a58f6b464cc24c4dc34bcb8ef15a59 SHA1 a5df521ffbd801b32cb52aaa846fea3448f5750f SHA256 243bd77f93acbb6832f5ef1cc4b03abe823006c129f88fe5724697e1c0857644
 EBUILD darkstat-3.0.540-r1.ebuild 1231 RMD160 891777bed4a42af6615a1bc2a79b9fd1f3dc0905 SHA1 7d5db83da259c3d07597e8d5a831ea46d420fe4c SHA256 af647c10f3681d4610371b7a11faa26c477eae87a722f51efc2e07fbc2a2b082
 MD5 af217e7194cdf70f8ea0bfc94b6bfd4c darkstat-3.0.540-r1.ebuild 1231
 RMD160 891777bed4a42af6615a1bc2a79b9fd1f3dc0905 darkstat-3.0.540-r1.ebuild 1231
 SHA256 af647c10f3681d4610371b7a11faa26c477eae87a722f51efc2e07fbc2a2b082 darkstat-3.0.540-r1.ebuild 1231
-MISC ChangeLog 4173 RMD160 549f4d3c7ad24acc6ed3667338685b1eff10cd93 SHA1 6219a08b5d192c94791bf145b2a545280672185d SHA256 148c846b4b0bfea3e6fa2e03f52dfdb1dfdbb80140e309abbead9c96fc769263
-MD5 5c21eab49ad1c9e427f53ab63fa5a264 ChangeLog 4173
-RMD160 549f4d3c7ad24acc6ed3667338685b1eff10cd93 ChangeLog 4173
-SHA256 148c846b4b0bfea3e6fa2e03f52dfdb1dfdbb80140e309abbead9c96fc769263 ChangeLog 4173
+EBUILD darkstat-3.0.707.ebuild 1180 RMD160 435644fd44c4da58774e19bc78a50929d888c17f SHA1 c7e5553f10fbbbb373ec6fd144e75e06537e0032 SHA256 d0e3ed4f2d7595d2fe3efe7f9a44ba93887c4ca04ae50335ee0609709fd4893e
+MD5 c246a6cb1f3db0e582159b130e477227 darkstat-3.0.707.ebuild 1180
+RMD160 435644fd44c4da58774e19bc78a50929d888c17f darkstat-3.0.707.ebuild 1180
+SHA256 d0e3ed4f2d7595d2fe3efe7f9a44ba93887c4ca04ae50335ee0609709fd4893e darkstat-3.0.707.ebuild 1180
+MISC ChangeLog 4372 RMD160 9a7e60cd91fe5a890607e1f7e76d2fe96bdf89ce SHA1 481fbe1aabc9ba8d6f9cb37c4ac1b0af44b577a3 SHA256 8ae65f7cb8c605696c9ed9e646fe9c62718f8bff17a32eb9db954ec0eb2d2dd8
+MD5 e5871f946f5c0458ba2dd73bb7287dbb ChangeLog 4372
+RMD160 9a7e60cd91fe5a890607e1f7e76d2fe96bdf89ce ChangeLog 4372
+SHA256 8ae65f7cb8c605696c9ed9e646fe9c62718f8bff17a32eb9db954ec0eb2d2dd8 ChangeLog 4372
 MISC metadata.xml 416 RMD160 7a1aac0409b8ad203481db42ac8eb25cb80f6098 SHA1 6463fd6350fe4328e2fba923af331eafc20b143b SHA256 3c66778a80a6824b46fe9980054c9b929a206d3a4a36d51bc90f5587f4e48f1c
 MD5 5cd395379ed4ed5b912822c5bd708996 metadata.xml 416
 RMD160 7a1aac0409b8ad203481db42ac8eb25cb80f6098 metadata.xml 416
@@ -25,10 +38,13 @@ SHA256 3c66778a80a6824b46fe9980054c9b929a206d3a4a36d51bc90f5587f4e48f1c metadata
 MD5 17f5a8d132a64f856940e35acd39b58c files/digest-darkstat-3.0.540-r1 250
 RMD160 73dabb794dcc256572109ec83ab4300c9f321e79 files/digest-darkstat-3.0.540-r1 250
 SHA256 500edb09df8aed07d6e8ed201c28b8da26d210c9cc211af98521704c1cb0aee4 files/digest-darkstat-3.0.540-r1 250
+MD5 d803c66ed5428dca21593e135713d9ef files/digest-darkstat-3.0.707 250
+RMD160 0834aab7ad91e9ef447a0639dd132c13edce1fda files/digest-darkstat-3.0.707 250
+SHA256 20fb706c14ead93e9773883a5a7f1efe2ee8b2fa539cb07e79e9effaaa5d79ef files/digest-darkstat-3.0.707 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFwx3oz974XjDVpbkRAqjKAJ4giqG9Lo0E6ueo9OIdjx0WBUNT+gCggVSv
-Cz8nJyfcIXAxRpmwVVAzLcQ=
-=U2dV
+iD8DBQFHKdTNz974XjDVpbkRAuUiAJ4u3OsMJ4wESiJmoC6pZbhE7fAzPACfUtAK
+Qfr5HtHtlE9XmiBhwqhDhHY=
+=6b7t
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/darkstat/darkstat-3.0.707.ebuild b/net-analyzer/darkstat/darkstat-3.0.707.ebuild
new file mode 100644
index 000000000000..541e56b63e53
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.707.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.707.ebuild,v 1.1 2007/11/01 13:29:39 jokey Exp $
+
+DESCRIPTION="darkstat is a network traffic analyzer"
+HOMEPAGE="http://dmr.ath.cx/net/darkstat/"
+SRC_URI="http://dmr.ath.cx/net/darkstat/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+IUSE="nls"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="net-libs/libpcap
+	nls? ( virtual/libintl )"
+RDEPEND=${DEPEND}
+
+src_compile() {
+	econf $(use_with nls) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS README THANKS
+
+	newinitd "${FILESDIR}"/darkstat-init2 darkstat
+	newconfd "${FILESDIR}"/darkstat-confd2 darkstat
+}
+
+pkg_postinst() {
+	elog "To start different darkstat instances which will listen on a different"
+	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
+	elog "darkstat script where 'if' is the name of the interface."
+	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
+	elog "and edit it to change default values"
+}
diff --git a/net-analyzer/darkstat/files/darkstat-confd2 b/net-analyzer/darkstat/files/darkstat-confd2
new file mode 100644
index 000000000000..83716d7ebd89
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-confd2
@@ -0,0 +1,14 @@
+# The interface to listen on
+# Use only with /etc/init.d/darkstat init script. If you use
+# /etc/init.d/darkstat.if init script, then this option should be ignored.
+#INTERFACE="eth0"
+
+# The port for the embedded webserver
+#PORT="667"
+
+# The address embedded webserver should bind to
+# Note: the daemon chroots into /var/empty if you set this
+#ADDRESS="0.0.0.0"
+
+# Set the filter. See tcpdump documenation for details.
+#FILTER=""
diff --git a/net-analyzer/darkstat/files/darkstat-init2 b/net-analyzer/darkstat/files/darkstat-init2
new file mode 100644
index 000000000000..8bf554896998
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-init2
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-init2,v 1.3 2007/11/01 13:29:39 jokey Exp $
+
+IF=${SVCNAME##*.}
+
+if [[ -n "${IF}" && ${SVCNAME} != "darkstat" ]] ; then
+	PIDFILE=/var/run/darkstat.${IF}.pid
+else
+	PIDFILE=/var/run/darkstat.pid
+fi
+
+depend() {
+        need net
+}
+
+chkconfig() {
+	if [[ -n "${IF}" && ${SVCNAME} != "darkstat" ]] ; then
+		if [[ ! -f "/etc/conf.d/darkstat.${IF}" ]]; then
+			eerror "/etc/conf.d/darkstat.${IF} does not exist. Please, create."
+			return 1
+		fi
+		INTERFACE=${IF}
+	else
+		if [[ ! -f "/etc/conf.d/darkstat" ]]; then
+			eerror "/etc/conf.d/darkstat does not exist. Please, create."
+			return 1
+		fi
+	fi
+
+	if [[ -z "${INTERFACE}" ]]; then
+		ewarn "No interface specified. Trying to use eth0."
+		INTERFACE="eth0"
+	fi
+
+	DARKSTAT_OPTS="-i ${INTERFACE}"
+	[[ -n "${PORT}" ]] && DARKSTAT_OPTS="${DARKSTAT_OPTS} -p ${PORT}"
+	[[ -n "${ADDRESS}" ]] && DARKSTAT_OPTS="${DARKSTAT_OPTS} -b ${ADDRESS}"
+	[[ -n "${FILTER}" ]] && DARKSTAT_OPTS="${DARKSTAT_OPTS} -f ${FILTER}"
+	return 0
+}
+
+start() {
+	chkconfig || return 1
+	ebegin "Starting darkstat on ${INTERFACE}"
+	# Remove --background option for debugging.
+	start-stop-daemon --start --exec /usr/sbin/darkstat --pidfile ${PIDFILE} --background -- ${DARKSTAT_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping darkstat on ${INTERFACE}"
+	start-stop-daemon --stop --quiet --retry 5 --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/darkstat/files/digest-darkstat-3.0.707 b/net-analyzer/darkstat/files/digest-darkstat-3.0.707
new file mode 100644
index 000000000000..4c88a03f54d0
--- /dev/null
+++ b/net-analyzer/darkstat/files/digest-darkstat-3.0.707
@@ -0,0 +1,3 @@
+MD5 91c70f96498dd679b21330214361e4dc darkstat-3.0.707.tar.bz2 90459
+RMD160 91a19ef837a58f6b464cc24c4dc34bcb8ef15a59 darkstat-3.0.707.tar.bz2 90459
+SHA256 243bd77f93acbb6832f5ef1cc4b03abe823006c129f88fe5724697e1c0857644 darkstat-3.0.707.tar.bz2 90459