Add GPL to license, as vipw is GPL-licensed (bug #175257)

Package-Manager: portage-2.1.3_rc4

3 files changed, 14 insertions, 21 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index e6ecf082f0e6..a2cc1fbd20cf 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.168 2007/02/26 04:06:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.169 2007/06/23 02:36:07 dsd Exp $
+
+  23 Jun 2007; Daniel Drake <dsd@gentoo.org> shadow-4.0.18.1.ebuild:
+  Add GPL to license, as vipw is GPL-licensed (bug #175257)
 
   26 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   shadow-4.0.18.1.ebuild:
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index deef7cdd1416..5509970f6504 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX default/useradd 96 RMD160 55c38953c800c6aae1ebe4312028560f77e7414f SHA1 348916abd4f794ee99310e1c006fbf00296ea2d7 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 RMD160 55c38953c800c6aae1ebe4312028560f77e7414f files/default/useradd 96
@@ -90,14 +87,14 @@ MD5 aa1259020b925cd3088cb7a36fbe7753 files/shadow-4.0.18.1-useradd-usermod.patch
 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 files/shadow-4.0.18.1-useradd-usermod.patch 1081
 SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb files/shadow-4.0.18.1-useradd-usermod.patch 1081
 DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45fa6c SHA1 1a30458e9db05560bfc82529048bd5d60b45cf9b SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12
-EBUILD shadow-4.0.18.1.ebuild 5856 RMD160 62b3fd61d2c34171c301bf1c3f4f1b63a3f63f2c SHA1 331096929c2203be0354b1890e434cab43fe5746 SHA256 d4df9615431dfb52474a6127da764a319388acd665c0894ba4da2d1b4e552ba0
-MD5 12c149ce8c01f47acddbbda2b6dee442 shadow-4.0.18.1.ebuild 5856
-RMD160 62b3fd61d2c34171c301bf1c3f4f1b63a3f63f2c shadow-4.0.18.1.ebuild 5856
-SHA256 d4df9615431dfb52474a6127da764a319388acd665c0894ba4da2d1b4e552ba0 shadow-4.0.18.1.ebuild 5856
-MISC ChangeLog 30280 RMD160 3f0e33336a2f384f66b442bc24b73bb10284be5a SHA1 20c96ab156b3658d4bf68451cefe354526656ade SHA256 93e8d276da0664e47ba7fc61da57675dadcbdc32ed1670a60dbd960341b6d78f
-MD5 27f7ca6411ed74ea7f7dbd24bbf1b178 ChangeLog 30280
-RMD160 3f0e33336a2f384f66b442bc24b73bb10284be5a ChangeLog 30280
-SHA256 93e8d276da0664e47ba7fc61da57675dadcbdc32ed1670a60dbd960341b6d78f ChangeLog 30280
+EBUILD shadow-4.0.18.1.ebuild 5859 RMD160 caf526835bd96be3051e0c37ea408c0ade4de577 SHA1 ebb94a434fede49fad7319db95f55d13f8805bc0 SHA256 e28db8fc8d8a764af7d794afb6022ef56473daf8c4bf3698bcfa7ae5a48e5b94
+MD5 558b5963b31ba03c50b75227177f0389 shadow-4.0.18.1.ebuild 5859
+RMD160 caf526835bd96be3051e0c37ea408c0ade4de577 shadow-4.0.18.1.ebuild 5859
+SHA256 e28db8fc8d8a764af7d794afb6022ef56473daf8c4bf3698bcfa7ae5a48e5b94 shadow-4.0.18.1.ebuild 5859
+MISC ChangeLog 30405 RMD160 97ae72e1e33a34ae9728c0de1174205764b1de01 SHA1 b84cdb80baf5d3613cd6da752ffde4780fe81a4f SHA256 66804f6deebfdf938748bb891bb10363f72e3dcb9b4f9095cf9c8f715afac86f
+MD5 65a645c3b7fcf1e14f85ac11f979c5be ChangeLog 30405
+RMD160 97ae72e1e33a34ae9728c0de1174205764b1de01 ChangeLog 30405
+SHA256 66804f6deebfdf938748bb891bb10363f72e3dcb9b4f9095cf9c8f715afac86f ChangeLog 30405
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -105,10 +102,3 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 6be0a013e7aee78ebb6228308ca16fee files/digest-shadow-4.0.18.1 253
 RMD160 31ec617739d2935bd1b4dfc1d676399d5c5f50bc files/digest-shadow-4.0.18.1 253
 SHA256 6683d8ca173c809dedf056bf6e658284264bb277cab8c43e03b811ed4308d109 files/digest-shadow-4.0.18.1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGFW/M8bi6rjpTunYRAk+PAJ9AhrbTSvgokhXG+RonAolPgSAlFACdHbg3
-X//CRNcL/dsKfF5fCTHBH5U=
-=D6XZ
------END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/shadow-4.0.18.1.ebuild b/sys-apps/shadow/shadow-4.0.18.1.ebuild
index 7c45e073bcac..0add7fa9e775 100644
--- a/sys-apps/shadow/shadow-4.0.18.1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.13 2007/03/03 06:02:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.14 2007/06/23 02:36:07 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -8,7 +8,7 @@ DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="http://shadow.pld.org.pl/"
 SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls pam selinux skey nousuid cracklib"