Cleaned ebuild as requested by Cédric Krier in bug #153451. Modified runscript for darkstat-3.0.540-r1 and later to allow running different instances on different interfaces as requested by Yevgen Gorshkov in bug #153114.

Package-Manager: portage-2.1.1

9 files changed, 165 insertions, 30 deletions

diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index 3656e159613e..ec81ecc9f539 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/darkstat
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.21 2006/08/09 17:34:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.22 2006/10/31 13:31:00 pva Exp $
+
+*darkstat-3.0.540-r1 (31 Oct 2006)
+
+  31 Oct 2006; Peter Volkov <pva@gentoo.org> +files/darkstat-confd3,
+  +files/darkstat-init3, metadata.xml, darkstat-2.6-r1.ebuild,
+  +darkstat-3.0.540-r1.ebuild:
+  Cleaned ebuild as requested by Cédric Krier in bug #153451. Modified
+  runscript for darkstat-3.0.540-r1 and later to allow running different
+  instances on different interfaces as requested by Yevgen Gorshkov in bug
+  #153114.
 
   09 Aug 2006; Simon Stelling <blubb@gentoo.org> darkstat-3.0.540.ebuild:
   added ~amd64 keyword
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 599f29a9d4f2..85578ef3fbf5 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -6,6 +6,10 @@ AUX darkstat-confd2 345 RMD160 e790d44b3e4729a30b4e43262e6d14dda0ba0b68 SHA1 285
 MD5 a389766742203cc29fefc62dd523245d files/darkstat-confd2 345
 RMD160 e790d44b3e4729a30b4e43262e6d14dda0ba0b68 files/darkstat-confd2 345
 SHA256 3b022510b14658968f728dc6559f201b3980f83d1fd9087e878eb151f8954ac6 files/darkstat-confd2 345
+AUX darkstat-confd3 370 RMD160 8b1d0d49d166d838ec2c0edf013baf6fc5778f85 SHA1 4d727d1c474204133031dd90594376303713ba18 SHA256 76f5ba28a04dbf578bd1ed3b40831eaa4a17813de5f270d05b149eaa40ed622e
+MD5 5f93f0d6f8195564db2a529bf1a85e55 files/darkstat-confd3 370
+RMD160 8b1d0d49d166d838ec2c0edf013baf6fc5778f85 files/darkstat-confd3 370
+SHA256 76f5ba28a04dbf578bd1ed3b40831eaa4a17813de5f270d05b149eaa40ed622e files/darkstat-confd3 370
 AUX darkstat-init 568 RMD160 0a5359094e5ab52a10339bed98e21d2030299f79 SHA1 119882f015ccfc3174d13d1320cbd7dd432c9924 SHA256 d363726dfe220904fb5fdca1b99e4546b2ef9be1691f4f125a8254b99c502e8b
 MD5 4f9e9fe82455fe072de4dda411802936 files/darkstat-init 568
 RMD160 0a5359094e5ab52a10339bed98e21d2030299f79 files/darkstat-init 568
@@ -14,31 +18,42 @@ AUX darkstat-init2 562 RMD160 958a6ff83a605909433582b23c52ad2d1f9a5266 SHA1 5901
 MD5 335579eda880b7a2b194d2d73828ed9c files/darkstat-init2 562
 RMD160 958a6ff83a605909433582b23c52ad2d1f9a5266 files/darkstat-init2 562
 SHA256 dab700e2904bdf039fb2cf20e6acdd32bd59aa8057904fede1fc221351de57d5 files/darkstat-init2 562
+AUX darkstat-init3 1542 RMD160 374dea5a5ad4a014fc24f6391bdd4dc8227f7632 SHA1 54f3d05cc615a2e2d59ffdd54b2c702a7d3b9656 SHA256 edd6017c79dbd7657e88bbd01b799f2e074a9af3abcdfb0f382fda925808840a
+MD5 86661266247eeb44f643fef4db7236ce files/darkstat-init3 1542
+RMD160 374dea5a5ad4a014fc24f6391bdd4dc8227f7632 files/darkstat-init3 1542
+SHA256 edd6017c79dbd7657e88bbd01b799f2e074a9af3abcdfb0f382fda925808840a files/darkstat-init3 1542
 AUX ipcheck.patch 3003 RMD160 93595ad98ce2b7851ae81fd445436bc62533c06c SHA1 4ca1c0b462ae6b92157b92a38ebfd5b1957baadd SHA256 74a4075cfda0598100947ffcfe27305b9ee2f52eb46070576f9152fe41e207b4
 MD5 178efb20612f2c23ec93b9f9a3ddb69c files/ipcheck.patch 3003
 RMD160 93595ad98ce2b7851ae81fd445436bc62533c06c files/ipcheck.patch 3003
 SHA256 74a4075cfda0598100947ffcfe27305b9ee2f52eb46070576f9152fe41e207b4 files/ipcheck.patch 3003
-DIST darkstat-2.6.tar.gz 230950
+DIST darkstat-2.6.tar.gz 230950 RMD160 139d938033ad7e98505e006747f64285136a1f06 SHA1 9e643961dde170bd528da553f7786a2d5ef56b64 SHA256 de84a7a9ef1f8abdc8eecd3faeb562fd4bf72f6fb605129fa1b1254a4f4573b0
 DIST darkstat-3.0.540.tar.bz2 75293 RMD160 c9ee36a5381bfc26c81759f4cde6153abac4264c SHA1 aaca2ba07c8479b7bf2393261b0093f568746766 SHA256 0db1b2684ea8871c587c89c3ddc4d9302f7e885ff0ec401510c42445f5a77bb4
-EBUILD darkstat-2.6-r1.ebuild 1098 RMD160 122104385abbe612051f1ac2be596b2b7749b965 SHA1 d8364cf181610ec9dc46a44499a15596582696ba SHA256 9f25335455e575c935a1a39d9b5d99878aff5a4e22e8ea190fb915bc3f536436
-MD5 3234312b2f7eeecbd9c70e5b1f0b6262 darkstat-2.6-r1.ebuild 1098
-RMD160 122104385abbe612051f1ac2be596b2b7749b965 darkstat-2.6-r1.ebuild 1098
-SHA256 9f25335455e575c935a1a39d9b5d99878aff5a4e22e8ea190fb915bc3f536436 darkstat-2.6-r1.ebuild 1098
+EBUILD darkstat-2.6-r1.ebuild 922 RMD160 caf85720d9a9a0d147d1f29b500f3aa6fc61347c SHA1 70cc90ca8ad0ebf5b847caa6718b17234f12d21e SHA256 b584e5c83c9722828457c728d2600b73efef49e615c4067fd3b372bed57103db
+MD5 d4ad4ad0615ecba4e09ba09875fb8693 darkstat-2.6-r1.ebuild 922
+RMD160 caf85720d9a9a0d147d1f29b500f3aa6fc61347c darkstat-2.6-r1.ebuild 922
+SHA256 b584e5c83c9722828457c728d2600b73efef49e615c4067fd3b372bed57103db darkstat-2.6-r1.ebuild 922
+EBUILD darkstat-3.0.540-r1.ebuild 1232 RMD160 91a4e14b96802ef72d005af0c4f25ac03056166b SHA1 0754725feeb12f9117b7d5910f9818a04b5d058f SHA256 0605197cbca3a81375a98ea43cb0ec0911d5ea6f296482ab121813294379ddc5
+MD5 39fa45952e12642ec57c733dd7276f20 darkstat-3.0.540-r1.ebuild 1232
+RMD160 91a4e14b96802ef72d005af0c4f25ac03056166b darkstat-3.0.540-r1.ebuild 1232
+SHA256 0605197cbca3a81375a98ea43cb0ec0911d5ea6f296482ab121813294379ddc5 darkstat-3.0.540-r1.ebuild 1232
 EBUILD darkstat-3.0.540.ebuild 991 RMD160 98bd8821d24dbfe143a60aeb2e9a575c76084cda SHA1 172f8a4f5cf2a379e806ff5b59993314659dfa34 SHA256 486013fd025eba46faab16581e5de519d169eff424d1d9a72bffed1cd4f8968f
 MD5 4303517a4ec0243bc19938772c0bcdd6 darkstat-3.0.540.ebuild 991
 RMD160 98bd8821d24dbfe143a60aeb2e9a575c76084cda darkstat-3.0.540.ebuild 991
 SHA256 486013fd025eba46faab16581e5de519d169eff424d1d9a72bffed1cd4f8968f darkstat-3.0.540.ebuild 991
-MISC ChangeLog 3270 RMD160 dda74b05992faa1b61fd47a878248cd126f6738e SHA1 59ec5d6c474240a0b8090b9ab9c26e5ff2b4f070 SHA256 c6c73626ce3359a666c4378285d87c558dc5ff48a5384aa59f3f37577b0fb33f
-MD5 a9229def63fe581d4dca92e6e8d6ea39 ChangeLog 3270
-RMD160 dda74b05992faa1b61fd47a878248cd126f6738e ChangeLog 3270
-SHA256 c6c73626ce3359a666c4378285d87c558dc5ff48a5384aa59f3f37577b0fb33f ChangeLog 3270
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
-MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
-SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
-MD5 65647b954a76c7c35eef2f47dfdb5355 files/digest-darkstat-2.6-r1 64
-RMD160 98734ff617ee0774a5c635cb98e5386af459de1c files/digest-darkstat-2.6-r1 64
-SHA256 2d096fb76a51d0944540155fd51ffc8d8cd68cc194fda319022a8220bef5a90c files/digest-darkstat-2.6-r1 64
+MISC ChangeLog 3699 RMD160 4d24cc74929e663565e9f76c0a23a14d011c6691 SHA1 23955e7eef97a96359dd2e8eef3e7eb45e1d61e8 SHA256 3c3763fdc4b80830a59b5ceb7971944fa91bf500a13b6043f979f0d41eb1d6f7
+MD5 31f92c7867e8d8bee5258d5194ead898 ChangeLog 3699
+RMD160 4d24cc74929e663565e9f76c0a23a14d011c6691 ChangeLog 3699
+SHA256 3c3763fdc4b80830a59b5ceb7971944fa91bf500a13b6043f979f0d41eb1d6f7 ChangeLog 3699
+MISC metadata.xml 416 RMD160 7a1aac0409b8ad203481db42ac8eb25cb80f6098 SHA1 6463fd6350fe4328e2fba923af331eafc20b143b SHA256 3c66778a80a6824b46fe9980054c9b929a206d3a4a36d51bc90f5587f4e48f1c
+MD5 5cd395379ed4ed5b912822c5bd708996 metadata.xml 416
+RMD160 7a1aac0409b8ad203481db42ac8eb25cb80f6098 metadata.xml 416
+SHA256 3c66778a80a6824b46fe9980054c9b929a206d3a4a36d51bc90f5587f4e48f1c metadata.xml 416
+MD5 31d84d1fc38e58dd04b4af05c57bdfe3 files/digest-darkstat-2.6-r1 238
+RMD160 adc3238f71e76bebaf3ad96ebdbded899005abed files/digest-darkstat-2.6-r1 238
+SHA256 009d571d5073dc506b43293b09ebf24d71fc5bbecb9ffa50c52e4c9e287c56f0 files/digest-darkstat-2.6-r1 238
 MD5 17f5a8d132a64f856940e35acd39b58c files/digest-darkstat-3.0.540 250
 RMD160 73dabb794dcc256572109ec83ab4300c9f321e79 files/digest-darkstat-3.0.540 250
 SHA256 500edb09df8aed07d6e8ed201c28b8da26d210c9cc211af98521704c1cb0aee4 files/digest-darkstat-3.0.540 250
+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
diff --git a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild b/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
index 1d64e3266ec5..1b614200e0fe 100644
--- a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.9 2006/02/25 23:46:38 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.10 2006/10/31 13:31:00 pva Exp $
 
 inherit eutils
 
@@ -14,8 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="net-libs/libpcap
-	nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )"
 
 src_unpack() {
 	unpack ${A}
@@ -24,22 +23,16 @@ src_unpack() {
 }
 
 src_compile() {
-	use nls && myconf="`use_with nls`"
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-	emake || die
+	econf $(use_with nls) || die "./configure failed"
+	emake || die "compilation failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	dodir /var/spool/darkstat
+	keepdir /var/spool/darkstat
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog ISSUES NEWS README TODO
+	dodoc AUTHORS ChangeLog ISSUES README
 
 	newinitd "${FILESDIR}"/darkstat-init darkstat
 	newconfd "${FILESDIR}"/darkstat-confd darkstat
diff --git a/net-analyzer/darkstat/darkstat-3.0.540-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.540-r1.ebuild
new file mode 100644
index 000000000000..546c3c6a75a4
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.540-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.540-r1.ebuild,v 1.1 2006/10/31 13:31:00 pva 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 )"
+
+src_compile() {
+	econf $(use_with nls) || die "./configure failed"
+	emake || die "compilation failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed."
+
+	dodoc AUTHORS README THANKS
+
+	newinitd "${FILESDIR}"/darkstat-init3 darkstat
+	newconfd "${FILESDIR}"/darkstat-confd3 darkstat
+}
+
+pkg_postinst() {
+	ewarn "WARNING: the darkstat init script has changed"
+	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-confd3 b/net-analyzer/darkstat/files/darkstat-confd3
new file mode 100644
index 000000000000..ea03a0376815
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-confd3
@@ -0,0 +1,13 @@
+# 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
+#ADDRESS="0.0.0.0"
+
+# Set the filter. See tcpdump documenation for details.
+#FILTER=""
diff --git a/net-analyzer/darkstat/files/darkstat-init3 b/net-analyzer/darkstat/files/darkstat-init3
new file mode 100644
index 000000000000..d8fff55b982c
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-init3
@@ -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-init3,v 1.1 2006/10/31 13:31:00 pva 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} --make-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-2.6-r1 b/net-analyzer/darkstat/files/digest-darkstat-2.6-r1
index 8793cd5ed65e..1e88cf55cd5f 100644
--- a/net-analyzer/darkstat/files/digest-darkstat-2.6-r1
+++ b/net-analyzer/darkstat/files/digest-darkstat-2.6-r1
@@ -1 +1,3 @@
 MD5 0a1a407acb6f9b35a46d64885c30d08d darkstat-2.6.tar.gz 230950
+RMD160 139d938033ad7e98505e006747f64285136a1f06 darkstat-2.6.tar.gz 230950
+SHA256 de84a7a9ef1f8abdc8eecd3faeb562fd4bf72f6fb605129fa1b1254a4f4573b0 darkstat-2.6.tar.gz 230950
diff --git a/net-analyzer/darkstat/files/digest-darkstat-3.0.540-r1 b/net-analyzer/darkstat/files/digest-darkstat-3.0.540-r1
new file mode 100644
index 000000000000..c77116064e2a
--- /dev/null
+++ b/net-analyzer/darkstat/files/digest-darkstat-3.0.540-r1
@@ -0,0 +1,3 @@
+MD5 498256c667b4fa79a551ac3626a2ba86 darkstat-3.0.540.tar.bz2 75293
+RMD160 c9ee36a5381bfc26c81759f4cde6153abac4264c darkstat-3.0.540.tar.bz2 75293
+SHA256 0db1b2684ea8871c587c89c3ddc4d9302f7e885ff0ec401510c42445f5a77bb4 darkstat-3.0.540.tar.bz2 75293
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index 03aa50bab7e3..ef4d76a6dd9b 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+	<longdescription lang="en">
+		darkstat is a network statistics gatherer. It's a packet sniffer that
+		runs as a background process on a cable/DSL router, gathers all sorts of
+		statistics about network usage, and serves them over HTTP.
+	</longdescription>
 </pkgmetadata>