Fix license, the actual license is a merge of as-is and BSD-3. Thanks to Justin Bronder in bug #263609.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 20 insertions, 11 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 94a77ba1ec2e..aecdd22718e0 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.170 2009/04/08 17:28:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.171 2009/04/08 17:35:40 flameeyes Exp $
+
+  08 Apr 2009; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.7.0.ebuild,
+  sudo-1.7.1_rc1.ebuild:
+  Fix license, the actual license is a merge of as-is and BSD-3. Thanks to
+  Justin Bronder in bug #263609.
 
 *sudo-1.7.1_rc1 (08 Apr 2009)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 21b4195b2d09..f324515ed7c8 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,14 +5,14 @@ AUX sudo-1.7.0-parallelinstall.patch 1482 RMD160 92834eaf19bd2ef254a7349d4cb3d40
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.0.tar.gz 744311 RMD160 62c1dbe97a4b46ea2352023ecb8b30dc4afedf58 SHA1 77bb230148b305e8608a3e552f1747507a84a55c SHA256 5f7de94287f39c8b3b8d86aed147967e9286f45740412004233858b637391978
 DIST sudo-1.7.1rc1.tar.gz 755731 RMD160 acbfea26ff4fded393ea10351b20046038f4b378 SHA1 6d8253d89429c97ba59ca6b35547e8f9c5403c72 SHA256 85031857f1a55af66162c2090d082e4fa7d71a702d5b7392fcc6a42a42ee961b
-EBUILD sudo-1.7.0.ebuild 6424 RMD160 8898b1021b325a14858e452f7b01c60e26d45462 SHA1 3b414ca02ea4bdc88e92b9935a5b225836fe3f31 SHA256 884368c86000740412e7f093417aa0a0b9367a8de9634ee575c4503974410cf0
-EBUILD sudo-1.7.1_rc1.ebuild 6391 RMD160 2c453cc87a2ca461748a9d4b293e2bdad03ce09d SHA1 7c41d13e5aca31bb5d52b706f403c6c57afea726 SHA256 6f76ef3faa3ba10a1468565fbeeb74e656c9f20def28ae8590690a36252b4487
-MISC ChangeLog 23766 RMD160 3ae1c8dbb06ccd9a21296e0916b4935ca28e8778 SHA1 d099c99a3e20110e0895edc085b8a6f984136101 SHA256 c5566654154dd3915abbc68f7a567c6c3727f66675d097a9c5a3963ad025cd20
+EBUILD sudo-1.7.0.ebuild 6520 RMD160 5fb6a9917779e4ac740f9a3f907075c715177b91 SHA1 aed5faecab483b235a8284956827dee79c477b54 SHA256 ff82283063f73885adf9119bf98a9340bba48f593f6d57f5dc5cf96dd5ca0e0d
+EBUILD sudo-1.7.1_rc1.ebuild 6485 RMD160 d228670ca13a5c650d4b2f6312595d4409edfbb0 SHA1 fc44a09c3b963d08c90135c69c99dfb8fe8bc146 SHA256 4621cc176ee36ea37b310f72406513bdf4f4aa527aea06cbe2aee60a39f3094f
+MISC ChangeLog 23975 RMD160 cac7a73129fc0c76ee558cb441f5794df8b133d3 SHA1 0907487cf075653b90e367a7c217ac0c1702f5f7 SHA256 005f07d831d92af42f69d2d86dddbb31f5216b65d5ad02199361f4cabd44a112
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknc3rsACgkQAiZjviIA2XifAQCg56qN40RweAf67CCavMtF3kkk
-XqIAoNtBYqHyO3z2K0EiyfYtujamld14
-=qfOt
+iEYEARECAAYFAknc4HMACgkQAiZjviIA2XgMBQCgnXB3RRcKYgc2jVfCXdw03FbX
+M9AAoMDlqVypubmDwwI3GF1fOY1aS/Oj
+=DZUE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.7.0.ebuild b/app-admin/sudo/sudo-1.7.0.ebuild
index 351c46900900..a402463c4452 100644
--- a/app-admin/sudo/sudo-1.7.0.ebuild
+++ b/app-admin/sudo/sudo-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.0.ebuild,v 1.12 2009/03/27 18:38:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.0.ebuild,v 1.13 2009/04/08 17:35:40 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -19,7 +19,9 @@ esac
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="http://www.sudo.ws/"
 SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-LICENSE="Sudo"
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="pam skey offensive ldap selinux"
diff --git a/app-admin/sudo/sudo-1.7.1_rc1.ebuild b/app-admin/sudo/sudo-1.7.1_rc1.ebuild
index efc28d17ac68..e0d7ac336d59 100644
--- a/app-admin/sudo/sudo-1.7.1_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.7.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.1_rc1.ebuild,v 1.1 2009/04/08 17:28:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.1_rc1.ebuild,v 1.2 2009/04/08 17:35:40 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -19,7 +19,9 @@ esac
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="http://www.sudo.ws/"
 SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-LICENSE="Sudo"
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="pam skey offensive ldap selinux"