diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-analyzer/barnyard | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-analyzer/barnyard')
-rw-r--r-- | net-analyzer/barnyard/Manifest | 5 | ||||
-rw-r--r-- | net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild (renamed from net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild) | 46 | ||||
-rw-r--r-- | net-analyzer/barnyard/files/barnyard.64bit.diff | 81 |
3 files changed, 27 insertions, 105 deletions
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest index 002819586795..95abbd28c7ea 100644 --- a/net-analyzer/barnyard/Manifest +++ b/net-analyzer/barnyard/Manifest @@ -1,7 +1,6 @@ -AUX barnyard.64bit.diff 3625 BLAKE2B 4d14cfedc70ef9832593902af1945f214570317ea9ca95b6433dfb0f4c862e30d226adf570cfea878843d0348e9633994d7096d0d2a8884f0fa18762c6313bb4 SHA512 f445a91759b0a1f72588f5be27ecf5bb016f01c7ce30380c2e3026c304d45eb122616d5bf4905f4ec9aebd48fa3267223be6e08092ba3d50c58663be63e36a14 AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc6784974cf09610d08ffe1d44394b5323394ef607a0e06374885e22f7253ec4af4363379e07d1ccd5f SHA512 7d4f12f04a128525a2f1f329619e919add917a6ceb62a70cb082f7d9013ad17f8f9cb4ea4098ce622060e4374343c786d6efb444b7a9d20aecbdb73a7ed14536 AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5 -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 -EBUILD barnyard-0.2.0-r5.ebuild 2170 BLAKE2B e0fdeb2924b236856431e31150dcff8c6ca6898d7477ab0911d06e179e9e032d726a5777fd985f2e906ee5dcb29ffcd564ce7fb35194b5ebda0be785b54d1bfe SHA512 da9a7b5ea1bf0e68a152dbcc95dc8af5f4490799052a3d360035805d25bd5c21d7b192c21561c24f25e5cc01621fbd224c63b7aac39969396af1ecd8615fe6db +EBUILD barnyard-0.2.0-r6.ebuild 2163 BLAKE2B 255b4508e4b0627fa8d87d9714834d6dad4ddca5f3c9908157dc149262a600cfe14c89db4c9bf35240a1b2d26a3448b3ce2b4f601df606f45949789591786fbe SHA512 329a7563e90a768a570bb9763293f59ca038f156fa09301445bd27cb67735ae385d9dacb14c4e2abccf23124cd4d8d2b8718e20119439e216b2f065a84b545fb MISC metadata.xml 541 BLAKE2B ddc79b316fd21ac343ddffc0d8d38970583f9cf99d36504a7a55379dadcd32a1e9d3033de894a5a9a26e4d3c4fb42cc69f387c7e55931f4c5c7e0c1d262b0124 SHA512 7a936ec510957c8fb449857a12ff6c54b7498657af33244fcd0759c0786adc9523fda42e6a5e46b0a36c57144f9a2dc2d4179624b1fa700fac53fe83d0d73b1a diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild index 3bdf7cdd9cb9..6786fba3781f 100644 --- a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild +++ b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild @@ -3,13 +3,14 @@ EAPI=7 -inherit autotools +inherit autotools toolchain-funcs 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" + https://dev.gentoo.org/~jer/${P}-patches.tar.xz +" SLOT="0" LICENSE="QPL GPL-2" @@ -20,38 +21,41 @@ 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" + sguil? ( dev-lang/tcl:0 ) +" +RDEPEND=" + ${DEPEND} + net-analyzer/snort +" -S="${WORKDIR}/${P/_/-}" +S=${WORKDIR}/${P/_/-} DOCS="AUTHORS README docs/*" +PATCHES=( + "${WORKDIR}"/${P}-64bit.patch + "${WORKDIR}"/${P}-canonical-ar.patch + "${WORKDIR}"/${P}-configure-in.patch +) +SGUIL_PATCHES=( + "${WORKDIR}"/${P}-op_plugbase.c.patch + "${WORKDIR}"/${P}-sguil_files.patch +) src_prepare() { + use sguil && PATCHES+=( "${SGUIL_PATCHES[@]}" ) 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 + tc-export AR econf \ - ${myconf} \ - --sysconfdir=/etc/snort \ + $(use_enable mysql) \ $(use_enable postgres) \ - $(use_enable mysql) + $(use_enable sguil tcl) \ + --sysconfdir=/etc/snort } src_install() { diff --git a/net-analyzer/barnyard/files/barnyard.64bit.diff b/net-analyzer/barnyard/files/barnyard.64bit.diff deleted file mode 100644 index f338d291ff1c..000000000000 --- 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~ |