[patch] Actual patch

gdm-2.6.0.7.ebuild-nopam-edit.patch (text/plain), 2.16 KB, created by Sebastian on 2005-04-17 01:23:05 UTC

--- /usr/portage/gnome-base/gdm/gdm-2.6.0.7.ebuild	2005-03-01 13:51:39.000000000 +0100
+++ /usr/local/portage/gnome-base/gdm/gdm-2.6.0.7.ebuild	2005-04-17 10:08:48.333625496 +0200
@@ -9,14 +9,15 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE="tcpd xinerama selinux ipv6"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="pam tcpd xinerama selinux ipv6"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
 MY_V="${PV%.*}"
 
-RDEPEND=">=sys-libs/pam-0.72
+RDEPEND="pam? (>=sys-libs/pam-0.72)
+	!pam? (>=sys-apps/shadow-4.0.4.1)
 	>=x11-libs/pango-1.4.1
 	>=x11-libs/gtk+-2.4
 	>=gnome-base/libglade-2
@@ -37,13 +38,15 @@
 G2CONF="${G2CONF} \
 	--sysconfdir=/etc/X11 \
 	--localstatedir=/var \
-	--with-pam-prefix=/etc \
 	--with-xdmcp \
 	`use_enable ipv6` \
 	`use_with tcpd tcp-wrappers` \
 	`use_with xinerama` \
 	`use_with selinux`"
 
+use pam || G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
+use pam || G2CONF="${G2CONF} --enable-console-helper=no"
+use pam && G2CONF="${G2CONF} --with-pam-prefix=/etc"
 src_unpack() {
 
 	unpack ${A}
@@ -56,12 +59,17 @@
 
 src_install() {
 
-	gnome2_src_install \
+     if use pam ; then 
+	    gnome2_src_install \
 		PAM_PREFIX=${D}/etc \
 		sysconfdir=${D}/etc/X11 \
 		localstatedir=${D}/var
-
-	# gdm-binary should be gdm to work with our init (#5598)
+     else 
+		gnome2_src_install \
+		sysconfdir=${D}/etc/X11 \
+		localstatedir=${D}/var
+     fi
+# gdm-binary should be gdm to work with our init (#5598)
 	rm -f ${D}/usr/bin/gdm
 	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
 	dosym /usr/bin/gdm /usr/bin/gdm-binary
@@ -82,8 +90,11 @@
 	doexe ${FILESDIR}/${MY_V}/custom.desktop
 
 	# We replace the pam stuff by our own
-	rm -f ${D}/etc/pam.d/gdm
+	if use pam ; then
+	rm -rf ${D}/etc/pam.d
+	fi
 
+if use pam ; then
 	# pam startup
 	dodir /etc/pam.d
 	insinto /etc/pam.d
@@ -95,6 +106,7 @@
 	dodir /etc/security/console.apps
 	insinto /etc/security/console.apps
 	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
+fi
 
 	# use graphical greeter local
 	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf