r32214 - in /desktop/unstable/gdm3/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Dec 17 14:43:55 UTC 2011
Author: joss
Date: Sat Dec 17 14:43:55 2011
New Revision: 32214
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32214
Log:
* 10_gdm3_pam.patch: updated for the new version. Do not prefix the
PAM files for multistack, they have new names anyway.
* 14_pam_dialog.patch: dropped, upstream merged an improved version.
* 18_parametrize_create_display.patch: updated for the new version.
* 19_static_transient_display.patch: unfuzzed.
* 29_grep_path.patch: dropped, merged upstream.
Removed:
desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch
desktop/unstable/gdm3/debian/patches/29_grep_path.patch
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch
desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch
desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch
desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
desktop/unstable/gdm3/debian/patches/series
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat Dec 17 14:43:55 2011
@@ -14,6 +14,12 @@
* 07_libexec-paths.patch: removed unused variables/files.
* 08_frequent-users_greeter.patch: reworked according to upstream
changes.
+ * 10_gdm3_pam.patch: updated for the new version. Do not prefix the
+ PAM files for multistack, they have new names anyway.
+ * 14_pam_dialog.patch: dropped, upstream merged an improved version.
+ * 18_parametrize_create_display.patch: updated for the new version.
+ * 19_static_transient_display.patch: unfuzzed.
+ * 29_grep_path.patch: dropped, merged upstream.
* WORK IN PROGRESS. DO NOT UPLOAD.
-- Josselin Mouette <joss at debian.org> Thu, 24 Nov 2011 22:29:47 +0100
Modified: desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] Sat Dec 17 14:43:55 2011
@@ -1,26 +1,17 @@
-Index: gdm-3.0.0/daemon/gdm-simple-slave.c
+Index: gdm-3.2.1.1/daemon/gdm-simple-slave.c
===================================================================
---- gdm-3.0.0.orig/daemon/gdm-simple-slave.c 2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0/daemon/gdm-simple-slave.c 2011-04-28 19:40:31.221050273 +0200
-@@ -643,7 +643,7 @@ on_session_conversation_started (GdmSess
- } else {
- g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username);
- gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
-- "gdm-autologin",
-+ GDM_PAM_DOMAIN "-autologin",
- username);
- }
+--- gdm-3.2.1.1.orig/daemon/gdm-simple-slave.c 2011-12-17 03:58:58.000000000 +0100
++++ gdm-3.2.1.1/daemon/gdm-simple-slave.c 2011-12-17 14:52:37.177845880 +0100
+@@ -740,7 +740,7 @@ start_autologin_conversation_if_necessar
-@@ -952,7 +952,7 @@ on_greeter_begin_verification (GdmGreete
- {
- g_debug ("GdmSimpleSlave: begin verification");
- gdm_session_setup (GDM_SESSION (slave->priv->session),
-- "gdm");
-+ GDM_PAM_DOMAIN);
+ g_debug ("GdmSimpleSlave: Starting automatic login conversation");
+ gdm_session_start_conversation (GDM_SESSION (slave->priv->session),
+- "gdm-autologin");
++ GDM_PAM_DOMAIN "-autologin");
}
static void
-@@ -965,7 +965,7 @@ on_greeter_begin_auto_login (GdmGreeterS
+@@ -1067,7 +1067,7 @@ on_greeter_begin_auto_login (GdmGreeterS
return;
}
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
@@ -29,20 +20,11 @@
username);
}
-@@ -979,7 +979,7 @@ on_greeter_begin_verification_for_user (
- return;
- }
- gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
-- "gdm",
-+ GDM_PAM_DOMAIN,
- username);
- }
-
-Index: gdm-3.0.0/configure.ac
+Index: gdm-3.2.1.1/configure.ac
===================================================================
---- gdm-3.0.0.orig/configure.ac 2011-04-28 19:07:37.255400047 +0200
-+++ gdm-3.0.0/configure.ac 2011-04-28 19:40:31.225050291 +0200
-@@ -499,6 +499,21 @@ else
+--- gdm-3.2.1.1.orig/configure.ac 2011-12-17 03:49:29.000000000 +0100
++++ gdm-3.2.1.1/configure.ac 2011-12-17 14:51:10.101420180 +0100
+@@ -535,6 +535,21 @@ else
fi
AC_SUBST(PAM_PREFIX)
@@ -64,3 +46,14 @@
have_pam=no
AC_CHECK_LIB(pam, pam_start, have_pam=yes)
+Index: gdm-3.2.1.1/gui/simple-greeter/extensions/unified/Makefile.am
+===================================================================
+--- gdm-3.2.1.1.orig/gui/simple-greeter/extensions/unified/Makefile.am 2011-10-19 17:41:52.000000000 +0200
++++ gdm-3.2.1.1/gui/simple-greeter/extensions/unified/Makefile.am 2011-12-17 14:56:51.051087003 +0100
+@@ -1,5 +1,5 @@
+ NULL =
+-PAM_SERVICE_NAME = gdm
++PAM_SERVICE_NAME = $(GDM_PAM_DOMAIN)
+
+ extensiondir = $(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)/unified
+ extension_DATA = page.ui
Modified: desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch [utf-8] Sat Dec 17 14:43:55 2011
@@ -1,4 +1,4 @@
-From b21df58001691866b54ed4e0bf6d3d12ca6b4fa9 Mon Sep 17 00:00:00 2001
+Original patch: b21df58001691866b54ed4e0bf6d3d12ca6b4fa9
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 18 May 2011 01:49:22 -0400
Subject: [PATCH] daemon: parameterize create_display
@@ -13,15 +13,14 @@
supported, but that will change in a follow up commit.
https://bugzilla.gnome.org/show_bug.cgi?id=618047
----
- daemon/gdm-local-display-factory.c | 30 ++++++++++++++++--------------
- 1 files changed, 16 insertions(+), 14 deletions(-)
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.c
+Updated for changes in gdm 3.2.
+
+Index: gdm-3.2.1.1/daemon/gdm-local-display-factory.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c 2011-05-31 16:52:04.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.c 2011-06-14 23:56:58.034815831 +0200
-@@ -65,7 +65,8 @@ static void gdm_local_display_factor
+--- gdm-3.2.1.1.orig/daemon/gdm-local-display-factory.c 2011-10-19 17:41:52.000000000 +0200
++++ gdm-3.2.1.1/daemon/gdm-local-display-factory.c 2011-12-17 15:07:18.170152831 +0100
+@@ -64,7 +64,8 @@ static void gdm_local_display_factor
static void gdm_local_display_factory_init (GdmLocalDisplayFactory *factory);
static void gdm_local_display_factory_finalize (GObject *object);
@@ -31,7 +30,7 @@
static gpointer local_display_factory_object = NULL;
-@@ -276,9 +277,9 @@ gdm_local_display_factory_create_product
+@@ -275,9 +276,9 @@ gdm_local_display_factory_create_product
}
static void
@@ -44,7 +43,7 @@
{
int status;
GdmDisplayStore *store;
-@@ -301,7 +302,7 @@ on_static_display_status_changed (GdmDis
+@@ -300,7 +301,7 @@ on_static_display_status_changed (GdmDis
gdm_display_store_remove (store, display);
/* reset num failures */
factory->priv->num_failures = 0;
@@ -53,7 +52,7 @@
break;
case GDM_DISPLAY_FAILED:
/* leave the display number in factory->priv->displays
-@@ -314,7 +315,7 @@ on_static_display_status_changed (GdmDis
+@@ -313,7 +314,7 @@ on_static_display_status_changed (GdmDis
/* FIXME: should monitor hardware changes to
try again when seats change */
} else {
@@ -62,7 +61,7 @@
}
break;
case GDM_DISPLAY_UNMANAGED:
-@@ -330,18 +331,19 @@ on_static_display_status_changed (GdmDis
+@@ -329,25 +330,26 @@ on_static_display_status_changed (GdmDis
}
static GdmDisplay *
@@ -85,10 +84,9 @@
+ } else {
+ g_assert_not_reached ();
+ }
- if (display == NULL) {
- g_warning ("Unable to create display: %d", num);
- return NULL;
-@@ -352,7 +354,7 @@ create_display (GdmLocalDisplayFactory *
+
+ /* FIXME: don't hardcode seat1? */
+ g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL);
g_signal_connect (display,
"notify::status",
@@ -97,7 +95,7 @@
factory);
store_display (factory, num, display);
-@@ -379,7 +381,7 @@ gdm_local_display_factory_start (GdmDisp
+@@ -374,7 +376,7 @@ gdm_local_display_factory_start (GdmDisp
ret = TRUE;
/* FIXME: use seat configuration */
Modified: desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch [utf-8] Sat Dec 17 14:43:55 2011
@@ -20,11 +20,11 @@
daemon/gdm-local-display-factory.c | 43 +++++++++++++++++------------------
1 files changed, 21 insertions(+), 22 deletions(-)
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.c
+Index: gdm-3.2.1.1/daemon/gdm-local-display-factory.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c 2011-06-14 23:56:58.034815831 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.c 2011-06-15 00:00:16.903788372 +0200
-@@ -200,21 +200,7 @@ gdm_local_display_factory_create_transie
+--- gdm-3.2.1.1.orig/daemon/gdm-local-display-factory.c 2011-12-17 15:07:18.170152831 +0100
++++ gdm-3.2.1.1/daemon/gdm-local-display-factory.c 2011-12-17 15:08:40.678556203 +0100
+@@ -199,21 +199,7 @@ gdm_local_display_factory_create_transie
ret = FALSE;
@@ -47,7 +47,7 @@
if (! gdm_display_get_id (display, id, NULL)) {
display = NULL;
-@@ -223,9 +209,6 @@ gdm_local_display_factory_create_transie
+@@ -222,9 +208,6 @@ gdm_local_display_factory_create_transie
ret = TRUE;
out:
@@ -57,7 +57,7 @@
return ret;
}
-@@ -277,13 +260,22 @@ gdm_local_display_factory_create_product
+@@ -276,13 +259,22 @@ gdm_local_display_factory_create_product
}
static void
@@ -80,7 +80,7 @@
num = -1;
gdm_display_get_x11_display_number (display, &num, NULL);
-@@ -292,6 +284,8 @@ on_display_status_changed (GdmDisplay
+@@ -291,6 +283,8 @@ on_display_status_changed (GdmDisplay
store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
status = gdm_display_get_status (display);
@@ -89,7 +89,7 @@
g_debug ("GdmLocalDisplayFactory: static display status changed: %d", status);
switch (status) {
-@@ -302,7 +296,12 @@ on_display_status_changed (GdmDisplay
+@@ -301,7 +295,12 @@ on_display_status_changed (GdmDisplay
gdm_display_store_remove (store, display);
/* reset num failures */
factory->priv->num_failures = 0;
@@ -103,7 +103,7 @@
break;
case GDM_DISPLAY_FAILED:
/* leave the display number in factory->priv->displays
-@@ -315,7 +314,7 @@ on_display_status_changed (GdmDisplay
+@@ -314,7 +313,7 @@ on_display_status_changed (GdmDisplay
/* FIXME: should monitor hardware changes to
try again when seats change */
} else {
@@ -112,7 +112,7 @@
}
break;
case GDM_DISPLAY_UNMANAGED:
-@@ -341,8 +340,8 @@ create_display (GdmLocalDisplayFactory *
+@@ -340,8 +339,8 @@ create_display (GdmLocalDisplayFactory *
if (type == GDM_TYPE_STATIC_DISPLAY) {
display = gdm_static_display_new (num);
@@ -121,5 +121,5 @@
+ } else if (type == GDM_TYPE_TRANSIENT_DISPLAY) {
+ display = gdm_transient_display_new (num);
}
- if (display == NULL) {
- g_warning ("Unable to create display: %d", num);
+
+ /* FIXME: don't hardcode seat1? */
Modified: desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] Sat Dec 17 14:43:55 2011
@@ -1,4 +1,4 @@
-From 5ead1e4135c0ce28a8e17203d22eec4a540e5db3 Mon Sep 17 00:00:00 2001
+Original patch: 5ead1e4135c0ce28a8e17203d22eec4a540e5db3
From: Josselin Mouette <joss at malsain.org>
Date: Thu, 12 May 2011 16:36:39 -0400
Subject: [PATCH] daemon: clean up greeter when unused
@@ -22,17 +22,14 @@
Based on work by Josselin Mouette <joss at debian.org>
https://bugzilla.gnome.org/show_bug.cgi?id=618047
----
- configure.ac | 13 +++++++++++++
- daemon/gdm-server.c | 8 +++++++-
- daemon/gdm-simple-slave.c | 15 ++++++++++-----
- 3 files changed, 30 insertions(+), 6 deletions(-)
-Index: gdm-3.0.4/configure.ac
+Updated for gdm 3.2.
+
+Index: gdm-3.2.1.1/configure.ac
===================================================================
---- gdm-3.0.4.orig/configure.ac 2011-10-14 14:31:19.227463762 +0200
-+++ gdm-3.0.4/configure.ac 2011-10-14 14:31:29.011340763 +0200
-@@ -272,6 +272,11 @@
+--- gdm-3.2.1.1.orig/configure.ac 2011-12-17 14:59:44.000000000 +0100
++++ gdm-3.2.1.1/configure.ac 2011-12-17 15:15:46.560638226 +0100
+@@ -308,6 +308,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
AC_SUBST(AT_SPI_REGISTRYD_DIR)
@@ -44,7 +41,7 @@
# Allow configuration of default PATH
#
withval=""
-@@ -934,6 +939,14 @@
+@@ -970,6 +975,14 @@ AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$
AC_SUBST(WITH_CONSOLE_KIT)
dnl ---------------------------------------------------------------------------
@@ -59,37 +56,37 @@
dnl - Check for D-Bus
dnl ---------------------------------------------------------------------------
-Index: gdm-3.0.4/daemon/gdm-server.c
+Index: gdm-3.2.1.1/daemon/gdm-server.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-server.c 2011-10-14 14:31:06.839619499 +0200
-+++ gdm-3.0.4/daemon/gdm-server.c 2011-10-14 14:31:29.011340763 +0200
+--- gdm-3.2.1.1.orig/daemon/gdm-server.c 2011-12-17 03:27:51.000000000 +0100
++++ gdm-3.2.1.1/daemon/gdm-server.c 2011-12-17 15:17:31.601151747 +0100
@@ -55,6 +55,12 @@
extern char **environ;
+#ifdef WITH_VT_SWITCH_WORKAROUND
-+#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose"
++#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7"
+#else
-+#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -novtswitch"
++#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7 -novtswitch"
+#endif
+
#define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate))
/* These are the servstat values, also used as server
-@@ -1155,7 +1161,7 @@
+@@ -1141,7 +1147,7 @@ gdm_server_init (GdmServer *server)
server->priv = GDM_SERVER_GET_PRIVATE (server);
server->priv->pid = -1;
-- server->priv->command = g_strdup (X_SERVER " -br -verbose");
+- server->priv->command = g_strdup (X_SERVER " -br -verbose -logverbose 7");
+ server->priv->command = g_strdup (X_SERVER_COMMAND_LINE);
server->priv->log_dir = g_strdup (LOGDIR);
add_ready_handler (server);
-Index: gdm-3.0.4/daemon/gdm-simple-slave.c
+Index: gdm-3.2.1.1/daemon/gdm-simple-slave.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-simple-slave.c 2011-10-14 14:31:15.347512541 +0200
-+++ gdm-3.0.4/daemon/gdm-simple-slave.c 2011-10-14 14:31:29.015340712 +0200
-@@ -471,12 +471,17 @@
+--- gdm-3.2.1.1.orig/daemon/gdm-simple-slave.c 2011-12-17 14:52:37.000000000 +0100
++++ gdm-3.2.1.1/daemon/gdm-simple-slave.c 2011-12-17 15:19:17.717670531 +0100
+@@ -487,15 +487,21 @@ start_session_timeout (GdmSimpleSlave *s
if (migrated) {
destroy_session (slave);
@@ -105,10 +102,13 @@
+ * a blank VT or some confusing thing.
+ */
queue_greeter_reset (slave);
--
+
+ slave->priv->start_session_id = 0;
+ g_free (slave->priv->start_session_service_name);
+ slave->priv->start_session_service_name = NULL;
+#else
+ gdm_slave_stopped (GDM_SLAVE (slave));
+#endif
- goto out;
- }
-
+ } else {
+ if (slave->priv->greeter == NULL) {
+ /* auto login */
Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=32214&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sat Dec 17 14:43:55 2011
@@ -5,7 +5,6 @@
09_default_session.patch
10_gdm3_pam.patch
#11_xephyr_nested.patch
-14_pam_dialog.patch
16_xserver_path.patch
17_switch_on_finish.patch
18_parametrize_create_display.patch
@@ -13,7 +12,6 @@
20_switch_kill_greeter.patch
21_static_display_purge.patch
22_noconsole.patch
-29_grep_path.patch
90_config_comments.patch
91_dconf_override.patch
92_gsettings_path.patch
More information about the pkg-gnome-commits
mailing list