* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/files/, net-analyzer/barnyard/
@ 2020-07-29 12:53 Jeroen Roovers
0 siblings, 0 replies; only message in thread
From: Jeroen Roovers @ 2020-07-29 12:53 UTC (permalink / raw
To: gentoo-commits
commit: a01914a0c534358cc4440014d5277718412ee3a0
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 12:51:47 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 12:52:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01914a0
net-analyzer/barnyard: Old
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Closes: https://bugs.gentoo.org/show_bug.cgi?id=724860
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/barnyard/Manifest | 1 -
net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild | 92 -------------------------
net-analyzer/barnyard/files/barnyard.64bit.diff | 81 ----------------------
3 files changed, 174 deletions(-)
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index ad150713fd8..a539a07a436 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,3 +1,2 @@
-DIST barnyard-0.2.0-patches.tar.bz2 12911 BLAKE2B 06215ec8cc8c2fb7ff8e57cfd2f02456180263778722001442faf8f32445fc7fa7fc0da5d00644dbf239949d5e02dd76025428c14c6c1bae8b6565ddf6edf08a SHA512 e8e5243d49b71dd76e3274e27116f99ea6c674983cb18499889c9d27a83740a6b17aa6d30c8a9acdb46103da8314679f4eba8bf1cd252d7fb6b8a34afac46b21
DIST barnyard-0.2.0-patches.tar.xz 13152 BLAKE2B d68aa5298938e50bb1102628cd8ebc0fae55c12fd4094e86306a86aeab3786a096906e4b0612b3dbb0a2de6a8aeba8161fdcfccf3a6915f5492401892eaa8b57 SHA512 9ff4f45e12d12a6b33f22f32be5f258cc9352a53c91d4415c292231ee5e5b03d58ed988011df5d3f13ac0046dd02ff36e0f92b4b0044181f695856118bb9228a
DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
deleted file mode 100644
index 3bdf7cdd9cb..00000000000
--- a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Fast output system for Snort"
-HOMEPAGE="https://sourceforge.net/projects/barnyard"
-SRC_URI="
- mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
- mirror://gentoo/${P}-patches.tar.bz2"
-
-SLOT="0"
-LICENSE="QPL GPL-2"
-KEYWORDS="~amd64 -sparc ~x86"
-IUSE="mysql postgres sguil"
-
-DEPEND="
- net-libs/libpcap
- mysql? ( dev-db/mysql-connector-c:0= )
- postgres? ( dev-db/postgresql:*[server] )
- sguil? ( dev-lang/tcl:0 )"
-RDEPEND="${DEPEND}
- net-analyzer/snort"
-
-S="${WORKDIR}/${P/_/-}"
-
-DOCS="AUTHORS README docs/*"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/barnyard.64bit.diff"
- if use sguil ; then
- eapply "${WORKDIR}/${PV}-sguil_files.patch"
- eapply "${WORKDIR}/${PV}-configure-in.patch"
- cd "${S}/src/output-plugins" || die
- eapply "${WORKDIR}/${PV}-op_plugbase.c.patch"
- cd "${S}" || die
- fi
- eautoreconf
-}
-
-src_configure() {
- local myconf
- if use sguil ; then
- myconf="--enable-tcl"
- fi
-
- econf \
- ${myconf} \
- --sysconfdir=/etc/snort \
- $(use_enable postgres) \
- $(use_enable mysql)
-}
-
-src_install() {
- default
-
- keepdir /var/log/snort
- keepdir /var/log/snort/archive
-
- insinto /etc/snort
- newins etc/barnyard.conf barnyard.conf
- newconfd "${FILESDIR}"/barnyard.confd barnyard
- newinitd "${FILESDIR}"/barnyard.rc6 barnyard
-
- 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"
-
- 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"
-
- 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
deleted file mode 100644
index f338d291ff1..00000000000
--- a/net-analyzer/barnyard/files/barnyard.64bit.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-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~
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-29 12:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-29 12:53 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/files/, net-analyzer/barnyard/ Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox