Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/
Date: Sat, 09 Feb 2019 21:00:21
Message-Id: 1549745999.19ce64a45e05e65981c3b73b8bbf30f2ab1243eb.grknight@gentoo
1 commit: 19ce64a45e05e65981c3b73b8bbf30f2ab1243eb
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 9 20:58:45 2019 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 9 20:59:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ce64a4
7
8 net-analyzer/barnyard: Fix dependency and less USE checking
9
10 Closes: https://bugs.gentoo.org/665934
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
13
14 .../{barnyard-0.2.0-r4.ebuild => barnyard-0.2.0-r5.ebuild} | 13 +++++--------
15 1 file changed, 5 insertions(+), 8 deletions(-)
16
17 diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
18 similarity index 94%
19 rename from net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
20 rename to net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
21 index 0868a7f8ffe..5d369ae6705 100644
22 --- a/net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild
23 +++ b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 @@ -18,7 +18,7 @@ IUSE="mysql postgres sguil"
31
32 DEPEND="
33 net-libs/libpcap
34 - mysql? ( virtual/mysql )
35 + mysql? ( dev-db/mysql-connector-c:0= )
36 postgres? ( dev-db/postgresql:*[server] )
37 sguil? ( dev-lang/tcl:0 )"
38 RDEPEND="${DEPEND}
39 @@ -62,23 +62,20 @@ src_install () {
40
41 insinto /etc/snort
42 newins etc/barnyard.conf barnyard.conf
43 + newconfd "${FILESDIR}"/barnyard.confd barnyard
44 + newinitd "${FILESDIR}"/barnyard.rc6 barnyard
45 +
46 if use sguil ; then
47 sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
48 -e "/config interface/s:fxp0:eth0:" \
49 -e "s:output alert_fast:#output alert_fast:" \
50 -e "s:output log_dump:#output log_dump:" \
51 "${D}/etc/snort/barnyard.conf" || die "sed failed"
52 - fi
53
54 - newconfd "${FILESDIR}"/barnyard.confd barnyard
55 - if use sguil ; then
56 sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
57 -e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
58 "${D}/etc/conf.d/barnyard" || die "sed failed"
59 - fi
60
61 - newinitd "${FILESDIR}"/barnyard.rc6 barnyard
62 - if use sguil ; then
63 sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
64 "${D}/etc/init.d/barnyard" || die "sed failed"
65 fi