[arch-commits] Commit in gdm/trunk (3 files)
Ionut Biru
ibiru at archlinux.org
Fri Sep 9 22:07:35 UTC 2011
Date: Friday, September 9, 2011 @ 18:07:35
Author: ibiru
Revision: 137580
update to 3.1.91
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/fix_external_program_directories.patch
Deleted:
gdm/trunk/fix-consolekit-registration.patch
----------------------------------------+
PKGBUILD | 17 ++---
fix-consolekit-registration.patch | 98 -------------------------------
fix_external_program_directories.patch | 22 +++---
3 files changed, 19 insertions(+), 118 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-09 21:39:09 UTC (rev 137579)
+++ PKGBUILD 2011-09-09 22:07:35 UTC (rev 137580)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gdm
-pkgver=3.1.90
-pkgrel=4
+pkgver=3.1.91
+pkgrel=1
pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,22 +17,20 @@
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
fix_external_program_directories.patch
gdm
- gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam
- fix-consolekit-registration.patch)
-sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
- 'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb'
+ gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('a9163b711f9cdd005b872575226dd97e06b3eb5e34369aae905e96677e682ef2'
+ '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
'5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
- '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
- '405d82ad12ea6371ddc031e7d86e5d2ade6fe054bebbfaf24c89ac0a85fcef1c')
+ '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
- patch -Np1 -i "${srcdir}/fix-consolekit-registration.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm \
@@ -57,5 +55,6 @@
install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
chmod 1770 "${pkgdir}/var/log/gdm"
+ chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf"
rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
}
Deleted: fix-consolekit-registration.patch
===================================================================
--- fix-consolekit-registration.patch 2011-09-09 21:39:09 UTC (rev 137579)
+++ fix-consolekit-registration.patch 2011-09-09 22:07:35 UTC (rev 137580)
@@ -1,98 +0,0 @@
-From 984038d2df357750f49658ad0c5bfe0d2e812ffd Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Tue, 06 Sep 2011 15:41:07 +0000
-Subject: daemon: fix consolekit registration
-
-ioni pointed out on IRC, that since commit
-647cad5bf59a4ff3776ba1ae5cda6b1aaaa1cfb2
-
-the greeter session isn't getting fully registered
-with consolekit and so udev acls weren't being
-properly applied.
-
-This commit passes the tty to the worker process
-so that it can be used for registration.
-
-It also passes hostname, merely for completeness.
----
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 1d5c16a..c25bc9b 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -1401,6 +1401,8 @@ do_introspect (DBusConnection *connection,
- " <signal name=\"SetupForProgram\">\n"
- " <arg name=\"service_name\" type=\"s\"/>\n"
- " <arg name=\"x11_display_name\" type=\"s\"/>\n"
-+ " <arg name=\"display_device\" type=\"s\"/>\n"
-+ " <arg name=\"hostname\" type=\"s\"/>\n"
- " <arg name=\"x11_authority_file\" type=\"s\"/>\n"
- " <arg name=\"log_file\" type=\"s\"/>\n"
- " </signal>\n"
-@@ -2052,6 +2054,8 @@ send_setup_for_program (GdmSessionDirect *session,
- DBusMessage *message;
- DBusMessageIter iter;
- const char *display_name;
-+ const char *display_device;
-+ const char *display_hostname;
- const char *display_x11_authority_file;
- GdmSessionConversation *conversation;
-
-@@ -2062,6 +2066,16 @@ send_setup_for_program (GdmSessionDirect *session,
- } else {
- display_name = "";
- }
-+ if (session->priv->display_hostname != NULL) {
-+ display_hostname = session->priv->display_hostname;
-+ } else {
-+ display_hostname = "";
-+ }
-+ if (session->priv->display_device != NULL) {
-+ display_device = session->priv->display_device;
-+ } else {
-+ display_device = "";
-+ }
- if (session->priv->display_x11_authority_file != NULL) {
- display_x11_authority_file = session->priv->display_x11_authority_file;
- } else {
-@@ -2077,6 +2091,8 @@ send_setup_for_program (GdmSessionDirect *session,
- dbus_message_iter_init_append (message, &iter);
- dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name);
- dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name);
-+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device);
-+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname);
- dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file);
- dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &log_file);
-
-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 2b46ca8..c402e6c 100644
---- a/daemon/gdm-session-worker.c
-+++ b/daemon/gdm-session-worker.c
-@@ -2597,6 +2597,8 @@ on_setup_for_program (GdmSessionWorker *worker,
- DBusError error;
- char *service;
- char *x11_display_name;
-+ char *console;
-+ char *hostname;
- char *x11_authority_file;
- char *log_file;
- dbus_bool_t res;
-@@ -2611,6 +2613,8 @@ on_setup_for_program (GdmSessionWorker *worker,
- &error,
- DBUS_TYPE_STRING, &service,
- DBUS_TYPE_STRING, &x11_display_name,
-+ DBUS_TYPE_STRING, &console,
-+ DBUS_TYPE_STRING, &hostname,
- DBUS_TYPE_STRING, &x11_authority_file,
- DBUS_TYPE_STRING, &log_file,
- DBUS_TYPE_INVALID);
-@@ -2621,6 +2625,8 @@ on_setup_for_program (GdmSessionWorker *worker,
- worker->priv->service = g_strdup (service);
- worker->priv->username = g_strdup (GDM_USERNAME);
- worker->priv->x11_display_name = g_strdup (x11_display_name);
-+ worker->priv->hostname = g_strdup (hostname);
-+ worker->priv->display_device = g_strdup (console);
- worker->priv->x11_authority_file = g_strdup (x11_authority_file);
- worker->priv->log_file = g_strdup (log_file);
- worker->priv->is_program_session = TRUE;
---
-cgit v0.9.0.2
Modified: fix_external_program_directories.patch
===================================================================
--- fix_external_program_directories.patch 2011-09-09 21:39:09 UTC (rev 137579)
+++ fix_external_program_directories.patch 2011-09-09 22:07:35 UTC (rev 137580)
@@ -1,6 +1,6 @@
-diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
---- gdm-3.1.90.orig/daemon/gdm-server.c 2011-09-02 13:13:16.132989960 +0000
-+++ gdm-3.1.90/daemon/gdm-server.c 2011-09-03 08:00:30.007431483 +0000
+diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c
+--- gdm-3.1.91.orig/daemon/gdm-server.c 2011-09-09 21:58:06.586838200 +0000
++++ gdm-3.1.91/daemon/gdm-server.c 2011-09-09 21:58:14.583578916 +0000
@@ -131,7 +131,7 @@
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
@@ -10,19 +10,19 @@
server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.1.90.orig/data/gdm-shell.session.in gdm-3.1.90/data/gdm-shell.session.in
---- gdm-3.1.90.orig/data/gdm-shell.session.in 2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/data/gdm-shell.session.in 2011-09-03 08:01:06.721067234 +0000
+diff -Nur gdm-3.1.91.orig/data/gdm-shell.session.in gdm-3.1.91/data/gdm-shell.session.in
+--- gdm-3.1.91.orig/data/gdm-shell.session.in 2011-09-09 21:58:06.613505113 +0000
++++ gdm-3.1.91/data/gdm-shell.session.in 2011-09-09 21:59:00.300668930 +0000
@@ -1,5 +1,5 @@
[GNOME Session]
Name=Display Manager
RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && @libexecdir@/gnome-session-check-accelerated"
-+IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && /usr/lib/gnome-session/gnome-session-check-accelerated"
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated
FallbackSession=gdm-fallback
-diff -Nur gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c 2011-09-03 08:00:30.010764843 +0000
+diff -Nur gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:06.613505113 +0000
++++ gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:14.583578916 +0000
@@ -131,7 +131,7 @@
ret = FALSE;
More information about the arch-commits
mailing list