Add copyright info to conf.d script. Add GPL-2 to LICENSE (bug #425978).

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 11 insertions, 80 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index e90454d66b67..6ab0694dc888 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/barnyard
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.26 2011/01/16 00:08:16 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.27 2012/11/21 04:12:11 jer Exp $
+
+  21 Nov 2012; Jeroen Roovers <jer@gentoo.org> -barnyard-0.2.0-r1.ebuild,
+  barnyard-0.2.0-r3.ebuild, files/barnyard.confd:
+  Add copyright info to conf.d script. Add GPL-2 to LICENSE (bug #425978).
 
   16 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
   barnyard-0.2.0-r1.ebuild:
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild
deleted file mode 100644
index b8fb802ef2dc..000000000000
--- a/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild,v 1.9 2011/01/16 00:08:16 mr_bones_ Exp $
-
-DESCRIPTION="Fast output system for Snort"
-SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
-HOMEPAGE="http://www.snort.org/dl/barnyard/"
-
-SLOT="0"
-LICENSE="QPL"
-KEYWORDS="~x86 -sparc"
-IUSE="mysql postgres sguil"
-
-DEPEND="net-libs/libpcap
-	postgres? ( dev-db/postgresql-server )
-	mysql? ( virtual/mysql )"
-
-RDEPEND="${DEPEND}
-	net-analyzer/snort"
-
-S=${WORKDIR}/${P/_/-}
-
-src_compile() {
-	local myconf
-
-	econf \
-		--sysconfdir=/etc/snort \
-		$(use_enable postgres) \
-		$(use_enable mysql)|| die "bad ./configure"
-	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
-}
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
index 65cd42b0b0e7..2828e0bc6941 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild,v 1.3 2010/12/03 00:38:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild,v 1.4 2012/11/21 04:12:11 jer Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
 	mirror://gentoo/${P}-patches.tar.bz2"
 
 SLOT="0"
-LICENSE="QPL"
+LICENSE="QPL GPL-2"
 KEYWORDS="~amd64 -sparc ~x86"
 IUSE="mysql postgres sguil"
 
diff --git a/net-analyzer/barnyard/files/barnyard.confd b/net-analyzer/barnyard/files/barnyard.confd
index f3cfa330b227..be0013cb1fe9 100644
--- a/net-analyzer/barnyard/files/barnyard.confd
+++ b/net-analyzer/barnyard/files/barnyard.confd
@@ -1,4 +1,6 @@
 # Config file for /etc/init.d/barnyard
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 PIDFILE="/var/run/barnyard.pid"
 LOG_FILE="snort_unified.log"