Make sure pam-login blocks newer shadow so that it can't be installed after it's...

Package-Manager: portage-2.1_pre6-r2

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 0c8f650c757b7afae22f3a031821917016a9fd2d..5d86f008fc2acb4e3935ea6fbd51b1e45c1c1a4f 100644 (file)
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.66 2006/03/13 07:03:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.67 2006/03/14 18:47:26 flameeyes Exp $
+
+  14 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> pam-login-3.14.ebuild,
+  pam-login-3.17.ebuild, pam-login-4.0.11.1-r2.ebuild,
+  pam-login-4.0.12.ebuild, pam-login-4.0.14.ebuild:
+  Make sure pam-login blocks newer shadow so that it can't be installed after
+  it's upgraded.
 
   13 Mar 2006; Joshua Jackson <tsunam@gentoo.org> pam-login-4.0.14.ebuild:
   Stable x86 as depend for shadow; bug #125419

diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index 329d58eba4bd2f14bb788dcdead2d1503611b60e..d32068fbbf48dad765bfaffc79d0d2413df86e3e 100644 (file)
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a80a3909198d70b4a32555875712450 ChangeLog 10146
-RMD160 4038a5859c16917474c09eb333c5fa4e892e69d6 ChangeLog 10146
-SHA256 ff12d4b09b473b3ffce44efa0a3df1638df246a2a6fa06d184daf35d48803fd2 ChangeLog 10146
+MD5 770fac50ecf3ef24b28f1611be005462 ChangeLog 10428
+RMD160 00b0c2c298d63ac32d40df536b76358e689d0c31 ChangeLog 10428
+SHA256 07247898f5927cc7c1c1ffecbf442d805f0d2003695fce40b90f29f3e241d508 ChangeLog 10428
 MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
 RMD160 a5ed3dacc9b08d3b83b572a99b54594d5d082c17 files/digest-pam-login-3.14 67
 SHA256 4af9a8f1f2b6e458c932baa9333859a18282a52748f8b53f6c6d643c58bc7381 files/digest-pam-login-3.14 67
@@ -79,25 +79,25 @@ SHA256 fd6ddb72ffd94e955f198133a8c80abe2e1e5543ae66d1a4889625ed942024be files/pa
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
 SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata.xml 218
-MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
-RMD160 f05cbd384e4f6f2928a3dca42a0098760bb9f18e pam-login-3.14.ebuild 2801
-SHA256 d6293f8bc61233bf8ecc68fe9189900f0383c4f1a9955c1b9b81439c717107ce pam-login-3.14.ebuild 2801
-MD5 75061ebae5083e384feadfe3c4944d88 pam-login-3.17.ebuild 3065
-RMD160 2edb4057c8758b98055aca38d91ad9abd35ee4a8 pam-login-3.17.ebuild 3065
-SHA256 1db644d423ed64477960baabc17769a7b96063a2399422b32bc10ff45ce365d8 pam-login-3.17.ebuild 3065
-MD5 b14a60034b1653ab8897c834b7b2d26d pam-login-4.0.11.1-r2.ebuild 3988
-RMD160 0d117684d4e05990ca41c7bb3d2d9a5f69707f95 pam-login-4.0.11.1-r2.ebuild 3988
-SHA256 47cdd4eb4867cb92604a7b89301ca1ee324372cc537abbba948708454daeae74 pam-login-4.0.11.1-r2.ebuild 3988
-MD5 df176d893e727f84defe9cab73658e23 pam-login-4.0.12.ebuild 3995
-RMD160 39952cf1ad0834b1e44a4c0d6fd02efa2bb63718 pam-login-4.0.12.ebuild 3995
-SHA256 aafa0161e6f5fd11e9568b3eaf35e7b0a4341f7a97542f79bbc67019cbe4e617 pam-login-4.0.12.ebuild 3995
-MD5 cd1a8220e794fbc39e7e97a6f8bbedac pam-login-4.0.14.ebuild 3824
-RMD160 64c23cdc72ef4bbf1da847c8b4d962fc0f54eac5 pam-login-4.0.14.ebuild 3824
-SHA256 8407cc4e7b12a158ea41d7b8c0b3a612113c53ad44302cd48f1027670a050b18 pam-login-4.0.14.ebuild 3824
+MD5 333fc0363830fbc6cf43a539fed3f7ab pam-login-3.14.ebuild 2834
+RMD160 7013b4e1dce7ceb0dd0e0d9793361af59c263d9f pam-login-3.14.ebuild 2834
+SHA256 15c02c6fbb447e8ee8c3ba0fc6a4a9098fb34a4df54376335d986c6a37d6fe8d pam-login-3.14.ebuild 2834
+MD5 98a72d69690d003e08193f81084493bd pam-login-3.17.ebuild 3095
+RMD160 63dcd90a467c11363032dca2091743fba69bb6ab pam-login-3.17.ebuild 3095
+SHA256 506c605b23fcdb97d4b0fd3e06a7f9ebd0284bc7005f6ccb89557d43304e60e9 pam-login-3.17.ebuild 3095
+MD5 82d9fc5776153cdbde4fdc561ea2e38f pam-login-4.0.11.1-r2.ebuild 4018
+RMD160 78b89e695a8a55d7f7ced804d5abce32feed5570 pam-login-4.0.11.1-r2.ebuild 4018
+SHA256 d292b0fc3c0bd90a8c498ce3013ee2b96309dcc5282a6d0d2e0d3725022a8f02 pam-login-4.0.11.1-r2.ebuild 4018
+MD5 794a43991d038c3ffd32dca2f1fea07d pam-login-4.0.12.ebuild 4025
+RMD160 f26d50d854a3157bead880a80784b8559c9d9d93 pam-login-4.0.12.ebuild 4025
+SHA256 3bc570807c4d7c25bccbf3bde55007ca41996d6990a7398376bce91f54687437 pam-login-4.0.12.ebuild 4025
+MD5 703d002b0f75b3b1d0dca5137fa7070d pam-login-4.0.14.ebuild 3857
+RMD160 b5ea9f7bcba0326b46e6e9d357ca07393a9319c9 pam-login-4.0.14.ebuild 3857
+SHA256 77b42c571dbfc43e904335faf338ac3ef65f64e900a6c6b1b56cacac585cb6c4 pam-login-4.0.14.ebuild 3857
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEFRlZSENan+PfizARAudvAJsFjfgq/zG8ro2vR1p8aAwCbUtbQACfbvQ4
-pswLwwxwgtYU+dt3AGoQh7s=
-=5n8k
+iD8DBQFEFxAuAiZjviIA2XgRAsMNAJ4rJRJbyrklJKN6kGdKEmtMiTWe3QCfTfkf
+jnlzPad8yBWgQ+pgn1+AA/o=
+=qODu
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pam-login/pam-login-3.14.ebuild b/sys-apps/pam-login/pam-login-3.14.ebuild
index 919a3afc6c873cbc36784fb860e08edf0c42682f..b586711f1b6deb6f34b1fb6bdf323f39dc095cc6 100644 (file)
--- a/sys-apps/pam-login/pam-login-3.14.ebuild
+++ b/sys-apps/pam-login/pam-login-3.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.21 2005/02/25 15:05:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.22 2006/03/14 18:47:26 flameeyes Exp $
 
 inherit gnuconfig eutils
 
@@ -21,7 +21,8 @@ IUSE="livecd nls selinux"
 
 DEPEND="virtual/libc
        sys-libs/pam
-       selinux? ( sys-libs/libselinux )"
+       selinux? ( sys-libs/libselinux )
+       !>=sys-apps/shadow-4.0.14-r2"
 
 src_unpack() {
        unpack ${A}

diff --git a/sys-apps/pam-login/pam-login-3.17.ebuild b/sys-apps/pam-login/pam-login-3.17.ebuild
index be4f2f31450b5474bd5f890d4554dde95e548885..cea870c1fc32c2ccb2ed90e4a00a5f0ed1d11949 100644 (file)
--- a/sys-apps/pam-login/pam-login-3.17.ebuild
+++ b/sys-apps/pam-login/pam-login-3.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.15 2005/12/21 10:00:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.16 2006/03/14 18:47:26 flameeyes Exp $
 
 inherit gnuconfig eutils pam
 
@@ -22,7 +22,8 @@ IUSE="livecd nls selinux"
 DEPEND="virtual/libc
        sys-libs/pam
        >=sys-apps/shadow-4.0.7-r1
-       selinux? ( sys-libs/libselinux )"
+       selinux? ( sys-libs/libselinux )
+       !>=sys-apps/shadow-4.0.14-r2"
 # We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
 
 src_unpack() {

diff --git a/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild b/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
index 8b0df2cef348b82003bcaf6c9d6df222b9609167..b4045e187aa0a1112b5f9dbdc6508d4353fd8f57 100644 (file)
--- a/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
+++ b/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild,v 1.2 2005/08/23 17:26:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild,v 1.3 2006/03/14 18:47:26 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic pam
 
@@ -23,7 +23,8 @@ DEPEND="virtual/libc
        sys-libs/pam
        >=sys-apps/shadow-4.0.11.1-r1
        skey? ( app-admin/skey )
-       selinux? ( sys-libs/libselinux )"
+       selinux? ( sys-libs/libselinux )
+       !>=sys-apps/shadow-4.0.14-r2"
 # We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
 
 src_unpack() {

diff --git a/sys-apps/pam-login/pam-login-4.0.12.ebuild b/sys-apps/pam-login/pam-login-4.0.12.ebuild
index 7ae499737b9b37225dfb0279b57c5ab8172e5c54..35274eb1a12b240c7beeb386f1e228fc95c89372 100644 (file)
--- a/sys-apps/pam-login/pam-login-4.0.12.ebuild
+++ b/sys-apps/pam-login/pam-login-4.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.12.ebuild,v 1.3 2005/10/09 22:42:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.12.ebuild,v 1.4 2006/03/14 18:47:26 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic pam autotools
 
@@ -23,7 +23,8 @@ DEPEND="virtual/libc
        sys-libs/pam
        >=sys-apps/shadow-4.0.11.1-r1
        skey? ( app-admin/skey )
-       selinux? ( sys-libs/libselinux )"
+       selinux? ( sys-libs/libselinux )
+       !>=sys-apps/shadow-4.0.14-r2"
 # We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
 
 src_unpack() {

diff --git a/sys-apps/pam-login/pam-login-4.0.14.ebuild b/sys-apps/pam-login/pam-login-4.0.14.ebuild
index 63aa4c93e5a8d710baf132adbcc8681a52f3454e..82d176bed8151acd93667b600cc77d3e927f47fa 100644 (file)
--- a/sys-apps/pam-login/pam-login-4.0.14.ebuild
+++ b/sys-apps/pam-login/pam-login-4.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.14.ebuild,v 1.5 2006/03/13 07:03:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.14.ebuild,v 1.6 2006/03/14 18:47:26 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic autotools pam
 
@@ -23,7 +23,8 @@ DEPEND="virtual/libc
        sys-libs/pam
        >=sys-apps/shadow-4.0.11.1-r1
        skey? ( app-admin/skey )
-       selinux? ( sys-libs/libselinux )"
+       selinux? ( sys-libs/libselinux )
+       !>=sys-apps/shadow-4.0.14-r2"
 # We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
 
 src_unpack() {