Added patches and support for new version of sguil

Package-Manager: portage-2.0.53

7 files changed, 117 insertions, 7 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index 41a2c8fd6e0e..e5821fa2e4dd 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.12 2005/12/24 23:38:31 strerror Exp $
+
+*barnyard-0.2.0-r2 (24 Dec 2005)
+
+  24 Dec 2005; Benjamin Smee <strerror@gentoo.org>
+  +files/0.2.0-configure-in.patch.gz, +files/0.2.0-op_plugbase.c.patch.gz,
+  +files/0.2.0-sguil_files.patch.gz, +barnyard-0.2.0-r2.ebuild:
+  Added patches and support for new version of sguil
 
 *barnyard-0.2.0-r1 (08 Oct 2005)
 
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index 84ea3be2527a..d5a7bb5f4d11 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,10 +1,15 @@
-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 075f17f2c03908be961db79ace917e8e ChangeLog 2247
 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 04900935e60d6ab34493ca1160bc3e2e barnyard-0.2.0-r1.ebuild 1950
+MD5 c7af948145d6d34eba0313577bcddd8c barnyard-0.2.0-r2.ebuild 2436
+MD5 76615f3cb9b609a11d3abf6d6abe1ec4 barnyard-0.2.0.ebuild 1228
+MD5 b823a6e023b37735c6700d14bd8e0578 files/0.2.0-configure-in.patch.gz 958
+MD5 1916053201dfbd95a8f938afdbf6e936 files/0.2.0-op_plugbase.c.patch.gz 300
+MD5 753089e49464ed72088afbea24671e0a files/0.2.0-sguil_files.patch.gz 12999
 MD5 3e857c89ec58ac318ebd669e7f427908 files/barnyard.confd 556
+MD5 ad8ea362c32275fd385c370c7667fb2b files/barnyard.rc6 736
 MD5 e1650eb517daf81cb0abb45eee02a727 files/digest-barnyard-0.1.0 66
 MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0 66
+MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0-r1 66
+MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0-r2 66
+MD5 17784ab6e148b4abf7f6aa2390ce1bce metadata.xml 223
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..d9510e47bc79
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild,v 1.1 2005/12/24 23:38:31 strerror Exp $
+
+inherit eutils
+
+DESCRIPTION="Fast output system for Snort"
+SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
+HOMEPAGE="http://www.snort.org/dl/barnyard/"
+
+SLOT="0"
+LICENSE="QPL"
+KEYWORDS="~x86 -sparc"
+IUSE="mysql postgres sguil"
+
+DEPEND="virtual/libc
+	virtual/libpcap
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )"
+
+RDEPEND="${DEPEND}
+	net-analyzer/snort"
+
+S=${WORKDIR}/${P/_/-}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	if use sguil ; then
+		epatch "${FILESDIR}/${PV}-sguil_files.patch.gz"
+		epatch "${FILESDIR}/${PV}-configure-in.patch.gz"
+		cd "${S}/src/output-plugins"
+		epatch "${FILESDIR}/${PV}-op_plugbase.c.patch.gz"
+		cd "${S}"
+		ebegin "Recreating configure"
+		aclocal && autoheader && automake --add-missing --copy \
+		&& autoconf || die "recreate configure failed"
+	fi
+}
+
+src_compile() {
+	local myconf
+	if use sguil ; then
+		myconf="--enable-tcl"
+	fi
+
+	econf \
+		${myconf} \
+		--sysconfdir=/etc/snort \
+		$(use_enable postgres) \
+		$(use_enable mysql)|| die "bad ./configure"
+	emake || die "compile problem"
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+
+	dodoc docs/*
+	dodoc AUTHORS README
+
+	keepdir /var/log/snort
+	keepdir /var/log/snort/archive
+
+	insinto /etc/snort
+	newins etc/barnyard.conf barnyard.conf
+	if use sguil ; then
+		sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
+		-e "/config interface/s:fxp0:eth0:" \
+		-e "s:output alert_fast:#output alert_fast:" \
+		-e "s:output log_dump:#output log_dump:" \
+			"${D}/etc/snort/barnyard.conf" || die "sed failed"
+	fi
+
+	newconfd ${FILESDIR}/barnyard.confd barnyard
+	if use sguil ; then
+		sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
+		-e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
+			"${D}/etc/conf.d/barnyard" || die "sed failed"
+	fi
+
+	newinitd ${FILESDIR}/barnyard.rc6 barnyard
+	if use sguil ; then
+		sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
+			"${D}/etc/init.d/barnyard" || die "sed failed"
+	fi
+}
+
+pkg_postinst() {
+	if use sguil ; then
+		einfo
+		einfo "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
+		einfo "sguil section along with supplying the appropriate database"
+		einfo "information."
+		einfo
+	fi
+}
diff --git a/net-analyzer/barnyard/files/0.2.0-configure-in.patch.gz b/net-analyzer/barnyard/files/0.2.0-configure-in.patch.gz
new file mode 100644
index 000000000000..e0b4a3526b84
--- /dev/null
+++ b/net-analyzer/barnyard/files/0.2.0-configure-in.patch.gz
diff --git a/net-analyzer/barnyard/files/0.2.0-op_plugbase.c.patch.gz b/net-analyzer/barnyard/files/0.2.0-op_plugbase.c.patch.gz
new file mode 100644
index 000000000000..b030052df204
--- /dev/null
+++ b/net-analyzer/barnyard/files/0.2.0-op_plugbase.c.patch.gz
diff --git a/net-analyzer/barnyard/files/0.2.0-sguil_files.patch.gz b/net-analyzer/barnyard/files/0.2.0-sguil_files.patch.gz
new file mode 100644
index 000000000000..c36c1d61002e
--- /dev/null
+++ b/net-analyzer/barnyard/files/0.2.0-sguil_files.patch.gz
diff --git a/net-analyzer/barnyard/files/digest-barnyard-0.2.0-r2 b/net-analyzer/barnyard/files/digest-barnyard-0.2.0-r2
new file mode 100644
index 000000000000..19a66c8dc37b
--- /dev/null
+++ b/net-analyzer/barnyard/files/digest-barnyard-0.2.0-r2
@@ -0,0 +1 @@
+MD5 be3283028cf414b52b220308ceb411e9 barnyard-0.2.0.tar.gz 161543