summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-12-12 06:02:01 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-12-12 06:02:01 +0000
commit1338e91748d752f5b00c36ac83bcb2d08bc274d4 (patch)
tree0413e35048536ec2358d65cf0acbf3be4f782b46 /x11-apps/xdm
parentstable x86, bugs #144723 (diff)
downloadgentoo-2-1338e91748d752f5b00c36ac83bcb2d08bc274d4.tar.gz
gentoo-2-1338e91748d752f5b00c36ac83bcb2d08bc274d4.tar.bz2
gentoo-2-1338e91748d752f5b00c36ac83bcb2d08bc274d4.zip
(#151173) Move the system-auth include below pam_nologin. This problem would cause /etc/nologin to screw up and bypass the /etc/shells check.
(Portage version: 2.1.2_rc3-r3)
Diffstat (limited to 'x11-apps/xdm')
-rw-r--r--x11-apps/xdm/ChangeLog9
-rw-r--r--x11-apps/xdm/files/digest-xdm-1.1.2-r13
-rw-r--r--x11-apps/xdm/files/xdm.pamd2
-rw-r--r--x11-apps/xdm/xdm-1.1.2-r1.ebuild59
4 files changed, 71 insertions, 2 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/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
+}