Old.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 5 insertions, 110 deletions

diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index e8d8a13d3a33..bdcd6e633c86 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/darkstat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.53 2012/06/13 06:04:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.54 2012/06/13 15:59:35 jer Exp $
+
+  13 Jun 2012; Jeroen Roovers <jer@gentoo.org>
+  -files/darkstat-3.0.712-dlt_raw.patch, -darkstat-3.0.714.ebuild:
+  Old.
 
   13 Jun 2012; Jeff Horelick <jdhore@gentoo.org> darkstat-3.0.715.ebuild:
   marked x86 per bug 419209
diff --git a/net-analyzer/darkstat/darkstat-3.0.714.ebuild b/net-analyzer/darkstat/darkstat-3.0.714.ebuild
deleted file mode 100644
index 66947f9f128d..000000000000
--- a/net-analyzer/darkstat/darkstat-3.0.714.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.714.ebuild,v 1.5 2012/06/04 10:32:58 jer Exp $
-
-EAPI="2"
-inherit user
-
-DESCRIPTION="darkstat is a network traffic analyzer"
-HOMEPAGE="http://unix4lyfe.org/darkstat/"
-SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-
-src_configure() {
-	econf \
-		--with-privdrop-user=darkstat \
-		--with-chroot-dir="${DARKSTAT_CHROOT_DIR}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installation failed."
-
-	dodoc AUTHORS ChangeLog README 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 "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
deleted file mode 100644
index 96ad00a56938..000000000000
--- a/net-analyzer/darkstat/files/darkstat-3.0.712-dlt_raw.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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