diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-29 06:05:16 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-29 06:05:16 +0000 |
| commit | df01b04069d408ab58161fcde504f0769ee616a8 (patch) | |
| tree | 1412992f32997b1864f1bf6710b71986a0f16082 /gnome-base | |
| parent | Initial import of curb. (diff) | |
| download | gentoo-2-df01b04069d408ab58161fcde504f0769ee616a8.tar.gz gentoo-2-df01b04069d408ab58161fcde504f0769ee616a8.tar.bz2 gentoo-2-df01b04069d408ab58161fcde504f0769ee616a8.zip | |
Do not install old /etc/pam.d/gdm file, it blocks sys-libs/pam from emerging (bug #435042, thanks to Martin Wegner).
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.4.1-r3.ebuild (renamed from gnome-base/gdm/gdm-3.4.1-r2.ebuild) | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 93f17752d7f5..6f445fdcf416 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.356 2012/09/27 08:54:42 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.357 2012/09/29 06:05:16 tetromino Exp $ + +*gdm-3.4.1-r3 (29 Sep 2012) + + 29 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -gdm-3.4.1-r2.ebuild, +gdm-3.4.1-r3.ebuild: + Do not install old /etc/pam.d/gdm file, it blocks sys-libs/pam from emerging + (bug #435042, thanks to Martin Wegner). *gdm-3.4.1-r2 (27 Sep 2012) diff --git a/gnome-base/gdm/gdm-3.4.1-r2.ebuild b/gnome-base/gdm/gdm-3.4.1-r3.ebuild index 9abbaf2fc45d..af4287f712cb 100644 --- a/gnome-base/gdm/gdm-3.4.1-r2.ebuild +++ b/gnome-base/gdm/gdm-3.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r2.ebuild,v 1.1 2012/09/27 08:54:42 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r3.ebuild,v 1.1 2012/09/29 06:05:16 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -202,6 +202,9 @@ src_install() { echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm doenvd 99xdg-gdm + # pam.d/gdm is no longer needed, and can block pam-1.1.6, #435042 + rm -v "${ED}etc/pam.d/gdm" || die + cd "${WORKDIR}/${G_P}" local LDAP use ldap && LDAP=yes |