fix pam issue

diff --git a/x11-base/xfree/files/4.2.1-r1/xserver.pamd b/x11-base/xfree/files/4.2.1-r1/xserver.pamd
index d8550e5a0d956dbdc1e137909dca006a2b0e5abb..7ff11c4329e26fcd36300b929c2005de03b2e554 100644 (file)
--- a/x11-base/xfree/files/4.2.1-r1/xserver.pamd
+++ b/x11-base/xfree/files/4.2.1-r1/xserver.pamd
@@ -1,4 +1,8 @@
 #%PAM-1.0
-auth       sufficient  /lib/security/pam_rootok.so
-auth       required    /lib/security/pam_console.so
-account    required    /lib/security/pam_permit.so
+
+auth       sufficient   /lib/security/pam_rootok.so
+# Next line you need console ownership to be able to start X 
+#auth       required     /lib/security/pam_console.so
+auth       required     /lib/security/pam_permit.so
+
+account    required     /lib/security/pam_permit.so

diff --git a/x11-base/xfree/xfree-4.2.1-r1.ebuild b/x11-base/xfree/xfree-4.2.1-r1.ebuild
index 402344ab5df69160b66ea666a7f84f84bd4b4998..ade3236a5568ac72856ee36396a205240017b1eb 100644 (file)
--- a/x11-base/xfree/xfree-4.2.1-r1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.1 2002/11/03 11:41:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.2 2002/11/03 14:19:29 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -311,6 +311,15 @@ src_unpack() {
        fi
        eend 0
 
+       # These are not included anymore as they are obsolete
+       rm -rf ${S}/xc/doc/hardcopy/{XIE,PEX5}
+       for x in ${S}/xc/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
+       do
+               cp ${x} ${x}.orig
+               grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
+               rm -f ${x}.orig
+       done
+
        # Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/
 #      einfo "Applying Xft quality hack..."
 #      cd ${S}/lib/Xft
@@ -470,7 +479,7 @@ src_install() {
        insinto /etc/pam.d
        newins ${FILESDIR}/${PVR}/xdm.pamd xdm
        # Need to fix console permissions first
-       #newins ${FILESDIR}/${PVR}/xserver.pamd xserver
+       newins ${FILESDIR}/${PVR}/xserver.pamd xserver
        exeinto /etc/init.d
        newexe ${FILESDIR}/${PVR}/xdm.start xdm
        newexe ${FILESDIR}/${PVR}/xfs.start xfs