diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2004-06-28 04:11:10 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2004-06-28 04:11:10 +0000 |
| commit | 555f715aeb03e54557d4724a63e05d62d03177d3 (patch) | |
| tree | ef6a43b89a1675e520341a040ffcd317cfc6a4e5 /sys-apps/pam-login | |
| parent | QA - fix use invocation (Manifest recommit) (diff) | |
| download | gentoo-2-555f715aeb03e54557d4724a63e05d62d03177d3.tar.gz gentoo-2-555f715aeb03e54557d4724a63e05d62d03177d3.tar.bz2 gentoo-2-555f715aeb03e54557d4724a63e05d62d03177d3.zip | |
dont apply query_user_context patch with USE=livecd
Diffstat (limited to 'sys-apps/pam-login')
| -rw-r--r-- | sys-apps/pam-login/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pam-login/pam-login-3.14.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog index c72c7eb4da33..c4f71067a232 100644 --- a/sys-apps/pam-login/ChangeLog +++ b/sys-apps/pam-login/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/pam-login # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.39 2004/06/24 22:20:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.40 2004/06/28 04:11:10 pebenito Exp $ + + 27 Jun 2004; Chris PeBenito <pebenito@gentoo.org> pam-login-3.14.ebuild: + Change the query_user_context patch to not apply with USE=livecd, since it can + cause login timeouts if the user isn't ready. 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pam-login-3.11-r1.ebuild, pam-login-3.12.ebuild, pam-login-3.14.ebuild: diff --git a/sys-apps/pam-login/pam-login-3.14.ebuild b/sys-apps/pam-login/pam-login-3.14.ebuild index 17689acb9e95..0e33778eac27 100644 --- a/sys-apps/pam-login/pam-login-3.14.ebuild +++ b/sys-apps/pam-login/pam-login-3.14.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2004 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.15 2004/06/24 22:20:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.16 2004/06/28 04:11:10 pebenito Exp $ inherit gnuconfig eutils -IUSE="nls selinux" +IUSE="livecd nls selinux" # Do we want to backup an old login.defs, and forcefully # install a new version? @@ -35,7 +35,9 @@ src_unpack() { epatch ${FILESDIR}/pam-login-3.11-lastlog-fix.patch # enable query_user_context selinux code (only affects selinux) - epatch ${FILESDIR}/pam-login-3.14-query_user_context.diff + # but we dont want it on the selinux livecd, since it can + # cause the login to timeout if the user isnt ready + use livecd || epatch ${FILESDIR}/pam-login-3.14-query_user_context.diff use ppc64 && epatch ${FILESDIR}/pam_login-Werror-off-ppc64.patch } |