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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 29 insertions, 89 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/Manifest b/net-analyzer/barnyard/Manifest
index f3e738d40102..83805ac2486f 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,9 +1,18 @@
-AUX barnyard.64bit.diff 3625 RMD160 9456da2872c045d53f2cae1e706765221e59f99b SHA1 daf257bd88fa4b1c0d610aa2e16c8c853b6376ff SHA256 69213f4beac73dfe1181b4692928d7e544d71893fcdc1839fa88c49b29f13576
-AUX barnyard.confd 556 RMD160 2a15cf57a6d84a4bf4f6c5e73484ec3326d76a87 SHA1 a1e0f5df4accdfb84a349e51495bd55555d48982 SHA256 c4a2630d75d6d172db5d715f2c189b36e25804d1ed8b26ff949afd4773159fdd
-AUX barnyard.rc6 736 RMD160 f220e64045bf9bb7ad0727541dd62c97ee219163 SHA1 246ffedd0b9bbef4e8e7eb9eaabfa8a84d46b2a5 SHA256 fddb7073e955140bab50376c7b3f926bd85df209a8117341fa5491ab967cdec8
-DIST barnyard-0.2.0-patches.tar.bz2 12911 RMD160 5d38251e4b1198d9d4a4cbc535a3b89ac4bf1a04 SHA1 ff6aed111817469e8bffecc92a26bf27a6105c52 SHA256 cecc0c983899d12ae217232e2cd34d86e780b4be34ac36ccb3f73a1b954ea6f0
-DIST barnyard-0.2.0.tar.gz 161543 RMD160 b5e10dc3cbfe1a73f56e893544722e2771ecf0f3 SHA1 4adfcabb2702def5a9a6c68cbde1b90a70f7e67a SHA256 09e0f8e095e79cfe70ea069d13e7d02521a504a1f400a45556a634dccfd31a3a
-EBUILD barnyard-0.2.0-r1.ebuild 1932 RMD160 feabdd2fd37020a07e45350b7b61e32714495237 SHA1 e63dfeedb6e20e4d1ebd986edee3e5566b122c0b SHA256 c07c556270968cbc0c09050e2d3cc15e83093b1b81a5d2c81678c5fb4469e2f8
-EBUILD barnyard-0.2.0-r3.ebuild 2380 RMD160 e8309161a23a6a2b32c2bde6d47141cb8d0430c7 SHA1 3ebc014c544345dce68e46086ee6bf24f9d2b23e SHA256 ee35687149f640a40ddc9ce810a6d6d5edc1bf2715c90fd427634cebda7e7812
-MISC ChangeLog 4375 RMD160 8a307fd0603d34879df0b69359f52bf416084b7a SHA1 45001f52368aa3ba1a2a3a6de17493f0d29a79f3 SHA256 a3a8f84d77e2f3fed9b80ecc6359bfcd0f4d39a7d616dbcee2ca2922ddc01278
-MISC metadata.xml 337 RMD160 d4d853cf2b8d812592721dff9f9a555379b4979e SHA1 5ac7c9b0902f4d5964dcae0c0dd92dcd7652d688 SHA256 3cffd59961c4b14afdb04bee33ab328cea8c349acde0ea9e408d87d360f2067c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX barnyard.64bit.diff 3625 SHA256 69213f4beac73dfe1181b4692928d7e544d71893fcdc1839fa88c49b29f13576 SHA512 f445a91759b0a1f72588f5be27ecf5bb016f01c7ce30380c2e3026c304d45eb122616d5bf4905f4ec9aebd48fa3267223be6e08092ba3d50c58663be63e36a14 WHIRLPOOL 1be576d5df78deb556d204ee2e482cf54f92e020baf24e3d5b343b3d07ba23ce819de9077cb4281bd5a7e5e7e31d7c577e3a54083a0367dfa2caa1e87ede9eb8
+AUX barnyard.confd 663 SHA256 657deeb7046a72b60cb9ccabc66a8bb85fbcbfe792b919d62de48641d776d078 SHA512 7d4f12f04a128525a2f1f329619e919add917a6ceb62a70cb082f7d9013ad17f8f9cb4ea4098ce622060e4374343c786d6efb444b7a9d20aecbdb73a7ed14536 WHIRLPOOL a70b6eb03d48a4515105632b14e7191d908059244a3e6d61c7e3400d562e406afaf167d9a18439aa081e3875f84a619a1041e9ad31147708bf62fdeef5268e5b
+AUX barnyard.rc6 736 SHA256 fddb7073e955140bab50376c7b3f926bd85df209a8117341fa5491ab967cdec8 SHA512 fd92301fbe5f78c75ee5c2ec66c2b167ce2093757f3279b0403f1f4812449c0285c53a9e7743155cf7e5242487aae16c5adbe171ed1a14a3e4c5d0edd8cc9c05 WHIRLPOOL 1493f4246c396440bb4d744ce55c45356a401818dd1d0babb6c94207341f1d39f55e69332e80e5373f7cef0974b8b8a3bbf762f438f0e87e73e172188981ea6c
+DIST barnyard-0.2.0-patches.tar.bz2 12911 SHA256 cecc0c983899d12ae217232e2cd34d86e780b4be34ac36ccb3f73a1b954ea6f0
+DIST barnyard-0.2.0.tar.gz 161543 SHA256 09e0f8e095e79cfe70ea069d13e7d02521a504a1f400a45556a634dccfd31a3a
+EBUILD barnyard-0.2.0-r3.ebuild 2380 SHA256 c32d56ec3058fc9922a2068449e68844350fd50414d69601f5f835a9138e6106 SHA512 35c63eef121e76610ccc7c21ca0a339014bcca5cff59f929cf4651b6e36bf9bb76f40ed429e107a6fd08d90faccafe2895d618c3a3e9a8f46ffba9a5c7cddfb7 WHIRLPOOL 3f25d91e02ced2cda3940afdc96946b11388b9349326f00f4a2340a0819cee07de3d53a82be0a1b37160da26ed2b81fd6ab74dfb35ffe11cc680a548db17927c
+MISC ChangeLog 4569 SHA256 656a39959248e395b8780c697d1a7e9eb63cc6c56f414765d96f46634355bec4 SHA512 8fb51545ae99eb485e6ea2f78e0ebe6394008a42dbd6a14a0cfebdc35d3490fe6ca1d46ecd53d0a6ac1bb80d27765664f6cdd84597f13c5be4b545d8a6f3426e WHIRLPOOL 2c9f0b7fc0b1b98b5ac5aa77e61088b3771c3367413ca2f196b76cdc6ccffdba606bf13592e3999ed0318314c15ca64874d6ebe89bd17552b196d7bee69580fc
+MISC metadata.xml 337 SHA256 3cffd59961c4b14afdb04bee33ab328cea8c349acde0ea9e408d87d360f2067c SHA512 04b8882b450677e85fdb40889f1852b56f630d65d5b01e656e52ae7e23c3d9d16eaf26323c7c2695e2439bb621ce0bdc7ed7eac5ed7966cb80afab8fc10b4151 WHIRLPOOL 6326b960559738fb478e5ac68dca80253f83e81ae17e26d2ddb874481f750490f2b6ad173d8493f50adcc47fa0872de0c72e12bfea0e87bd62a857a73596d4d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCsVKAACgkQVWmRsqeSphNQGgCeJcWbg0oDtfdxpBXyP+gC9gJp
+B9wAn3RwXKqitNVgycqATmUe0ch7gkw3
+=YYlM
+-----END PGP SIGNATURE-----
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"