New upstream version. Put more variables (less hardcoding) in barnyard.confd.

5 files changed, 66 insertions, 4 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index b077814c300f..bfbe3a0d89e8 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/barnyard
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.3 2004/03/21 12:05:57 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.4 2004/03/29 12:26:53 mboman Exp $
+
+*barnyard-0.2.0_rc1 (29 Mar 2004)
+
+  29 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.2.0_rc1.ebuild,
+  files/barnyard.confd:
+  New upstream version. Put more variables (less hardcoding) in barnyard.confd.
 
   21 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.1.0.ebuild:
   QA: Unnecessary definition of S removed.
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index 4cd13b9c4cf2..7569754f728a 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,6 +1,8 @@
-MD5 f6ae819ce119279888cc86c3b54a7f63 ChangeLog 629
+MD5 9a1e9633dad8da64efccdd360f707d25 ChangeLog 845
 MD5 fbadcf0d4fc19bb40ff12af12baae1a6 barnyard-0.1.0.ebuild 1419
 MD5 1f0bf4b85cf9b28ddc987c3121b53c76 metadata.xml 497
-MD5 f2180306ab489100fe8729115dc23942 files/barnyard.confd 435
+MD5 69e4c37dff82619f66cce51dbac0b1cb barnyard-0.2.0_rc1.ebuild 1269
+MD5 3e857c89ec58ac318ebd669e7f427908 files/barnyard.confd 556
 MD5 14b507a1b966099205218e226083097d files/barnyard.rc6 769
 MD5 e1650eb517daf81cb0abb45eee02a727 files/digest-barnyard-0.1.0 66
+MD5 68c43f4a3709a6ea958146cee9e7ad0f files/digest-barnyard-0.2.0_rc1 70
diff --git a/net-analyzer/barnyard/barnyard-0.2.0_rc1.ebuild b/net-analyzer/barnyard/barnyard-0.2.0_rc1.ebuild
new file mode 100644
index 000000000000..45d2f4de0a17
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0_rc1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0_rc1.ebuild,v 1.1 2004/03/29 12:26:53 mboman Exp $
+
+IUSE="mysql"
+
+DESCRIPTION="Fast output system for Snort"
+SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
+HOMEPAGE="http://www.snort.org"
+
+SLOT="0"
+LICENSE="QPL"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND="virtual/glibc
+	net-libs/libpcap
+	mysql? ( >=dev-db/mysql-3.23.26 )"
+
+RDEPEND="${DEPEND}
+	net-analyzer/snort"
+
+S=${WORKDIR}/${P/_/-}
+
+src_compile() {
+	local myconf
+
+	use mysql && myconf="${myconf} --enable-mysql" \
+		|| myconf="${myconf} --disable-mysql"
+
+	econf --sysconfdir=/etc/snort ${myconf} || die "bad ./configure"
+	emake || die "compile problem"
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+
+	dodoc docs/*
+	dodoc AUTHORS  COPYING  LICENSE.QPL  README
+
+	dodir /var/log/snort/archive
+	keepdir /var/log/snort
+	keepdir /var/log/snort/archive
+
+	insinto /etc/snort  ; doins etc/barnyard.conf ; mv ${D}/etc/snort/barnyard.conf ${D}/etc/snort/barnyard.conf.dist
+	insinto /etc/conf.d ; newins ${FILESDIR}/barnyard.confd barnyard
+	insopts -m 755
+	insinto /etc/init.d ; newins ${FILESDIR}/barnyard.rc6 barnyard
+}
diff --git a/net-analyzer/barnyard/files/barnyard.confd b/net-analyzer/barnyard/files/barnyard.confd
index 81c28ed75fea..f3cfa330b227 100644
--- a/net-analyzer/barnyard/files/barnyard.confd
+++ b/net-analyzer/barnyard/files/barnyard.confd
@@ -1,13 +1,17 @@
 # Config file for /etc/init.d/barnyard
 
 PIDFILE="/var/run/barnyard.pid"
+LOG_FILE="snort_unified.log"
 
 # You probably don't want to change this, but in case you do
 LOGDIR="/var/log/snort"
 ARCHIVEDIR="$LOGDIR/archive"
+GENMSG_FILE="/etc/snort/gen-msg.map"
+SIDMSG_FILE="/etc/snort/sid-msg.map"
+WALDO_FILE="$LOGDIR/barnyard.waldo"
 
 # Probably not this either
 CONF=/etc/snort/barnyard.conf
 
 # This pulls in the options above
-BARNYARD_OPTS="-c $CONF -d $LOGDIR -g /etc/snort/gen-msg.map -s /etc/snort/sid-msg.map -w $LOGDIR/barnyard.waldo -L $LOGDIR -a $ARCHIVEDIR -f snort.alert"
+BARNYARD_OPTS="-D -c $CONF -d $LOGDIR -g $GENMSG_FILE -s $SIDMSG_FILE -w $WALDO_FILE -L $LOGDIR -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE"
diff --git a/net-analyzer/barnyard/files/digest-barnyard-0.2.0_rc1 b/net-analyzer/barnyard/files/digest-barnyard-0.2.0_rc1
new file mode 100644
index 000000000000..3418ec458bec
--- /dev/null
+++ b/net-analyzer/barnyard/files/digest-barnyard-0.2.0_rc1
@@ -0,0 +1 @@
+MD5 4d25db6dd1d687d10149c91588e0bc53 barnyard-0.2.0-rc1.tar.gz 160244