[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2021-10-19 Thread Jakov Smolić 
commit: 709e9a44617d6ec299aa70178c2347e2e16dcdfe
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Oct 19 18:55:59 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct 19 19:08:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709e9a44

net-analyzer/barnyard: Update SRC_URI

jer@ is retired and I've archived the distfiles in my devspace

Signed-off-by: Jakov Smolić  gentoo.org>

 net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
index e6c4d3a4e92..94966b42048 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Fast output system for Snort"
 HOMEPAGE="https://sourceforge.net/projects/barnyard";
 SRC_URI="
mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
-   https://dev.gentoo.org/~jer/${P}-patches.tar.xz
+   https://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz
 "
 
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2021-05-13 Thread Ulrich Müller 
commit: 781a3421b96f9e9cf2bc5041a11726dc1147bc03
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed May 12 10:58:24 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May 13 16:12:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781a3421

net-analyzer/barnyard: Update LICENSE

QPL and QPL-1.0 are duplicates.

Bug: https://bugs.gentoo.org/789666
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../barnyard/{barnyard-0.2.0-r6.ebuild => barnyard-0.2.0-r7.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
similarity index 95%
rename from net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
rename to net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
index 6786fba3781..e6c4d3a4e92 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 "
 
 SLOT="0"
-LICENSE="QPL GPL-2"
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
 KEYWORDS="~amd64 -sparc ~x86"
 IUSE="mysql postgres sguil"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2020-07-31 Thread Jeroen Roovers 
commit: 024c14ca80470b56f71a9f194ebc083860e8fdd5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jul 31 07:14:13 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jul 31 07:15:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c14ca

net-analyzer/barnyard: Fix building with USE=-sguil

TODO: Fix the USE=sguil patchset properly.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Closes: https://bugs.gentoo.org/734866
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
index 4658d4eb7c6..6786fba3781 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
@@ -35,11 +35,14 @@ 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
 
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/files/, net-analyzer/barnyard/

2020-07-29 Thread Jeroen Roovers 
commit: a01914a0c534358cc4440014d5277718412ee3a0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jul 29 12:51:47 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jul 29 12:52:54 2020 +
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  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..000
--- 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.

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2020-07-29 Thread Jeroen Roovers 
commit: cc52b1b632c5369cad5a9e8287cf3d0a62faa375
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jul 29 12:42:12 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jul 29 12:52:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc52b1b6

net-analyzer/barnyard: Fix previous EAPI=7 porting/improvement

- Clean up patches
- Add FILESDIR stored patch to the patchset
- Apply patchset unconditionally
- Store patchset at a specific URI
- Set AR (patch, tc-export)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Bug: https://bugs.gentoo.org/663906
Closes: https://bugs.gentoo.org/734550
Fixes: cc4aa450aa077fb503990d986c840469df42ec06
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/barnyard/Manifest |  1 +
 net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild | 93 ++
 2 files changed, 94 insertions(+)

diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index c81bf30f726..ad150713fd8 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,2 +1,3 @@
 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-r6.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
new file mode 100644
index 000..4658d4eb7c6
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+   https://dev.gentoo.org/~jer/${P}-patches.tar.xz
+"
+
+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/*"
+PATCHES=(
+   "${WORKDIR}"/${P}-64bit.patch
+   "${WORKDIR}"/${P}-canonical-ar.patch
+   "${WORKDIR}"/${P}-configure-in.patch
+   "${WORKDIR}"/${P}-op_plugbase.c.patch
+   "${WORKDIR}"/${P}-sguil_files.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   tc-export AR
+
+   econf \
+   $(use_enable mysql) \
+   $(use_enable postgres) \
+   $(use_enable sguil tcl) \
+   --sysconfdir=/etc/snort
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2019-02-26 Thread Aaron Bauman 
commit: 07a940b5aeb22abd665b8188cc592ee13a695494
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Feb 27 05:17:07 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 27 05:17:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a940b5

net-analyzer/barnyard: drop old EAPI

Signed-off-by: Aaron Bauman  gentoo.org>

 net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild | 99 --
 1 file changed, 99 deletions(-)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
deleted file mode 100644
index 52e010ccc6b..000
--- a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils 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
-   postgres? ( dev-db/postgresql[server] )
-   mysql? ( virtual/mysql )
-   sguil? ( dev-lang/tcl:0 )"
-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}"
-   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_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
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2019-02-09 Thread Brian Evans 
commit: 19ce64a45e05e65981c3b73b8bbf30f2ab1243eb
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Feb  9 20:58:45 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sat Feb  9 20:59:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ce64a4

net-analyzer/barnyard: Fix dependency and less USE checking

Closes: https://bugs.gentoo.org/665934
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 .../{barnyard-0.2.0-r4.ebuild => barnyard-0.2.0-r5.ebuild}  | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
similarity index 94%
rename from net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
rename to net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
index 0868a7f8ffe..5d369ae6705 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ IUSE="mysql postgres sguil"
 
 DEPEND="
net-libs/libpcap
-   mysql? ( virtual/mysql )
+   mysql? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:*[server] )
sguil? ( dev-lang/tcl:0 )"
 RDEPEND="${DEPEND}
@@ -62,23 +62,20 @@ src_install () {
 
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"
-   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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/

2019-02-09 Thread Aaron Bauman 
commit: cc4aa450aa077fb503990d986c840469df42ec06
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Aug 17 18:49:55 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Feb  9 19:55:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4aa450

net-analyzer/barnyard: EAPI7 revbump, improve ebuild

Closes: https://bugs.gentoo.org/663906
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9602
Signed-off-by: Aaron Bauman  gentoo.org>

 net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild | 95 ++
 1 file changed, 95 insertions(+)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild 
b/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
new file mode 100644
index 000..0868a7f8ffe
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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? ( virtual/mysql )
+   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
+   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
+}