From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A0AC138334 for ; Sat, 9 Feb 2019 21:00:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 565DAE0AF8; Sat, 9 Feb 2019 21:00:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 291D6E0AF8 for ; Sat, 9 Feb 2019 21:00:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C836335D28 for ; Sat, 9 Feb 2019 21:00:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71958522 for ; Sat, 9 Feb 2019 21:00:08 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1549745999.19ce64a45e05e65981c3b73b8bbf30f2ab1243eb.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/barnyard/barnyard-0.2.0-r4.ebuild net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild X-VCS-Directories: net-analyzer/barnyard/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 19ce64a45e05e65981c3b73b8bbf30f2ab1243eb X-VCS-Branch: master Date: Sat, 9 Feb 2019 21:00:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c20496dc-ad74-46a7-9680-d34863fcbe3f X-Archives-Hash: 505657c6c1a69c3044c589d85a3a34f9 commit: 19ce64a45e05e65981c3b73b8bbf30f2ab1243eb Author: Brian Evans gentoo org> AuthorDate: Sat Feb 9 20:58:45 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Sat Feb 9 20:59:59 2019 +0000 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