(#151173) Move the system-auth include below pam_nologin. This problem would cause /etc/nologin to screw up and bypass the /etc/shells check.

Package-Manager: portage-2.1.2_rc3-r3

5 files changed, 86 insertions, 10 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 0c62c8b85592..18a124fc7eb0 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.60 2006/12/02 15:53:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.61 2006/12/12 06:02:01 dberkholz Exp $
+
+*xdm-1.1.2-r1 (12 Dec 2006)
+
+  12 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; files/xdm.pamd,
+  +xdm-1.1.2-r1.ebuild:
+  (#151173) Move the system-auth include below pam_nologin. This problem would
+  cause /etc/nologin to screw up and bypass the /etc/shells check.
 
 *xdm-1.1.2 (02 Dec 2006)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 838b47839598..65d37be2f3f8 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -6,10 +6,10 @@ AUX wtmp.patch 799 RMD160 515f6fb67c43877c41384a5012a9afea047b6f22 SHA1 2591d85c
 MD5 d7eb1588964b8a757c454fa38bde30e4 files/wtmp.patch 799
 RMD160 515f6fb67c43877c41384a5012a9afea047b6f22 files/wtmp.patch 799
 SHA256 7ce7c837484e380be21022ffa4e306ee8c555fbffd6e53e85aef59f24074020d files/wtmp.patch 799
-AUX xdm.pamd 169 RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 SHA1 0995682b53cccd2b618a48c2d1325abb7e706b00 SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288
-MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
-RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 files/xdm.pamd 169
-SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288 files/xdm.pamd 169
+AUX xdm.pamd 169 RMD160 3966ca34d9600db06be7e672b66b0ae23c8e9282 SHA1 48e97b23aefa2ed4bacd4b8bd0b9bed424faead7 SHA256 5e334101825dba22adacefc3becc9294e6ff7e6834b6d58f228fec9b0df8259b
+MD5 a7e829db5d4da0c01f6fc619db3ee4b5 files/xdm.pamd 169
+RMD160 3966ca34d9600db06be7e672b66b0ae23c8e9282 files/xdm.pamd 169
+SHA256 5e334101825dba22adacefc3becc9294e6ff7e6834b6d58f228fec9b0df8259b files/xdm.pamd 169
 AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1 df9d176961a1a84da2ee94667fb601634268c923 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4
 MD5 7c232f7520a16f42492ee90056cd4609 files/xwilling-hang.patch 589
 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b files/xwilling-hang.patch 589
@@ -25,14 +25,18 @@ EBUILD xdm-1.1.0.ebuild 1393 RMD160 1ce3d951183e9e7c32caa7a209afff54a7e51dae SHA
 MD5 aab513488fed142ae57a5eed39c41b5d xdm-1.1.0.ebuild 1393
 RMD160 1ce3d951183e9e7c32caa7a209afff54a7e51dae xdm-1.1.0.ebuild 1393
 SHA256 71673448ffb539783f94c55123999981ce2f4dab9df7adc55db1abbdab9f861b xdm-1.1.0.ebuild 1393
+EBUILD xdm-1.1.2-r1.ebuild 1396 RMD160 9a7100a73158142aaacf9d64f44c4e1af2cf2960 SHA1 b4bb15f4f1b7855812f17d905b9d029993633057 SHA256 9eebfaceefafe35b140783185e7a49d10cab55856b2d3d25f29aa01739d26546
+MD5 f79787110be7de868465057fffdaad85 xdm-1.1.2-r1.ebuild 1396
+RMD160 9a7100a73158142aaacf9d64f44c4e1af2cf2960 xdm-1.1.2-r1.ebuild 1396
+SHA256 9eebfaceefafe35b140783185e7a49d10cab55856b2d3d25f29aa01739d26546 xdm-1.1.2-r1.ebuild 1396
 EBUILD xdm-1.1.2.ebuild 1397 RMD160 647f5e57b4fb051cc46c738af769b0dd805062b9 SHA1 8c29d45b8f5918b2901e3103ad365ac655da99a7 SHA256 f7dab30f0ddd5d9200433fd1215515787f43190c7499ff07baef0b122e1e264b
 MD5 2a90ff22890802cae1203401c70cc90c xdm-1.1.2.ebuild 1397
 RMD160 647f5e57b4fb051cc46c738af769b0dd805062b9 xdm-1.1.2.ebuild 1397
 SHA256 f7dab30f0ddd5d9200433fd1215515787f43190c7499ff07baef0b122e1e264b xdm-1.1.2.ebuild 1397
-MISC ChangeLog 10134 RMD160 873d5f286c813400e782d192a4f14cf798b0248d SHA1 923e067506ec71a7eeb6e86f96e677644b60c3a2 SHA256 dfa5e36c8e19d2a174f1ed9de1df4066f2a25d0fab57f8e21679ef5c6e7a232d
-MD5 37f783545d930ade943a93ff639a54a3 ChangeLog 10134
-RMD160 873d5f286c813400e782d192a4f14cf798b0248d ChangeLog 10134
-SHA256 dfa5e36c8e19d2a174f1ed9de1df4066f2a25d0fab57f8e21679ef5c6e7a232d ChangeLog 10134
+MISC ChangeLog 10401 RMD160 9453057791fb66a501e1a2ee3653eae75e234011 SHA1 a068b10450a62826307dab46c0907026b97dfd20 SHA256 32c4f7f177e554de1e5720fd7d9f476d1ea5bc7445c3cdb85bf9e2f51460e451
+MD5 2d53ca8703399e227a6fb03feed07ba0 ChangeLog 10401
+RMD160 9453057791fb66a501e1a2ee3653eae75e234011 ChangeLog 10401
+SHA256 32c4f7f177e554de1e5720fd7d9f476d1ea5bc7445c3cdb85bf9e2f51460e451 ChangeLog 10401
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -46,3 +50,6 @@ SHA256 305c0e1d87c7a00ca46f5a0ea5ab9e113a3a3fc29a9e2fc96dd44d861a44e708 files/di
 MD5 40f8a09310ae2b5ecadbe491842288e3 files/digest-xdm-1.1.2 232
 RMD160 8ae20bdfedfee582c2ce811cba9bad0ce0fd57b4 files/digest-xdm-1.1.2 232
 SHA256 eced9d75644f906db7ebdcdf5ef381a359098f8e7ba8c7704b421912d4de8fb0 files/digest-xdm-1.1.2 232
+MD5 40f8a09310ae2b5ecadbe491842288e3 files/digest-xdm-1.1.2-r1 232
+RMD160 8ae20bdfedfee582c2ce811cba9bad0ce0fd57b4 files/digest-xdm-1.1.2-r1 232
+SHA256 eced9d75644f906db7ebdcdf5ef381a359098f8e7ba8c7704b421912d4de8fb0 files/digest-xdm-1.1.2-r1 232
diff --git a/x11-apps/xdm/files/digest-xdm-1.1.2-r1 b/x11-apps/xdm/files/digest-xdm-1.1.2-r1
new file mode 100644
index 000000000000..ce27a2927344
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-1.1.2-r1
@@ -0,0 +1,3 @@
+MD5 4db5eb07aad7a7e53f534c95c1c79920 xdm-1.1.2.tar.bz2 385887
+RMD160 bee403e08cfb852206714d5d0d23b7f51ed4acab xdm-1.1.2.tar.bz2 385887
+SHA256 af0aafc172c4b0b2c04059d17e82e8f3e87aa9740d88fa13e981ec7eef5fd529 xdm-1.1.2.tar.bz2 385887
diff --git a/x11-apps/xdm/files/xdm.pamd b/x11-apps/xdm/files/xdm.pamd
index 5d2b2b56b068..4ab9695f08c0 100644
--- a/x11-apps/xdm/files/xdm.pamd
+++ b/x11-apps/xdm/files/xdm.pamd
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       include	system-auth
 auth       required	pam_nologin.so
+auth       include	system-auth
 account    include	system-auth
 password   include	system-auth
 session    include	system-auth
diff --git a/x11-apps/xdm/xdm-1.1.2-r1.ebuild b/x11-apps/xdm/xdm-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..67cb838bb872
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.2-r1.ebuild,v 1.1 2006/12/12 06:02:01 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit multilib x-modular pam
+
+DEFAULTVT="vt7"
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="xprint ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-1.0.2-r3
+	x11-libs/libXinerama
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-apps/sessreg"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/wtmp.patch
+	${FILESDIR}/xwilling-hang.patch"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)
+	$(use_enable ipv6)
+	$(use_with pam)
+	--with-default-vt=${DEFAULTVT}
+	--with-xdmconfigdir=/etc/X11/xdm"
+
+pkg_setup() {
+	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+		die "Build x11-libs/libXaw with USE=xprint."
+	fi
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe ${FILESDIR}/Xsession
+	newpamd ${FILESDIR}/xdm.pamd xdm
+}
+
+pkg_preinst() {
+	x-modular_pkg_preinst
+
+	# Check for leftover /usr/lib/X11/xdm symlink
+	if [[ -L "/usr/lib/X11/xdm" ]]; then
+		ewarn "/usr/lib/X11/xdm is a symlink; deleting."
+		rm /usr/lib/X11/xdm
+	fi
+}