From 8b188923ed878f45faeb3fcdc7311bda720726b8 Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Sun, 6 Feb 2022 12:54:09 +1300 Subject: network/barnyard2: Fix build on 15.0. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- network/barnyard2/barnyard2-1.13-free.patch | 11 +++++++ network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch | 38 +++++++++++++++++++++++ network/barnyard2/barnyard2.SlackBuild | 3 ++ network/barnyard2/barnyard2.info | 2 +- network/barnyard2/slack-desc | 2 +- 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 network/barnyard2/barnyard2-1.13-free.patch create mode 100644 network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch diff --git a/network/barnyard2/barnyard2-1.13-free.patch b/network/barnyard2/barnyard2-1.13-free.patch new file mode 100644 index 0000000000..216fe480de --- /dev/null +++ b/network/barnyard2/barnyard2-1.13-free.patch @@ -0,0 +1,11 @@ +--- a/src/output-plugins/spo_alert_unixsock.c ++++ b/src/output-plugins/spo_alert_unixsock.c +@@ -56,6 +56,8 @@ + #include "spo_alert_unixsock.h" + #include "barnyard2.h" + ++#include ++ + #define UNSOCK_FILE "barnyard2_alert" + + diff --git a/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch b/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch new file mode 100644 index 0000000000..87aec539ca --- /dev/null +++ b/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch @@ -0,0 +1,38 @@ +--- a/src/output-plugins/spo_alert_fwsam.c ++++ b/src/output-plugins/spo_alert_fwsam.c +@@ -115,7 +115,7 @@ + #include + #endif + +-typedef int SOCKET; ++typedef int BY2_SOCKET; + + #ifndef INVALID_SOCKET + #define INVALID_SOCKET -1 +@@ -961,7 +961,7 @@ + FWsamPacket sampacket; + FWsamStation *station=NULL; + FWsamList *fwsamlist; +- SOCKET stationsocket; ++ BY2_SOCKET stationsocket; + int i,len,deletestation,stationtry=0; + char *encbuf,*decbuf; + static unsigned long lastbsip[FWSAM_REPET_BLOCKS]; +@@ -1387,7 +1387,7 @@ + void FWsamCheckOut(FWsamStation *station) + { + FWsamPacket sampacket; +- SOCKET stationsocket; ++ BY2_SOCKET stationsocket; + int i,len; + char *encbuf,*decbuf; + +@@ -1538,7 +1538,7 @@ + int i,len,stationok=TRUE; + FWsamPacket sampacket; + char *encbuf,*decbuf; +- SOCKET stationsocket; ++ BY2_SOCKET stationsocket; + + + /* create a socket for the station */ diff --git a/network/barnyard2/barnyard2.SlackBuild b/network/barnyard2/barnyard2.SlackBuild index ab9c8478ad..35af68dd6a 100644 --- a/network/barnyard2/barnyard2.SlackBuild +++ b/network/barnyard2/barnyard2.SlackBuild @@ -75,6 +75,9 @@ cd $TMP rm -rf $PRGNAM-2-$VERSION tar xvf $CWD/$PRGNAM-2-$VERSION.tar.gz cd $PRGNAM-2-$VERSION +# thanks gentoo maintainers +patch -p1 < $CWD/barnyard2-1.13-free.patch +patch -p1 < $CWD/barnyard2-1.13-pcap-1.9.0.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/network/barnyard2/barnyard2.info b/network/barnyard2/barnyard2.info index 5600ea402c..fb7d0def5a 100644 --- a/network/barnyard2/barnyard2.info +++ b/network/barnyard2/barnyard2.info @@ -1,6 +1,6 @@ PRGNAM="barnyard2" VERSION="1.13" -HOMEPAGE="http://www.securixlive.com/barnyard2/" +HOMEPAGE="https://github.com/firnsy/barnyard2" DOWNLOAD="https://github.com/firnsy/barnyard2/archive/v2-1.13/barnyard2-2-1.13.tar.gz" MD5SUM="212066058364f18a4806720b271ffd87" DOWNLOAD_x86_64="" diff --git a/network/barnyard2/slack-desc b/network/barnyard2/slack-desc index a632466edf..1472d5b551 100644 --- a/network/barnyard2/slack-desc +++ b/network/barnyard2/slack-desc @@ -14,6 +14,6 @@ barnyard2: tool for the parsing of Snort's binary log files to a variety of barnyard2: output plugins, capable of asynchronously processing, while Snort barnyard2: continues it's job. barnyard2: -barnyard2: Homepage: http://www.securixlive.com/barnyard2/ +barnyard2: Homepage: https://github.com/firnsy/barnyard2 barnyard2: barnyard2: -- cgit v1.2.3-79-gdb01