rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch,1.1,1.2
Ray Strode
rstrode at fedoraproject.org
Tue Mar 3 23:05:34 UTC 2009
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24917
Modified Files:
gdm-2.25.2-multistack-but-boring.patch
Log Message:
Regen patch to get rid of fuzz
gdm-2.25.2-multistack-but-boring.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 gdm-2.25.2-multistack-but-boring.patch
Index: gdm-2.25.2-multistack-but-boring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.25.2-multistack-but-boring.patch 3 Mar 2009 22:46:51 -0000 1.1
+++ gdm-2.25.2-multistack-but-boring.patch 3 Mar 2009 23:05:34 -0000 1.2
@@ -1,1115 +1,716 @@
-From 0b295480d3f0955d7133c39c0c4b2ec3bd2f3084 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 01/65] Drop session "Open" in favor of "StartConversation"
-
-We want to eventually support having multiple
-simultaneous PAM conversations in one login
-screen (so, e.g., username/password, smart card, and
-fingerprint all work at the same time).
-
-This commit refactors the session code to be in terms
-of a conversation object. With this change, it should
-be easier later to have multiple conversation objects.
-
-The conversation is named by the pam service the login
-screen is talking to.
----
- daemon/gdm-factory-slave.c | 13 +-
- daemon/gdm-product-slave.c | 47 ++++++---
- daemon/gdm-session-direct.c | 250 ++++++++++++++++++++++++++----------------
- daemon/gdm-session-private.h | 3 +-
- daemon/gdm-session-relay.c | 29 +++--
- daemon/gdm-session.c | 20 ++--
- daemon/gdm-session.h | 9 +-
- daemon/gdm-simple-slave.c | 3 -
- daemon/test-session.c | 13 +-
- 9 files changed, 240 insertions(+), 147 deletions(-)
-
-diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
-index d09c913..6497293 100644
---- a/daemon/gdm-factory-slave.c
-+++ b/daemon/gdm-factory-slave.c
-@@ -180,10 +180,11 @@ on_session_secret_info_query (GdmSession *session,
+diff -up gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring gdm-2.25.2/common/gdm-marshal.list
+--- gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400
++++ gdm-2.25.2/common/gdm-marshal.list 2009-03-03 17:45:05.814016242 -0500
+@@ -5,3 +5,4 @@ VOID:STRING,STRING
+ VOID:UINT,UINT
+ VOID:STRING,INT
+ VOID:DOUBLE
++BOOLEAN:STRING
+diff -up gdm-2.25.2/configure.ac.multistack-but-boring gdm-2.25.2/configure.ac
+--- gdm-2.25.2/configure.ac.multistack-but-boring 2009-03-03 17:45:05.512009633 -0500
++++ gdm-2.25.2/configure.ac 2009-03-03 17:45:05.748016423 -0500
+@@ -18,6 +18,22 @@ AC_PROG_CXX
+ AM_PROG_CC_C_O
+ AC_PROG_LIBTOOL()
+
++## increment if the plugin interface has additions, changes, removals.
++LT_CURRENT=1
++
++## increment any time the source changes; set to
++## 0 if you increment CURRENT
++LT_REVISION=0
++
++## increment if any interfaces have been added; set to 0
++## if any interfaces have been changed or removed. removal has
++## precedence over adding, so set to 0 if both happened.
++LT_AGE=0
++
++AC_SUBST(LT_CURRENT)
++AC_SUBST(LT_REVISION)
++AC_SUBST(LT_AGE)
++
+ AC_HEADER_STDC
+
+ AC_SUBST(VERSION)
+@@ -51,6 +67,7 @@ GNOME_PANEL_REQUIRED_VERSION=2.0.0
+ LIBXKLAVIER_REQUIRED_VERSION=3.5
+ #FONTCONFIG_REQUIRED_VERSION=2.6.0
+ FONTCONFIG_REQUIRED_VERSION=2.5.0
++NSS_REQUIRED_VERSION=3.11.1
+
+ EXTRA_COMPILE_WARNINGS(yes)
+
+@@ -74,6 +91,12 @@ PKG_CHECK_MODULES(DAEMON,
+ AC_SUBST(DAEMON_CFLAGS)
+ AC_SUBST(DAEMON_LIBS)
+
++PKG_CHECK_MODULES(NSS,
++ nss >= $NSS_REQUIRED_VERSION
++)
++AC_SUBST(NSS_CFLAGS)
++AC_SUBST(NSS_LIBS)
++
+ PKG_CHECK_MODULES(XLIB, x11 xau, ,
+ [AC_PATH_XTRA
+ if test "x$no_x" = xyes; then
+@@ -200,6 +223,15 @@ AC_ARG_WITH(dmconfdir,
+ AC_SUBST(dmconfdir)
+
+ dnl ---------------------------------------------------------------------------
++dnl - Configuration file stuff
++dnl ---------------------------------------------------------------------------
++AC_ARG_WITH(extensionsdatadir,
++ AS_HELP_STRING([--with-extensions-datadir],
++ [directory where extensions store data, default=DATADIR/gdm/simple-greeter/extensions]),
++ extensionsdatadir=${withval}, extensionsdatadir=${datadir}/gdm/simple-greeter/extensions)
++AC_SUBST(extensionsdatadir)
++
++dnl ---------------------------------------------------------------------------
+ dnl - Configure arguments
+ dnl ---------------------------------------------------------------------------
+
+@@ -1292,6 +1324,22 @@ AC_SUBST(GDM_SPOOL_DIR)
+
+
+ dnl ---------------------------------------------------------------------------
++dnl - Directory for simple greeter plugins
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(simple-greeter-plugins-dir,
++ AS_HELP_STRING([--with-simple-greeter-plugins-dir=<dir>],
++ [simple greeter plugins directory]))
++
++if ! test -z "$with_simple_greeter_plugins_dir"; then
++ GDM_SIMPLE_GREETER_PLUGINS_DIR=$with_simple_greeter_plugins_dir
++else
++ GDM_SIMPLE_GREETER_PLUGINS_DIR=${libdir}/gdm/simple-greeter/plugins
++fi
++
++AC_SUBST(GDM_SIMPLE_GREETER_PLUGINS_DIR)
++
++dnl ---------------------------------------------------------------------------
+ dnl - Finish
+ dnl ---------------------------------------------------------------------------
+
+@@ -1420,6 +1468,12 @@ docs/Makefile
+ gui/Makefile
+ gui/simple-greeter/Makefile
+ gui/simple-greeter/libnotificationarea/Makefile
++gui/simple-greeter/libgdmsimplegreeter/Makefile
++gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc
++gui/simple-greeter/plugins/Makefile
++gui/simple-greeter/plugins/password/Makefile
++gui/simple-greeter/plugins/fingerprint/Makefile
++gui/simple-greeter/plugins/smartcard/Makefile
+ gui/simple-chooser/Makefile
+ gui/user-switch-applet/Makefile
+ utils/Makefile
+diff -up gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-factory-slave.c
+--- gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400
++++ gdm-2.25.2/daemon/gdm-factory-slave.c 2009-03-03 17:45:05.618017661 -0500
+@@ -144,63 +144,71 @@ on_greeter_session_died (GdmGreeterSessi
+
+ static void
+ on_session_info (GdmSession *session,
++ const char *service_name,
+ const char *text,
+ GdmFactorySlave *slave)
+ {
+ g_debug ("GdmFactorySlave: Info: %s", text);
+- gdm_greeter_server_info (slave->priv->greeter_server, text);
++ gdm_greeter_server_info (slave->priv->greeter_server, service_name, text);
+ }
+
+ static void
+ on_session_problem (GdmSession *session,
++ const char *service_name,
+ const char *text,
+ GdmFactorySlave *slave)
+ {
+ g_debug ("GdmFactorySlave: Problem: %s", text);
+- gdm_greeter_server_problem (slave->priv->greeter_server, text);
++ gdm_greeter_server_problem (slave->priv->greeter_server, service_name, text);
+ }
+
+ static void
+ on_session_info_query (GdmSession *session,
++ const char *service_name,
+ const char *text,
+ GdmFactorySlave *slave)
+ {
+
+ g_debug ("GdmFactorySlave: Info query: %s", text);
+- gdm_greeter_server_info_query (slave->priv->greeter_server, text);
++ gdm_greeter_server_info_query (slave->priv->greeter_server, service_name, text);
+ }
+
+ static void
+ on_session_secret_info_query (GdmSession *session,
++ const char *service_name,
+ const char *text,
+ GdmFactorySlave *slave)
+ {
+ g_debug ("GdmFactorySlave: Secret info query: %s", text);
+- gdm_greeter_server_secret_info_query (slave->priv->greeter_server, text);
++ gdm_greeter_server_secret_info_query (slave->priv->greeter_server, service_name, text);
}
static void
[...28371 lines suppressed...]
++ </object>
++</interface>
+diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c
+--- /dev/null 2009-03-03 12:39:28.547009636 -0500
++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-03 17:45:05.728011655 -0500
+@@ -0,0 +1,40 @@
++/*
++ * Copyright (C) 2009 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * Written By: Ray Strode <rstrode at redhat.com>
++ *
++ */
+
-+gboolean
- gdm_conversation_choose_user (GdmConversation *conversation,
- const char *username)
- {
-- g_signal_emit (conversation, signals [USER_CHOSEN], 0, username);
-+ gboolean was_chosen;
++#include "gdm-smartcard-extension.h"
+
-+ was_chosen = FALSE;
++#include <gio/gio.h>
++#include <gtk/gtk.h>
+
-+ g_signal_emit (conversation, signals [USER_CHOSEN], 0, username, &was_chosen);
++GdmGreeterExtension *
++gdm_greeter_plugin_get_extension (void)
++{
++ static GObject *extension;
+
-+ return was_chosen;
- }
-diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
-index fb4bf49..b37b21e 100644
---- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
-+++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
-@@ -61,7 +61,7 @@ struct _GdmConversationIface
- /* signals */
- char * (* answer) (GdmConversation *conversation);
- void (* cancel) (GdmConversation *conversation);
-- void (* user_chosen) (GdmConversation *conversation);
-+ gboolean (* user_chosen) (GdmConversation *conversation);
- };
-
- GType gdm_conversation_get_type (void) G_GNUC_CONST;
-@@ -85,8 +85,8 @@ gboolean gdm_conversation_focus (GdmConversation *conversation);
- void gdm_conversation_answer (GdmConversation *conversation,
- const char *answer);
- void gdm_conversation_cancel (GdmConversation *conversation);
--void gdm_conversation_choose_user (GdmConversation *conversation,
-- const char *username);
-+gboolean gdm_conversation_choose_user (GdmConversation *conversation,
-+ const char *username);
-
- G_END_DECLS
-
-diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-index 8e87db6..5a2c380 100644
---- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-+++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-@@ -53,6 +53,7 @@ struct _GdmSmartcardExtensionPrivate
- int number_of_tokens;
-
- guint answer_pending : 1;
-+ guint select_when_ready : 1;
- };
-
- static void gdm_smartcard_extension_finalize (GObject *object);
-@@ -102,8 +103,14 @@ on_smartcard_event (GIOChannel *io_channel,
- }
-
- if (extension->priv->number_of_tokens == 1) {
-- gdm_conversation_choose_user (GDM_CONVERSATION (extension),
-- PAMSERVICENAME);
-+ if (!gdm_conversation_choose_user (GDM_CONVERSATION (extension),
-+ PAMSERVICENAME)) {
-+ g_debug ("could not choose smart card user, cancelling...");
-+ gdm_conversation_cancel (GDM_CONVERSATION (extension));
-+ extension->priv->select_when_ready = TRUE;
-+ } else {
-+ g_debug ("chose smart card user!");
-+ }
- } else if (extension->priv->number_of_tokens == 0) {
- gdm_conversation_cancel (GDM_CONVERSATION (extension));
- }
-@@ -210,10 +217,16 @@ gdm_smartcard_extension_set_ready (GdmConversation *conversation)
- GdmSmartcardExtension *extension = GDM_SMARTCARD_EXTENSION (conversation);
- gdm_task_set_enabled (GDM_TASK (conversation), TRUE);
-
-- if (extension->priv->worker_pid <= 0)
-- {
-+ if (extension->priv->worker_pid <= 0) {
- watch_for_smartcards (extension);
-- }
++ if (extension != NULL) {
++ g_object_ref (extension);
++ } else {
++ extension = g_object_new (GDM_TYPE_SMARTCARD_EXTENSION, NULL);
++ g_object_add_weak_pointer (extension, (gpointer *) &extension);
+ }
+
-+ if (extension->priv->select_when_ready) {
-+ if (gdm_conversation_choose_user (GDM_CONVERSATION (extension),
-+ PAMSERVICENAME)) {
-+ extension->priv->select_when_ready = FALSE;
-+ }
-+ }
- }
-
- char *
---
-1.6.1
-
-
-From cdb57fbb1366ca4fe7314850d223cd0a79240fd9 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Tue, 3 Mar 2009 13:33:09 -0500
-Subject: [PATCH 64/65] Don't build fingerprint and smartcard plugins
-
-I'm staging a degenerate single stack case
-for rawhide.
----
- gui/simple-greeter/plugins/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gui/simple-greeter/plugins/Makefile.am b/gui/simple-greeter/plugins/Makefile.am
-index 3dd336f..c0390db 100644
---- a/gui/simple-greeter/plugins/Makefile.am
-+++ b/gui/simple-greeter/plugins/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = password fingerprint smartcard
-+SUBDIRS = password
---
-1.6.1
-
-
-From 48c2237ff7efe68e116363ce51e0a4cdc42a5c78 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Tue, 3 Mar 2009 17:15:10 -0500
-Subject: [PATCH 65/65] Use "gdm" instead of "gdm-password"
-
-This is so we hook into system configured auth policy
----
- gui/simple-greeter/plugins/password/Makefile.am | 9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/gui/simple-greeter/plugins/password/Makefile.am b/gui/simple-greeter/plugins/password/Makefile.am
-index e832c4d..097b18e 100644
---- a/gui/simple-greeter/plugins/password/Makefile.am
-+++ b/gui/simple-greeter/plugins/password/Makefile.am
-@@ -3,8 +3,6 @@ NULL =
- extensiondir = $(extensionsdatadir)/password
- extension_DATA = page.ui
-
--pamservicename = gdm-password
--
- AM_CPPFLAGS = \
- -I$(top_srcdir)/common \
- -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \
-@@ -12,7 +10,7 @@ AM_CPPFLAGS = \
- -DDMCONFDIR=\""$(dmconfdir)"\" \
- -DGDMCONFDIR=\"$(gdmconfdir)\" \
- -DPLUGINDATADIR=\""$(extensiondir)"\" \
-- -DPAMSERVICENAME=\""$(pamservicename)"\" \
-+ -DPAMSERVICENAME=\""gdm"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-@@ -39,10 +37,7 @@ password_la_SOURCES = \
- gdm-password-extension.c \
- plugin.c
-
--pamdir = $(PAM_PREFIX)/pam.d
--pam_DATA = $(pamservicename)
--
--EXTRA_DIST = $(extension_DATA) $(pam_DATA)
-+EXTRA_DIST = $(extension_DATA)
-
- MAINTAINERCLEANFILES = \
- *~ \
---
-1.6.1
-
++ return GDM_GREETER_EXTENSION (extension);
++}
More information about the fedora-extras-commits
mailing list