7 files changed, 39 insertions, 83 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index 41a2c8fd6e0e..deaed1bf5c70 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,49 +1,6 @@
 # ChangeLog for net-analyzer/barnyard
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.11 2005/10/08 13:48:01 strerror Exp $
-
-*barnyard-0.2.0-r1 (08 Oct 2005)
-
-  08 Oct 2005; Benjamin Smee <strerror@gentoo.org>
-  +barnyard-0.2.0-r1.ebuild:
-  New version for sguil integration. Includes init.d and conf.d files
-
-  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> barnyard-0.1.0.ebuild,
-  barnyard-0.2.0.ebuild:
-  changed net-libs/libpcap depend to virtual/libcap
-
-  22 Jan 2005; Jason Wever <weeve@gentoo.org> barnyard-0.1.0.ebuild,
-  barnyard-0.2.0.ebuild:
-  Masked on sparc as snort is now masked on sparc.
-
-  09 Jul 2004; Eldad Zack <eldad@gentoo.org> barnyard-0.1.0.ebuild,
-  barnyard-0.2.0.ebuild, -barnyard-0.2.0_rc1.ebuild:
-  Purged 0.2.0_rc1, 0.2.0 marked x86 stable
-
-  09 Jul 2004; Eldad Zack <eldad@gentoo.org> barnyard-0.1.0.ebuild:
-  Tidy up, fixed mysql issue (#47026). Thanks to Ryu
-  <jasmine.chua@internationalsos.com> and Devon <gentoo@noved.org>
-
-  01 Jul 2004; Jon Hood <squinky86@gentoo.org> barnyard-0.1.0.ebuild,
-  barnyard-0.2.0.ebuild, barnyard-0.2.0_rc1.ebuild:
-  change virtual/glibc to virtual/libc
-
-*barnyard-0.2.0 (19 May 2004)
-
-  19 May 2004; Michael Boman <mboman@gentoo.org> +barnyard-0.2.0.ebuild:
-  New upstream version
-
-*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.
-
-  16 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.1.0.ebuild:
-  Marked 0.1.0 stable on x86
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.1 2003/08/10 01:23:54 solar Exp $
 
 *barnyard-0.1.0 (09 Aug 2003)
 
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index 84ea3be2527a..c4d5db290f59 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,10 +1,4 @@
-MD5 76615f3cb9b609a11d3abf6d6abe1ec4 barnyard-0.2.0.ebuild 1228
-MD5 04900935e60d6ab34493ca1160bc3e2e barnyard-0.2.0-r1.ebuild 1950
-MD5 319801a4a4735aa68ceddb8d1c80e340 ChangeLog 1969
-MD5 17784ab6e148b4abf7f6aa2390ce1bce metadata.xml 223
-MD5 20781d966c89d732a0a2b0a8d7deadad barnyard-0.1.0.ebuild 1332
-MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0-r1 66
-MD5 ad8ea362c32275fd385c370c7667fb2b files/barnyard.rc6 736
-MD5 3e857c89ec58ac318ebd669e7f427908 files/barnyard.confd 556
+MD5 46afd02f0e82d1761138c9625698ac78 barnyard-0.1.0.ebuild 1340
+MD5 f2180306ab489100fe8729115dc23942 files/barnyard.confd 435
+MD5 dcf5edf27aaa1611f02554af03f6e08a files/barnyard.rc6 773
 MD5 e1650eb517daf81cb0abb45eee02a727 files/digest-barnyard-0.1.0 66
-MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0 66
diff --git a/net-analyzer/barnyard/barnyard-0.1.0.ebuild b/net-analyzer/barnyard/barnyard-0.1.0.ebuild
index 173b980ad166..dea61cb6de4d 100644
--- a/net-analyzer/barnyard/barnyard-0.1.0.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.1.0.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.1.0.ebuild,v 1.9 2005/01/29 05:12:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.1.0.ebuild,v 1.1 2003/08/10 01:23:54 solar Exp $
 
 IUSE="mysql"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Fast output system for Snort"
 SRC_URI="http://www.snort.org/dl/barnyard/barnyard-${PV}.tar.gz"
 HOMEPAGE="http://www.snort.org"
 
 SLOT="0"
 LICENSE="QPL"
-KEYWORDS="x86 -sparc"
+KEYWORDS="~x86 ~sparc"
 
-DEPEND="virtual/libc
-	virtual/libpcap
+DEPEND="virtual/glibc
+	net-libs/libpcap
 	mysql? ( >=dev-db/mysql-3.23.26 )"
 
 RDEPEND="${DEPEND}
@@ -21,14 +22,18 @@ RDEPEND="${DEPEND}
 
 src_compile() {
 	local myconf
-	myconf="${myconf} $(use_enable mysql)"
 
-	if use mysql; then
-		sed -i '/AC_CHECK_LIB(mysqlclient, mysql_connect, FOUND=yes, FOUND=no)/s/mysql_connect/mysql_real_connect/' \
-		configure.in
-	fi
+	use mysql && myconf="${myconf} --enable-mysql" \
+		|| myconf="${myconf} --disable-mysql"
 
-	econf --sysconfdir=/etc/snort ${myconf} || die "econf failed"
+#	./configure \
+#		--prefix=/usr \
+#		--sysconfdir=/etc/snort \    	
+#		--localstatedir=/var \
+#		--mandir=/usr/share/man \
+#		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	econf --sysconfdir=/etc/snort ${myconf} || die "bad ./configure"
 	emake || die "compile problem"
 }
 
diff --git a/net-analyzer/barnyard/barnyard-0.2.0.ebuild b/net-analyzer/barnyard/barnyard-0.2.0.ebuild
index 9fd1263e1ac1..7a1b80b29e99 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.6 2005/01/29 05:12:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0.ebuild,v 1.1 2004/05/19 13:14:49 mboman Exp $
 
 IUSE="mysql postgres"
 
 DESCRIPTION="Fast output system for Snort"
 SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
-HOMEPAGE="http://www.snort.org/dl/barnyard/"
+HOMEPAGE="http://www.snort.org"
 
 SLOT="0"
 LICENSE="QPL"
-KEYWORDS="x86 -sparc"
+KEYWORDS="~x86 ~sparc"
 
-DEPEND="virtual/libc
-	virtual/libpcap
+DEPEND="virtual/glibc
+	net-libs/libpcap
 	postgres? ( >=dev-db/postgresql-7.2 )
 	mysql? ( >=dev-db/mysql-3.23.26 )"
 
diff --git a/net-analyzer/barnyard/files/barnyard.confd b/net-analyzer/barnyard/files/barnyard.confd
index f3cfa330b227..81c28ed75fea 100644
--- a/net-analyzer/barnyard/files/barnyard.confd
+++ b/net-analyzer/barnyard/files/barnyard.confd
@@ -1,17 +1,13 @@
 # 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="-D -c $CONF -d $LOGDIR -g $GENMSG_FILE -s $SIDMSG_FILE -w $WALDO_FILE -L $LOGDIR -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE"
+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"
diff --git a/net-analyzer/barnyard/files/barnyard.rc6 b/net-analyzer/barnyard/files/barnyard.rc6
index 5b0b269136a9..81e1e88e8289 100644
--- a/net-analyzer/barnyard/files/barnyard.rc6
+++ b/net-analyzer/barnyard/files/barnyard.rc6
@@ -1,15 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/files/barnyard.rc6,v 1.4 2005/11/26 13:10:49 strerror Exp $
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/files/barnyard.rc6,v 1.1 2003/08/10 01:23:54 solar Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run barnyard"
+	if [ ! -e /etc/snort/barnyard.conf ] ; then
+		eerror "You need an /etc/snort/barnyard.conf to run barnyard"
 		eerror "There is an example config in /etc/snort/barnyard.conf.distrib"
 		return 1
 	fi
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index 0c6631479adc..bb361c7c32ae 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>Fast output system for Snort</longdescription>
+	<herd>hardened</herd>
+	<maintainer>
+		<email>mboman@gentoo.org</email>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription>Unified alert/log spool reader and output handler for Snort! This program decouples output overhead from the Snort network intrusion detection system and allows Snort to run at full speed.</longdescription>
 </pkgmetadata>