Fix for #296249

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 192 insertions, 3 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index 48b754f78c8d..32a08239733c 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/barnyard
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.22 2009/09/23 18:17:22 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.23 2010/01/16 00:07:40 patrick Exp $
+
+*barnyard-0.2.0-r3 (16 Jan 2010)
+
+  16 Jan 2010; Patrick Lauer <pal@gentoo.org> +barnyard-0.2.0-r3.ebuild,
+  +files/barnyard.64bit.diff:
+  Fix for #296249
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> barnyard-0.2.0-r1.ebuild:
   Remove virtual/libc
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index ac4ce60ea74f..91551425410b 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,8 +1,10 @@
+AUX barnyard.64bit.diff 3625 RMD160 9456da2872c045d53f2cae1e706765221e59f99b SHA1 daf257bd88fa4b1c0d610aa2e16c8c853b6376ff SHA256 69213f4beac73dfe1181b4692928d7e544d71893fcdc1839fa88c49b29f13576
 AUX barnyard.confd 556 RMD160 2a15cf57a6d84a4bf4f6c5e73484ec3326d76a87 SHA1 a1e0f5df4accdfb84a349e51495bd55555d48982 SHA256 c4a2630d75d6d172db5d715f2c189b36e25804d1ed8b26ff949afd4773159fdd
 AUX barnyard.rc6 736 RMD160 f220e64045bf9bb7ad0727541dd62c97ee219163 SHA1 246ffedd0b9bbef4e8e7eb9eaabfa8a84d46b2a5 SHA256 fddb7073e955140bab50376c7b3f926bd85df209a8117341fa5491ab967cdec8
 DIST barnyard-0.2.0-patches.tar.bz2 12911 RMD160 5d38251e4b1198d9d4a4cbc535a3b89ac4bf1a04 SHA1 ff6aed111817469e8bffecc92a26bf27a6105c52 SHA256 cecc0c983899d12ae217232e2cd34d86e780b4be34ac36ccb3f73a1b954ea6f0
 DIST barnyard-0.2.0.tar.gz 161543 RMD160 b5e10dc3cbfe1a73f56e893544722e2771ecf0f3 SHA1 4adfcabb2702def5a9a6c68cbde1b90a70f7e67a SHA256 09e0f8e095e79cfe70ea069d13e7d02521a504a1f400a45556a634dccfd31a3a
 EBUILD barnyard-0.2.0-r1.ebuild 1936 RMD160 06f4d23ad7417379e04d613eea8cdae34d3ec129 SHA1 c61c31da78d39f7c3ccff7e75034ffeb8e0d5b09 SHA256 71b3a6480f9e4463e099910e6eda0500e91d9cd70f681ef5d56cbaef8235a8f5
 EBUILD barnyard-0.2.0-r2.ebuild 2360 RMD160 c4a8dc73d6542377019a31d3c225aced6ae7de50 SHA1 0f446ef3bff7c635b1b30c92f65526b50f4a23a5 SHA256 314a5d2000b6202b7fdb7117d8f046b8b373cea5c2a784138e6f20e9c5206a32
-MISC ChangeLog 3745 RMD160 0d3535c0f52406bad59d1ee740bf485e4c4e2712 SHA1 1dbe77e5093c6d5a33677efb368af185d98c3fa2 SHA256 1d9f983740d0a6499115223676d4a9b86adf51df6950015a8b810ae77f203df5
+EBUILD barnyard-0.2.0-r3.ebuild 2406 RMD160 6e553440557e3ccbac7f20282970fefdfafc46ce SHA1 1542fe77fed79ba28d95eb36f7b93623d6442fb1 SHA256 2e52a040e67101affbd30e12b4b689b6a5a7daf48107f9e8d74aa422fd117d4d
+MISC ChangeLog 3901 RMD160 c72c0ac1c7728e85182ae32ecf9f48d55f904956 SHA1 d16b083a7502218b5f8410bb682be53fe3457552 SHA256 233a88f36e178da1e03e241649223131c79e1f3d4df526c73236379dc263d3a9
 MISC metadata.xml 337 RMD160 d4d853cf2b8d812592721dff9f9a555379b4979e SHA1 5ac7c9b0902f4d5964dcae0c0dd92dcd7652d688 SHA256 3cffd59961c4b14afdb04bee33ab328cea8c349acde0ea9e408d87d360f2067c
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..c682c8ad76c1
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/01/16 00:07:40 patrick Exp $
+
+EAPI=2
+
+WANT_AUTOMAKE="1.4"
+inherit eutils autotools
+
+DESCRIPTION="Fast output system for Snort"
+HOMEPAGE="http://www.snort.org/dl/barnyard/"
+SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+SLOT="0"
+LICENSE="QPL"
+KEYWORDS="~amd64 -sparc ~x86"
+IUSE="mysql postgres sguil"
+
+DEPEND="net-libs/libpcap
+	postgres? ( >=virtual/postgresql-server-7.2 )
+	mysql? ( virtual/mysql )
+	sguil? ( dev-lang/tcl )"
+
+RDEPEND="${DEPEND}
+	net-analyzer/snort"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	epatch "${FILESDIR}/barnyard.64bit.diff"
+	if use sguil ; then
+		epatch "${WORKDIR}/${PV}-sguil_files.patch"
+		epatch "${WORKDIR}/${PV}-configure-in.patch"
+		cd "${S}/src/output-plugins"
+		epatch "${WORKDIR}/${PV}-op_plugbase.c.patch"
+		cd "${S}"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use sguil ; then
+		myconf="--enable-tcl"
+	fi
+
+	econf \
+		${myconf} \
+		--sysconfdir=/etc/snort \
+		$(use_enable postgres) \
+		$(use_enable mysql)
+}
+src_compile() {
+	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
+		elog
+		elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
+		elog "sguil section along with supplying the appropriate database"
+		elog "information."
+		elog
+	fi
+}
diff --git a/net-analyzer/barnyard/files/barnyard.64bit.diff b/net-analyzer/barnyard/files/barnyard.64bit.diff
new file mode 100644
index 000000000000..f338d291ff1c
--- /dev/null
+++ b/net-analyzer/barnyard/files/barnyard.64bit.diff
@@ -0,0 +1,81 @@
+diff -ur barnyard-0.2.0/src/barnyard.h barnyard-0.2.0.64bit/src/barnyard.h
+--- barnyard-0.2.0/src/barnyard.h	2004-05-01 12:43:29.000000000 -0400
++++ barnyard-0.2.0.64bit/src/barnyard.h	2007-08-11 23:22:53.000000000 -0400
+@@ -34,7 +34,8 @@
+ 
+ typedef struct _SnortPktHeader
+ {
+-    struct timeval ts;     /* packet timestamp */
++    // struct timeval ts;     /* packet timestamp */
++    struct pcap_timeval ts;     /* packet timestamp */
+     u_int32_t caplen;      /* packet capture length */
+     u_int32_t pktlen;      /* packet "real" length */
+ } SnortPktHeader;
+Only in barnyard-0.2.0.64bit/src: barnyard.h~
+diff -ur barnyard-0.2.0/src/event.h barnyard-0.2.0.64bit/src/event.h
+--- barnyard-0.2.0/src/event.h	2003-05-02 22:44:12.000000000 -0400
++++ barnyard-0.2.0.64bit/src/event.h	2007-08-12 00:13:44.000000000 -0400
+@@ -19,6 +19,11 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ 
++struct pcap_timeval {
++    u_int32_t tv_sec;      /* seconds */
++    u_int32_t tv_usec;     /* microseconds */
++};
++
+ typedef struct _Event
+ {
+     u_int32_t sig_generator;   /* which part of snort generated the alert? */
+@@ -30,6 +35,7 @@
+     u_int32_t event_reference; /* reference to other events that have gone off,
+                                 * such as in the case of tagged packets...
+                                 */
+-    struct timeval ref_time;   /* reference time for the event reference */
++    // struct timeval ref_time;   /* reference time for the event reference */
++    struct pcap_timeval ref_time;   /* reference time for the event reference */
+ } Event;
+ #endif /* __EVENT_H__ */
+Only in barnyard-0.2.0.64bit/src: event.h~
+diff -ur barnyard-0.2.0/src/input-plugins/dp_alert.h barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h
+--- barnyard-0.2.0/src/input-plugins/dp_alert.h	2004-02-19 20:59:48.000000000 -0500
++++ barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h	2007-08-11 23:24:25.000000000 -0400
+@@ -34,7 +34,8 @@
+ typedef struct _UnifiedAlertRecord
+ {
+     Event event;
+-    struct timeval ts;         /* event timestamp */
++    // struct timeval ts;         /* event timestamp */
++    struct pcap_timeval ts;         /* event timestamp */
+     u_int32_t sip;             /* src ip */
+     u_int32_t dip;             /* dest ip */
+     u_int16_t sp;              /* src port */
+Only in barnyard-0.2.0.64bit/src/input-plugins: dp_alert.h~
+diff -ur barnyard-0.2.0/src/util.c barnyard-0.2.0.64bit/src/util.c
+--- barnyard-0.2.0/src/util.c	2004-03-06 17:30:15.000000000 -0500
++++ barnyard-0.2.0.64bit/src/util.c	2007-08-12 00:14:52.000000000 -0400
+@@ -514,7 +514,8 @@
+ 
+ static char tmpbuf[256];
+ 
+-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len)
+ {
+     struct tm *lt;
+     time_t timet;
+Only in barnyard-0.2.0.64bit/src: util.c~
+diff -ur barnyard-0.2.0/src/util.h barnyard-0.2.0.64bit/src/util.h
+--- barnyard-0.2.0/src/util.h	2004-03-06 19:23:50.000000000 -0500
++++ barnyard-0.2.0.64bit/src/util.h	2007-08-11 23:23:46.000000000 -0400
+@@ -39,7 +39,8 @@
+ void ClearDumpBuf();
+ void GoDaemon();
+ size_t RenderTimestamp(time_t timet, char *timebuf, size_t len);
+-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len);
+ int CreatePidFile(char *filename);
+ int String2Long(char *string, long *result);
+ int String2ULong(char *string, unsigned long *result);
+Only in barnyard-0.2.0.64bit/src: util.h~