Fix LICENSE by Ulrich Müller (bug #446066).

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

4 files changed, 25 insertions, 21 deletions

diff --git a/net-analyzer/snortsam/ChangeLog b/net-analyzer/snortsam/ChangeLog
index 3117eed3c1fb..982f3e3d5b33 100644
--- a/net-analyzer/snortsam/ChangeLog
+++ b/net-analyzer/snortsam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/snortsam
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.33 2011/11/18 05:09:16 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.34 2012/12/05 16:35:58 jer Exp $
+
+  05 Dec 2012; Jeroen Roovers <jer@gentoo.org> snortsam-2.50-r1.ebuild,
+  snortsam-2.70.ebuild:
+  Fix LICENSE by Ulrich Müller (bug #446066).
 
   18 Nov 2011; Jeroen Roovers <jer@gentoo.org> snortsam-2.70.ebuild:
   Respect CFLAGS (maybe bug #240864). Fix underlinking by Michael (bug
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 63e381765ca9..defb12f935d7 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX snortsam-2.29-no-ugly----lines.diff 1665 RMD160 96e1ed518c462991430c3413f810dd9cc7af9845 SHA1 4f487b38f871497d3ba3230b97d13fc15a01a906 SHA256 9fd58962944045d660b6ca703e520dbccfae9b596e09e2dde0fd2ba838c0f51a
-DIST snortsam-2.50-ciscoacl.diff.bz2 7295 RMD160 91d36fecc3fcf14de5ed964928d69ef3cc167bae SHA1 c887162193df59bff2f3fb2fe0ae0aec253314ce SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b
-DIST snortsam-src-2.50.tar.gz 1073391 RMD160 d4cc56f2f5d87254784f4b03b639bce943b8530d SHA1 59dd84b53c7af0c7c487160d2016395883c2a58f SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441
-DIST snortsam-src-2.70.tar.gz 1971624 RMD160 336b0c701754d0688e2ebc967cfdbb3f9bc2fe32 SHA1 9cc7f9aad927217fbda75de038d0489b8e5f3a9e SHA256 442040a7281a641008f6410b7f6528d709f17d5041fd3752011075f8a38d19bc
-EBUILD snortsam-2.50-r1.ebuild 1527 RMD160 063d7af8b76c38cbab1d6869439da52141ca4c8c SHA1 749aa618eebc32cbc67477f6870f25f38dc0a848 SHA256 61348139d0bf53c38c735cc705ceb23dacf3c55cba4bb5ccb2427f55854b5f49
-EBUILD snortsam-2.70.ebuild 1454 RMD160 e9df8d8083b512245b6055513fabc127238c9502 SHA1 b8e03e1d82d4d96b4a6692ea8a52260296c95e0f SHA256 b38e2b0e03c0d483bb5084d74914fdcef7b81c5f4951114f1f648384e7405dc0
-MISC ChangeLog 4252 RMD160 4c414b6b8bbad4ff635299e1e93b9c0d0348af4c SHA1 279bf73c5c8825b809eccf8cb8f69f624654476a SHA256 eec305fbaa32562ea3f008e01c4d6fc8dd618b3a5fc1c5c1745f31e8779690aa
-MISC metadata.xml 275 RMD160 5c13a5b966876b91c33b523878247da0676786be SHA1 ab1cdfc2553ebfb64e7b62bee4f627d58ce8ed0f SHA256 b67561a55b3667bc0e6ca54a4c459227ce10c6720951cf89cdd001753cabb09d
+AUX snortsam-2.29-no-ugly----lines.diff 1665 SHA256 9fd58962944045d660b6ca703e520dbccfae9b596e09e2dde0fd2ba838c0f51a SHA512 3d65623779c433b3e3eeaa2c5464a40b2ed3993bf26a233420985481918b5712f6ec756d0a59776475b6cc069032a64e51c4f075e4cc0d47e254b785f0ae055c WHIRLPOOL afa4d29f9ef0655923699f00ee456012e5f2b78da342abcc9fd54bb58e9ddaef6f796cf3f8678f65a39c823c0df7f48a3448e34188cf92d973f6e833fdcb80a6
+DIST snortsam-2.50-ciscoacl.diff.bz2 7295 SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b SHA512 c8b19b19721f75fb00a269923e4191a26853749658ebbec9d4c74dcbaaacb8db30a6a0bd33068a364aa95375db958b6fd45ad498abdc97029e04b7e140cb2523 WHIRLPOOL 43641d5cfc415ddc0e674a6c812ae1a5719296f8442da9cd6a2cf2a098d0fac20f790f19108442e4a171f2a30d97a7e383d827cbd48e0d07910111c6bcaa0038
+DIST snortsam-src-2.50.tar.gz 1073391 SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441 SHA512 cc4509c0d02666d6697a565e95013639a1f0c042ef948d8def92b749f249f647247ef7649ae23a2860ce58f08e310c08edeabc93301f812a98845f74ba5c266e WHIRLPOOL fbe0912028b8dc29a2c5701892316aca02b7d088bb0f1af67d1c252a640d7cd495fb17c36464b2a429b10bb489e0a1fb1ad79ff8da53267f7d41da3335a59b4c
+DIST snortsam-src-2.70.tar.gz 1971624 SHA256 442040a7281a641008f6410b7f6528d709f17d5041fd3752011075f8a38d19bc SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 WHIRLPOOL 2ccb75cbd252b2ea293e0c125c1885ddad962b121eb095e38d85ff02d8a39803c9b0c4079b4e607e95b5c6bcaef388fed4106247714182ce01bb0e44e86c91c1
+EBUILD snortsam-2.50-r1.ebuild 1527 SHA256 4ce819b5560202abbf77bdd5f73c01aae27212342dbfbb6cef815c3857265b19 SHA512 d6476ee8f41057ea13b45bc08a259bd5f3efbdcb23fdd6ffc5adf2a18c5f921571fe86c260759187860dbc119e8fe5feaa997a23d5f29edbb811b98e8fb85865 WHIRLPOOL 9831358ac032e1480d9ab086ef4635078db3ef399997fd96c73ac2ad328b7e0d7350f1910c80ebf6c360e838ec86172c06192a4f13fd5304fde2a1f4dce60595
+EBUILD snortsam-2.70.ebuild 1454 SHA256 e44938f41f3dcd4eeb9b2094ebca06ed9fa675ba26c23fe6318cd63dba9cf71f SHA512 e9680698232bda204e95ad67cc36cf844e2b6e19a552823dd7b1d243186ac842d65f18e34f8066fb0bea68411d20add867af387574adf669d6f2b9f116582fa3 WHIRLPOOL aee9e49b73602d8aaf4c3b6a74ef2a6ad4c009866cae117d70bf61a636fa0290dc6a5c2af8b73575267233d6106a89c2f34f0b9683bc3d2ae9c7a62ee2abb74b
+MISC ChangeLog 4396 SHA256 ec4fd6e33824de623e27915cd4f50ef566e91a93f2644fd75c50a810b34700ec SHA512 02bb051866a05b2d3451bb3cb6c4dc9567aa64a4a6e32300df3f382cb4c56f9a42ddd13876e769431621526e707cbdeac71cd4ecbb16788dff0e3a02054df257 WHIRLPOOL ff3d4325b60dbb9ac7b2bdc3d5861828ea93c3a7bd1b509d26cbbd403b766f9ec45ca022cdb579d5579714a26c28a6986e0871bbd13d875f41c314eb5dc9a1e1
+MISC metadata.xml 275 SHA256 b67561a55b3667bc0e6ca54a4c459227ce10c6720951cf89cdd001753cabb09d SHA512 3d2033ccb99b302567ed2b96ffb579718bad104f131233cea5df870a3b7ec785d070d69ce93e8ecbdceea8c341ae72678111be88796d570b3fee66aba98ad037 WHIRLPOOL a3006b98be17ceedb101d7452898b6e57aadf80685dde38127fb152f0ff67dd7570697fabecd235434f846ec375972e76405a7484206d6c487da8c956e4cac80
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk7F6IIACgkQVWmRsqeSphMfJACfeh3A35jz69m52nEW7/x+OXwS
-NMYAn3OoiNFrD6UOtimkksapyoeNPJ3Q
-=epGR
+iEYEAREIAAYFAlC/d/AACgkQVWmRsqeSphPfIACfWKf9KL63XGK5JqAW+ouQXa+F
+qIAAnjoXRqY5QOuW+EMwpXSu0h1vWATP
+=LwOk
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
index c0e113f33d24..6fff7ca02c57 100644
--- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/snortsam/snortsam-2.50-r1.ebuild,v 1.11 2008/09/16 10:42:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.12 2012/12/05 16:35:58 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.snortsam.net/"
 SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-2.50-ciscoacl.diff.bz2"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index 892a487c398c..aebd05177544 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/snortsam/snortsam-2.70.ebuild,v 1.3 2011/11/18 05:09:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.4 2012/12/05 16:35:58 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.snortsam.net/"
 SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-2.50-ciscoacl.diff.bz2"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""