Update gdm to 3.12.1. Remove patch-consolekit (commit 1d76114a0015c) and

kill the patch-data_pam-redhat_gdm-password.pam patch (we provide our
own right now)


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

4 files changed, 3 insertions, 94 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index eb047a4..697acb2 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gdm
-PORTVERSION=	3.12.0
-PORTREVISION=	1
+PORTVERSION=	3.12.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 6705060..56b6c7b 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdm-3.12.0.tar.xz) = 74889819a0c55577fd04236b5308de5f1fcf1992b221c71d02d91a1e564a5d87
-SIZE (gnome3/gdm-3.12.0.tar.xz) = 1522032
+SHA256 (gnome3/gdm-3.12.1.tar.xz) = 41a009252bf491dadd7644b3e74be5c9364b1971b519a1a9ef31257180c74913
+SIZE (gnome3/gdm-3.12.1.tar.xz) = 1505728
diff --git a/x11/gdm/files/patch-consolekit b/x11/gdm/files/patch-consolekit
deleted file mode 100644
index d14cff2..0000000
--- a/x11/gdm/files/patch-consolekit
+++ /dev/null
@@ -1,60 +0,0 @@
-From 046527bbe56ced9e145b1799467f8edfad2c5895 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Wed, 26 Mar 2014 00:33:58 -0400
-Subject: [PATCH] ConsoleKit: a pair of tweaks
-
-It looks like there were a couple of breaks when porting away from
-ck-connector.
-
-The first issue is that consolekit uses some hard-coded rules to decide
-if a given session is associated with the hard-coded 'Seat1' or not.
-One of these rules is the "x11-display-device" property being set.  We
-were setting the "display-device" property instead, which is not for
-graphical sessions.  This was causing a new seat to be dynamically
-created each time gdm started which was causing us to send
-ActivateSession requests to the wrong seat.
-
-The second issue is that ActivateSession will "fail" with "Session
-already active" errors.  Ignore those.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=727072
----
- daemon/gdm-manager.c        | 9 ++++++++-
- daemon/gdm-session-worker.c | 2 +-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index c5e46b6..2fc2ae5 100644
---- daemon/gdm-manager.c
-+++ daemon/gdm-manager.c
-@@ -430,7 +430,14 @@ activate_session_id_for_ck (GdmManager *manager,
-                 g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
-                          g_dbus_error_get_remote_error (error), error->message);
-                 g_error_free (error);
--                return FALSE;
-+
-+                /* It is very likely that the "error" just reported is
-+                 * that the session is already active.  Unfortunately,
-+                 * ConsoleKit doesn't use proper error codes and it
-+                 * translates the error message, so we have no real way
-+                 * to detect this case...
-+                 */
-+                return TRUE;
-         }
- 
-         g_variant_unref (reply);
-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 39f14cf..a0cbfb5 100644
---- daemon/gdm-session-worker.c
-+++ daemon/gdm-session-worker.c
-@@ -274,7 +274,7 @@ open_ck_session (GdmSessionWorker  *worker)
- 
-         g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)"));
-         g_variant_builder_add_parsed (&builder, "('unix-user', <%i>)", uid);
--        g_variant_builder_add_parsed (&builder, "('display-device', <%s>)", display_device);
-+        g_variant_builder_add_parsed (&builder, "('x11-display-device', <%s>)", display_device);
-         g_variant_builder_add_parsed (&builder, "('x11-display', <%s>)", display_name);
-         g_variant_builder_add_parsed (&builder, "('remote-host-name', <%s>)", display_hostname);
-         g_variant_builder_add_parsed (&builder, "('is-local', <%b>)", worker->priv->display_is_local);
--- 
-1.8.5.3
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
deleted file mode 100644
index 61737fa..0000000
--- a/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
+++ /dev/null
@@ -1,30 +0,0 @@
---- data/pam-redhat/gdm-password.pam.orig	2012-10-03 22:03:41.000000000 +0000
-+++ data/pam-redhat/gdm-password.pam	2013-05-02 09:48:30.000000000 +0000
-@@ -1,20 +1,10 @@
--auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
--auth        substack      password-auth
--auth        optional      pam_gnome_keyring.so
--auth        include       postlogin
-+auth        required      pam_unix.so
-+auth        optional      %%LOCALBASE%%/lib/pam_gnome_keyring.so
- 
--account     required      pam_nologin.so
--account     include       password-auth
-+account     required      pam_unix.so
- 
--password    include       password-auth
-+password    required      pam_unix.so
-+
-+session     include      system
-+session     optional     %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
- 
--session     required      pam_selinux.so close
--session     required      pam_loginuid.so
--session     optional      pam_console.so
---session    optional    pam_ck_connector.so
--session     required      pam_selinux.so open
--session     optional      pam_keyinit.so force revoke
--session     required      pam_namespace.so
--session     include       password-auth
--session     optional      pam_gnome_keyring.so auto_start
--session     include       postlogin