Fix gdm by updating pam info

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16670 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 33 insertions, 7 deletions

diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index 5adb9dcb2..edafe1187 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm3/Makefile,v 1.15 2011/10/20 09:11:40 kwm Exp $
+#   $MCom: ports/x11/gdm3/Makefile,v 1.16 2012/01/21 23:36:03 ahze Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	3.2.1.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -55,7 +56,8 @@ GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
-		--with-at-spi-registryd-directory=${LOCALBASE}/libexec
+		--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
+		--enable-authentication-scheme=pam
 CPPFLAGS=	-I${LOCALBASE}/include -DHAS_SA_LEN
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGLIBS=	-lm -lexecinfo
@@ -125,7 +127,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
 		${PREFIX}/etc/gdm/custom.conf.default
 	${MKDIR} ${PREFIX}/share/xsessions
-	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
+	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm-welcome
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 	@dconf update
diff --git a/x11/gdm3/files/gdm.pam.in b/x11/gdm3/files/gdm.pam.in
index 0849259ad..904b58bbe 100644
--- a/x11/gdm3/files/gdm.pam.in
+++ b/x11/gdm3/files/gdm.pam.in
@@ -1,6 +1,6 @@
 #
-# $FreeBSD: ports/x11/gdm/files/gdm.pam.in,v 1.7 2010/07/25 19:35:05 kwm Exp $
-#    $MCom: ports-stable/x11/gdm/files/gdm.pam.in,v 1.3 2010/07/21 13:50:46 kwm Exp $
+# $FreeBSD$
+#    $MCom: ports/x11/gdm3/files/gdm.pam.in,v 1.1 2011/03/11 13:18:56 kwm Exp $
 #
 # PAM configuration for the "gdm" service
 #
@@ -8,7 +8,7 @@
 # auth
 #auth		sufficient	pam_krb5.so		no_warn try_first_pass
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
-auth		required	pam_unix.so		no_warn try_first_pass
+auth		required	pam_permit.so		no_warn try_first_pass
 %%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
 
 # account
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam b/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam
new file mode 100644
index 000000000..76c523dcb
--- /dev/null
+++ b/x11/gdm3/files/patch-gui_simple-greeter_extensions_password_gdm-password.pam
@@ -0,0 +1,24 @@
+--- gui/simple-greeter/extensions/password/gdm-password.pam.orig	2011-10-19 11:41:52.000000000 -0400
++++ gui/simple-greeter/extensions/password/gdm-password.pam	2012-01-26 00:30:31.982559286 -0500
+@@ -1,19 +1,12 @@
+ # Sample PAM file for doing password authentication.
+ # Distros should replace this with what makes sense for them.
+-auth        required      pam_env.so
+ auth        sufficient    pam_unix.so nullok try_first_pass
+-auth        requisite     pam_succeed_if.so uid >= 500 quiet
+-auth        required      pam_deny.so
++auth        required      pam_permit.so
+ 
+ account     required      pam_unix.so
+-account     sufficient    pam_localuser.so
+-account     sufficient    pam_succeed_if.so uid < 500 quiet
+ account     required      pam_permit.so
+ 
+-password    requisite     pam_cracklib.so try_first_pass retry=3 type=
+ password    sufficient    pam_unix.so nullok try_first_pass use_authtok
+-password    required      pam_deny.so
++password    required      pam_permit.so
+ 
+-session     optional      pam_keyinit.so revoke
+-session     required      pam_limits.so
+ session     required      pam_unix.so
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
index aa2b27344..a8a4c76af 100644
--- a/x11/gdm3/pkg-plist
+++ b/x11/gdm3/pkg-plist
@@ -13,10 +13,10 @@ etc/gdm/Xsession
 @unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/pam.d/gdm
 etc/pam.d/gdm-fingerprint
 etc/pam.d/gdm-password
 etc/pam.d/gdm-smartcard
+etc/pam.d/gdm-welcome
 include/gdm/greeter/gdm-greeter-client.h
 include/gdm/greeter/gdm-greeter-sessions.h
 include/gdm/simple-greeter/gdm-login-extension.h