Version bump, added patch to make darkstat workable on OpenVPN interfaces, thank Anton S. Ustyuzhanin for all this work, bug #251348.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-openvz.git-89451f9 i686

4 files changed, 127 insertions, 3 deletions

diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index 33184ba0c725..e41a314ae423 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/darkstat
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.34 2008/09/10 10:41:52 pva Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.35 2009/01/05 20:07:19 pva Exp $
+
+*darkstat-3.0.712 (05 Jan 2009)
+
+  05 Jan 2009; Peter Volkov <pva@gentoo.org>
+  +files/darkstat-3.0.712-dlt_raw.patch, +darkstat-3.0.712.ebuild:
+  Version bump, added patch to make darkstat workable on OpenVPN interfaces,
+  thank Anton S. Ustyuzhanin for all this work, bug #251348.
 
   10 Sep 2008; Peter Volkov <pva@gentoo.org> darkstat-3.0.707-r1.ebuild:
   enewuser/enewgroup die on their own, no need to || die
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 9cc7fb68a41a..9f7cdcb33c3a 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1,6 +1,9 @@
+AUX darkstat-3.0.712-dlt_raw.patch 1507 RMD160 654d6ad52847667d17d7d99292d2d195049ba619 SHA1 3112284c13079837f2a94a59a185d0f4329df6b4 SHA256 806d6b0a562fe9eeb80c06616f30d1c6d9e840bc822f9896e34209a4c0c06de6
 AUX darkstat-confd.new 906 RMD160 8fed2a859d5caf2dca94917699b6daf275e808e9 SHA1 ebaca04fdfc94cb7eedcc2b80b510bb84b3c7577 SHA256 428e5570b02cd3515949a65bee4d92b22e492435e7833b108fd67aab218eaeed
 AUX darkstat-init.new 1585 RMD160 5ebf828e4278d2eb11467e7cec40bce20f888ace SHA1 3b8dac3f4bedd8a8ea6ac7e255ddcf5bef86b93b SHA256 f77a63243a170ade06893340e1499c984d971564a80de8903db382efb4b29b98
 DIST darkstat-3.0.707.tar.bz2 90459 RMD160 91a19ef837a58f6b464cc24c4dc34bcb8ef15a59 SHA1 a5df521ffbd801b32cb52aaa846fea3448f5750f SHA256 243bd77f93acbb6832f5ef1cc4b03abe823006c129f88fe5724697e1c0857644
+DIST darkstat-3.0.712.tar.bz2 96555 RMD160 ffd777bccf1e932bd3aa6a3e5a03a7445b7b8a4b SHA1 cb53aee653b712250c525a8618bbaf7e53085ec0 SHA256 9b24efeb21e9d01466f8c3464433a4cf3f2ebcaefc0e9136ef1b9f2167bf8842
 EBUILD darkstat-3.0.707-r1.ebuild 1866 RMD160 a052d31ac58a8d5685a2c3221bd7665e5eaa8e6c SHA1 09abc2dc9489a848d0fd5c0670d86c0bfb436bdc SHA256 efdbf854b64bb6cc6b4bead5d7027d2ae8bffd9de2fa07dafa72b0d4927a5e52
-MISC ChangeLog 5585 RMD160 ae37329cc9e9b511cfc1fb3cda8b417d7a1796ac SHA1 241094b8a862986dbdc78509b5dba33ad2dbe691 SHA256 fbdcb135fd673899362a2deb183f016de48cffff0e87df39b41af325f9e16c8b
+EBUILD darkstat-3.0.712.ebuild 1931 RMD160 0880db18f97964de7b8f98e52fd9c427a90631db SHA1 d9a7a46e1aba4bf3ce71b8ab4b2c4b5c23c8c80f SHA256 211cb4a06175a505734a7ea38a260ea8158d6b628153c891cbb39c8cd590966e
+MISC ChangeLog 5869 RMD160 89a55a5ac48ca401a8ba727b03b33eba85c50471 SHA1 7236d2d7dcc71e431621acac356be7a6a7902b1e SHA256 051fdf33f7f3cbcbb02f8a91c4d5c0f1a25492359b074d7dc87c0543f5e8c51e
 MISC metadata.xml 416 RMD160 7a1aac0409b8ad203481db42ac8eb25cb80f6098 SHA1 6463fd6350fe4328e2fba923af331eafc20b143b SHA256 3c66778a80a6824b46fe9980054c9b929a206d3a4a36d51bc90f5587f4e48f1c
diff --git a/net-analyzer/darkstat/darkstat-3.0.712.ebuild b/net-analyzer/darkstat/darkstat-3.0.712.ebuild
new file mode 100644
index 000000000000..749438f7b4bd
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.712.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.712.ebuild,v 1.1 2009/01/05 20:07:19 pva Exp $
+
+inherit eutils
+
+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 ~x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="net-libs/libpcap"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-dlt_raw.patch"
+}
+
+src_compile() {
+	econf --with-privdrop-user=darkstat \
+			--with-chroot-dir="${DARKSTAT_CHROOT_DIR}"
+	emake || die "compilation failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed."
+
+	dodoc AUTHORS README THANKS NEWS || die
+
+	newinitd "${FILESDIR}"/darkstat-init.new darkstat || die
+	newconfd "${FILESDIR}"/darkstat-confd.new darkstat || die
+
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat
+
+	keepdir "${DARKSTAT_CHROOT_DIR}"
+	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_preinst() {
+	enewuser darkstat
+}
+
+pkg_postinst() {
+	# Workaround bug #141619
+	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+	elog "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."
+	elog
+	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
+}
diff --git a/net-analyzer/darkstat/files/darkstat-3.0.712-dlt_raw.patch b/net-analyzer/darkstat/files/darkstat-3.0.712-dlt_raw.patch
new file mode 100644
index 000000000000..96ad00a56938
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-3.0.712-dlt_raw.patch
@@ -0,0 +1,51 @@
+diff -Nuar darkstat-3.0.712.orig/decode.c darkstat-3.0.712/decode.c
+--- darkstat-3.0.712.orig/decode.c	2008-11-29 11:39:55.000000000 +0600
++++ darkstat-3.0.712/decode.c	2008-12-18 01:06:08.000000000 +0600
+@@ -67,6 +67,8 @@
+    pktsummary *sm);
+ static void decode_linux_sll(u_char *, const struct pcap_pkthdr *,
+    const u_char *);
++static void decode_raw(u_char *, const struct pcap_pkthdr *,
++   const u_char *);
+ static void decode_ip(const u_char *pdata, const uint32_t len,
+    pktsummary *sm);
+ 
+@@ -85,6 +87,7 @@
+ #ifdef DLT_LINUX_SLL
+    { DLT_LINUX_SLL, SLL_HDR_LEN,   decode_linux_sll },
+ #endif
++   { DLT_RAW,       RAW_HDR_LEN,   decode_raw },
+    { -1, -1, NULL }
+ };
+ 
+@@ -300,6 +303,19 @@
+ }
+ 
+ static void
++decode_raw(u_char *user _unused_,
++      const struct pcap_pkthdr *pheader,
++      const u_char *pdata)
++{
++   pktsummary sm;
++   memset(&sm, 0, sizeof(sm));
++
++   decode_ip(pdata, pheader->caplen, &sm);
++   sm.time = pheader->ts.tv_sec;
++   acct_for(&sm);
++}
++
++static void
+ decode_ip(const u_char *pdata, const uint32_t len, pktsummary *sm)
+ {
+    const struct ip *hdr = (const struct ip *)pdata;
+diff -Nuar darkstat-3.0.712.orig/decode.h darkstat-3.0.712/decode.h
+--- darkstat-3.0.712.orig/decode.h	2008-11-29 11:39:55.000000000 +0600
++++ darkstat-3.0.712/decode.h	2008-12-18 00:49:14.000000000 +0600
+@@ -18,6 +18,7 @@
+ #define NULL_HDR_LEN    4
+ #define PPPOE_HDR_LEN   8
+ #define SLL_HDR_LEN     16
++#define RAW_HDR_LEN     0
+ 
+ #ifndef ETHER_ADDR_LEN
+ #define ETHER_ADDR_LEN 6