7 files changed, 26 insertions, 37 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d21a7eca02cd..b2b0c2907d3a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.174 2010/04/27 14:58:59 kwm Exp $
+#   $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.30.2
-PORTREVISION=	1
+PORTVERSION=	2.30.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 0081bb351e9f..b871a351917e 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.30.2.tar.bz2) = ba35f9f750b50be572952195989df2c5
-SHA256 (gnome2/gdm-2.30.2.tar.bz2) = 884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5
-SIZE (gnome2/gdm-2.30.2.tar.bz2) = 2381359
+MD5 (gnome2/gdm-2.30.4.tar.bz2) = f5e0ff54522f005d7593ac6686772988
+SHA256 (gnome2/gdm-2.30.4.tar.bz2) = 3a1c7fd590622d5291584d98ce5cf3e7888adf949655041549561f3a5983b5a9
+SIZE (gnome2/gdm-2.30.4.tar.bz2) = 2402222
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index d4f41552daa5..b897fa8b7597 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.43 2010/04/17 19:06:00 marcus Exp $
+#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 3f9ebd29b37a..52ad31672ad8 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.11 2010/03/16 19:33:11 mezz Exp $
+#    $MCom: ports-stable/x11/gdm/files/gdm.pam.in,v 1.3 2010/07/21 13:50:46 kwm Exp $
 #
 # PAM configuration for the "gdm" service
 #
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
index b0b8ed37d060..a7bfbc883da0 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -1,6 +1,6 @@
---- gui/simple-greeter/gdm-user-manager.c.orig	2009-12-21 17:36:30.000000000 +0100
-+++ gui/simple-greeter/gdm-user-manager.c	2009-12-27 22:34:26.000000000 +0100
-@@ -66,6 +66,8 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig	2010-06-26 00:09:31.000000000 +0200
++++ gui/simple-greeter/gdm-user-manager.c	2010-07-20 23:23:07.000000000 +0200
+@@ -62,6 +62,8 @@
  
  #ifdef __sun
  #define DEFAULT_MINIMAL_UID     100
@@ -9,19 +9,12 @@
  #else
  #define DEFAULT_MINIMAL_UID     500
  #endif
-@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager)
-         GSList        *new_users;
-         GSList        *list;
-         GSList        *dup;
-+#ifndef __FreeBSD__
-         FILE          *fp;
-+#endif
- 
-         old_users = NULL;
-         new_users = NULL;
+@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
+                                                    NULL,
+                                                    g_object_unref);
  
 +#ifdef __FreeBSD__
-+        setpwent ();
++	setpwent ();
 +#else
 +
          errno = 0;
@@ -32,25 +25,25 @@
          }
 +#endif
  
-         g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
-         g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager)
-         } else {
+         /* Make sure we keep users who are logged in no matter what. */
+         g_hash_table_iter_init (&iter, current_users_by_name);
+@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
+ 
                  g_debug ("GdmUserManager: include_all is TRUE");
  
 +#ifdef __FreeBSD__
 +		for (pwent = getpwent ();
 +		     pwent != NULL;
-+		     pwent = getpwent()) {
++		     pwent = getpwent ()) {
 +#else
                  for (pwent = fgetpwent (fp);
                       pwent != NULL;
                       pwent = fgetpwent (fp)) {
 +#endif
-                         GdmUser *user;
  
-                         user = NULL;
-@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager)
+                         /* Skip users below MinimalUID... */
+                         if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
+@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
   out:
          /* Cleanup */
  
@@ -60,5 +53,5 @@
          fclose (fp);
 +#endif
  
-         g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
-         g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
+         g_hash_table_iter_init (&iter, new_users_by_name);
+         while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 376987eda0e9..37802feab918 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -23,12 +23,12 @@ POST-INSTALL)
 	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
 	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
 	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
-	${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+	${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
 	${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
 	install  -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
 	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
 	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
-	${CHOWN} -R root:gdm ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
 
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 97705242ebaf..2638d7a283ed 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -24,9 +24,6 @@ libexec/gdm-user-switch-applet
 libexec/gdm-xdmcp-chooser-slave
 sbin/gdm
 sbin/gdm-binary
-sbin/gdm-restart
-sbin/gdm-safe-restart
-sbin/gdm-stop
 %%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
 %%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
 %%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop