gdm's "Face Browser" is broken in that it does not display faces for any

user who's pw_passwd is set to "*".  NetBSD gives all users "*", same if
shadow passwords are used on Linux, Solaris etc.  Commenting out that part
makes the face-browser work.  (I'll submit this to the gdm-folks, as well.)

Change pid-file from /var/run/xdm.pid to /var/run/gdm.pid now that we have
our own ${PREFIX}/etc/rc.d/gdm script.

Bump PKGREVISION.

(Changes suggested in PR pkg/17184 by Cliff <cliff at snipe444 dot org>,
applied after feedback from MAINTAINER and tron.  This closes said PR.)

4 files changed, 34 insertions, 10 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 5cfa2565ef6..cecdf5889a5 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/05/31 10:09:35 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/07/27 15:20:05 jschauma Exp $
 
 DISTNAME=	gdm-2.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gdm/} \
 		${MASTER_SITE_LOCAL}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 1e08586246e..83700ecba01 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/22 19:33:37 tron Exp $
+$NetBSD: distinfo,v 1.3 2002/07/27 15:20:05 jschauma Exp $
 
 SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1
 Size (gdm-2.2.0.tar.gz) = 810976 bytes
@@ -7,10 +7,11 @@ Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (patch-aa) = 98299b243415299452e8e30b7edb20a9d333fa1e
-SHA1 (patch-ab) = 971c75ee6d442a658996944900254aee52070c11
+SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1
 SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c
 SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5
 SHA1 (patch-af) = a3c796e78f198e6d45aa6f1e2827e6788b10ce0f
 SHA1 (patch-ba) = 35e1ac11945b2e72270fcf2fb5be60e3168a48d9
 SHA1 (patch-bb) = 0a3b2d0013e6abee732e4f66677f2c916691f49f
 SHA1 (patch-bc) = 1049325306e13cf1c90e08e36d0e918ab106cb3e
+SHA1 (patch-bd) = 9bee6d79104058ab4bb67892c72f846bd270d2ce
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index 0fc6f81ceef..2641f031395 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $
+$NetBSD: patch-ab,v 1.4 2002/07/27 15:20:06 jschauma Exp $
 
---- config/gdm.conf.in.orig	Tue Mar 20 02:18:54 2001
-+++ config/gdm.conf.in	Tue Mar 20 02:22:19 2001
-@@ -1,21 +1,21 @@
+--- config/gdm.conf.in.orig	Sun Mar  4 15:27:12 2001
++++ config/gdm.conf.in	Fri Jul 26 19:51:41 2002
+@@ -1,10 +1,10 @@
  [daemon]
  AutomaticLogin=
  Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
@@ -15,8 +15,7 @@ $NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $
  HaltCommand=/sbin/shutdown -h now
  KillInitClients=true
  LogDir=@EXPANDED_AUTHDIR@
--PidFile=/var/run/gdm.pid
-+PidFile=/var/run/xdm.pid
+@@ -12,10 +12,10 @@
  PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
  PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
  RebootCommand=/sbin/shutdown -r now
diff --git a/x11/gdm/patches/patch-bd b/x11/gdm/patches/patch-bd
new file mode 100644
index 00000000000..31b3b389e81
--- /dev/null
+++ b/x11/gdm/patches/patch-bd
@@ -0,0 +1,24 @@
+$NetBSD: patch-bd,v 1.1 2002/07/27 15:20:06 jschauma Exp $
+
+--- gui/gdmlogin.c.orig	Sun Mar 11 23:24:07 2001
++++ gui/gdmlogin.c	Sat Jul 27 11:07:27 2002
+@@ -1971,11 +1971,19 @@
+ 	const char * const lockout_passes[] = { "*", "!!", NULL };
+ 	gint i;
+ 
++	/*
++	 * pw_passwd is set to "*" on NetBSD as well as when shadow passwords are
++	 * used; in these cases, the following code effectively eliminates any
++	 * functionality from the 'faces browser'.
++	 * (pointed out by Cliff in PR pkg/17184)
++	 */
++#ifdef broken
+ 	for (i=0 ; lockout_passes[i] != NULL ; i++)  {
+ 		if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) {
+ 			return TRUE;
+ 		}
+ 	}
++#endif
+ 
+ 	if (GdmExclude != NULL &&
+ 	    GdmExclude[0] != '\0') {