rpms/gdm/devel gdm-multistack.patch,NONE,1.1 gdm.spec,1.486,1.487
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 23 23:39:05 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22979
Modified Files:
gdm.spec
Added Files:
gdm-multistack.patch
Log Message:
fix patch
gdm-multistack.patch:
common/gdm-marshal.list | 1
configure.ac | 60
daemon/gdm-factory-slave.c | 108
daemon/gdm-greeter-server.c | 188 +
daemon/gdm-greeter-server.h | 24
daemon/gdm-product-slave.c | 308 +-
daemon/gdm-session-direct.c | 909 ++++--
daemon/gdm-session-private.h | 32
daemon/gdm-session-relay.c | 219 +
daemon/gdm-session-worker-job.c | 83
daemon/gdm-session-worker-job.h | 6
daemon/gdm-session-worker.c | 46
daemon/gdm-session.c | 243 +
daemon/gdm-session.h | 68
daemon/gdm-simple-slave.c | 217 +
daemon/test-session.c | 35
gui/simple-greeter/Makefile.am | 19
gui/simple-greeter/gdm-chooser-widget.c | 40
gui/simple-greeter/gdm-chooser-widget.h | 4
gui/simple-greeter/gdm-greeter-client.c | 225 +
gui/simple-greeter/gdm-greeter-client.h | 22
gui/simple-greeter/gdm-greeter-login-window.c | 950 +++++-
gui/simple-greeter/gdm-greeter-login-window.glade | 133
gui/simple-greeter/gdm-greeter-login-window.h | 32
gui/simple-greeter/gdm-greeter-plugin.c | 255 +
gui/simple-greeter/gdm-greeter-plugin.h | 61
gui/simple-greeter/gdm-greeter-session.c | 122
gui/simple-greeter/gdm-plugin-manager.c | 478 +++
gui/simple-greeter/gdm-plugin-manager.h | 66
gui/simple-greeter/gdm-task-list.c | 329 ++
gui/simple-greeter/gdm-task-list.h | 80
gui/simple-greeter/gdm-user-chooser-widget.c | 23
gui/simple-greeter/libgdmsimplegreeter/Makefile.am | 48
gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c | 186 +
gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h | 93
gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c | 93
gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h | 55
gui/simple-greeter/libgdmsimplegreeter/gdm-task.c | 123
gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 64
gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in | 11
gui/simple-greeter/plugins/Makefile.am | 1
gui/simple-greeter/plugins/fingerprint/Makefile.am | 56
gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 304 ++
gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h | 56
gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam | 17
gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am | 5
gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am | 5
gui/simple-greeter/plugins/fingerprint/icons/Makefile.am | 1
gui/simple-greeter/plugins/fingerprint/page.ui | 56
gui/simple-greeter/plugins/fingerprint/plugin.c | 40
gui/simple-greeter/plugins/password/Makefile.am | 53
gui/simple-greeter/plugins/password/gdm-password-extension.c | 323 ++
gui/simple-greeter/plugins/password/gdm-password-extension.h | 56
gui/simple-greeter/plugins/password/gdm-password.pam | 19
gui/simple-greeter/plugins/password/page.ui | 56
gui/simple-greeter/plugins/password/plugin.c | 40
gui/simple-greeter/plugins/smartcard/Makefile.am | 77
gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 440 +++
gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h | 56
gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c | 1394 ++++++++++
gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h | 86
gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c | 167 +
gui/simple-greeter/plugins/smartcard/gdm-smartcard.c | 558 ++++
gui/simple-greeter/plugins/smartcard/gdm-smartcard.h | 94
gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam | 18
gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am | 5
gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am | 5
gui/simple-greeter/plugins/smartcard/icons/Makefile.am | 1
gui/simple-greeter/plugins/smartcard/page.ui | 56
gui/simple-greeter/plugins/smartcard/plugin.c | 40
70 files changed, 9268 insertions(+), 876 deletions(-)
--- NEW FILE gdm-multistack.patch ---
diff -up gdm-2.28.0/common/gdm-marshal.list.multistack gdm-2.28.0/common/gdm-marshal.list
--- gdm-2.28.0/common/gdm-marshal.list.multistack 2009-09-21 16:05:27.000000000 -0400
+++ gdm-2.28.0/common/gdm-marshal.list 2009-09-23 18:46:06.861400723 -0400
@@ -5,3 +5,4 @@ VOID:STRING,STRING
VOID:UINT,UINT
VOID:STRING,INT
VOID:DOUBLE
+BOOLEAN:STRING
diff -up gdm-2.28.0/configure.ac.multistack gdm-2.28.0/configure.ac
--- gdm-2.28.0/configure.ac.multistack 2009-09-23 18:46:06.497641172 -0400
+++ gdm-2.28.0/configure.ac 2009-09-23 18:46:06.800400573 -0400
@@ -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 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
#FONTCONFIG_REQUIRED_VERSION=2.6.0
FONTCONFIG_REQUIRED_VERSION=2.5.0
+NSS_REQUIRED_VERSION=3.11.1
EXTRA_COMPILE_WARNINGS(yes)
@@ -75,6 +92,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
@@ -183,6 +206,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 ---------------------------------------------------------------------------
@@ -1242,6 +1274,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 ---------------------------------------------------------------------------
@@ -1368,6 +1416,18 @@ 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/fingerprint/icons/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile
+gui/simple-greeter/plugins/smartcard/Makefile
+gui/simple-greeter/plugins/smartcard/icons/Makefile
+gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile
+gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile
gui/simple-chooser/Makefile
gui/user-switch-applet/Makefile
utils/Makefile
diff -up gdm-2.28.0/daemon/gdm-factory-slave.c.multistack gdm-2.28.0/daemon/gdm-factory-slave.c
--- gdm-2.28.0/daemon/gdm-factory-slave.c.multistack 2009-09-21 16:05:27.000000000 -0400
+++ gdm-2.28.0/daemon/gdm-factory-slave.c 2009-09-23 18:46:06.673650996 -0400
@@ -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
-on_session_opened (GdmSession *session,
- GdmFactorySlave *slave)
+on_session_conversation_started (GdmSession *session,
+ const char *service_name,
+ GdmFactorySlave *slave)
{
- g_debug ("GdmFactorySlave: session opened");
+ g_debug ("GdmFactorySlave: session conversation started");
- gdm_greeter_server_ready (slave->priv->greeter_server);
+ gdm_greeter_server_ready (slave->priv->greeter_server,
+ service_name);
}
static void
on_session_setup_complete (GdmSession *session,
+ const char *service_name,
GdmFactorySlave *slave)
{
- gdm_session_authenticate (session);
+ gdm_session_authenticate (session, service_name);
}
static void
on_session_setup_failed (GdmSession *session,
+ const char *service_name,
const char *message,
GdmFactorySlave *slave)
{
- gdm_greeter_server_problem (slave->priv->greeter_server, _("Unable to initialize login system"));
+ gdm_greeter_server_problem (slave->priv->greeter_server, service_name, _("Unable to initialize login system"));
queue_greeter_reset (slave);
}
@@ -222,23 +230,26 @@ on_session_reset_failed (GdmSession
[...13800 lines suppressed...]
+EXTRA_DIST = $(icons_DATA)
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am
--- /dev/null 2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am 2009-09-23 18:46:06.821400871 -0400
@@ -0,0 +1,5 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = gdm-smartcard.png
+
+EXTRA_DIST = $(icons_DATA)
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/Makefile.am
--- /dev/null 2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/Makefile.am 2009-09-23 18:46:06.822408960 -0400
@@ -0,0 +1 @@
+SUBDIRS = 16x16 48x48
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/Makefile.am
--- /dev/null 2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-09-23 18:46:06.803405565 -0400
@@ -0,0 +1,77 @@
+SUBDIRS = icons
+
+NULL =
+PAM_SERVICE_NAME = gdm-smartcard
+
+extensiondir = $(extensionsdatadir)/smartcard
+extension_DATA = page.ui
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/common \
+ -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \
+ -I$(top_srcdir)/gui/simple-greeter/libgdmsimplegreeter \
+ -DDMCONFDIR=\""$(dmconfdir)"\" \
+ -DGDMCONFDIR=\"$(gdmconfdir)\" \
+ -DPLUGINDATADIR=\""$(extensiondir)"\" \
+ -DPAMSERVICENAME=\""$(pam_DATA)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DSBINDIR=\""$(sbindir)"\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(SIMPLE_GREETER_CFLAGS) \
+ $(POLKIT_GNOME_CFLAGS) \
+ $(NULL)
+
+plugindir = $(GDM_SIMPLE_GREETER_PLUGINS_DIR)
+plugin_LTLIBRARIES = smartcard.la
+
+smartcard_la_CFLAGS = \
+ $(SIMPLE_GREETER_CFLAGS) \
+ $(NULL)
+
+libexec_PROGRAMS = \
+ gdm-smartcard-worker \
+ $(NULL)
+
+
+smartcard_la_LDFLAGS = -module -avoid-version -export-dynamic
+smartcard_la_LIBADD = ../../../../common/libgdmcommon.la \
+ ../../libgdmsimplegreeter/libgdmsimplegreeter.la
+smartcard_la_SOURCES = \
+ gdm-smartcard-extension.h \
+ gdm-smartcard-extension.c \
+ plugin.c
+
+gdm_smartcard_worker_LDADD = ../../../../common/libgdmcommon.la \
+ $(DAEMON_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(NSS_LIBS) \
+ $(NULL)
+gdm_smartcard_worker_CFLAGS = $(DAEMON_CFLAGS) \
+ $(NSS_CFLAGS) \
+ $(NULL)
+gdm_smartcard_worker_SOURCES = \
+ gdm-smartcard.h \
+ gdm-smartcard.c \
+ gdm-smartcard-manager.h \
+ gdm-smartcard-manager.c \
+ gdm-smartcard-worker.c \
+ $(NULL)
+
+$(PAM_SERVICE_NAME): $(PAM_SERVICE_NAME).pam
+ cp $(PAM_SERVICE_NAME).pam $(PAM_SERVICE_NAME)
+
+pamdir = $(PAM_PREFIX)/pam.d
+pam_DATA = $(PAM_SERVICE_NAME)
+
+EXTRA_DIST = $(extension_DATA) $(PAM_SERVICE_NAME).pam
+CLEANFILES = $(PAM_SERVICE_NAME)
+
+MAINTAINERCLEANFILES = \
+ *~ \
+ $(PAM_SERVICE_NAME) \
+ Makefile.in
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui
--- /dev/null 2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui 2009-09-23 18:46:06.823391278 -0400
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <object class="GtkVBox" id="page">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="auth-input-box">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="auth-prompt-label">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="auth-prompt-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="auth-message-box">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="auth-message-label">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c
--- /dev/null 2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c 2009-09-23 18:46:06.825390205 -0400
@@ -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>
+ *
+ */
+
+#include "gdm-smartcard-extension.h"
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+GdmGreeterExtension *
+gdm_greeter_plugin_get_extension (void)
+{
+ static GObject *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);
+ }
+
+ return GDM_GREETER_EXTENSION (extension);
+}
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- gdm.spec 23 Sep 2009 22:34:44 -0000 1.486
+++ gdm.spec 23 Sep 2009 23:39:05 -0000 1.487
@@ -98,7 +98,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
# should probably be changed to get the system layout from the X server
Patch13: gdm-system-keyboard.patch
-Patch19: gdm-2.27.4-multistack.patch
+Patch19: gdm-multistack.patch
# Fedora-specific
Patch99: gdm-2.23.1-fedora-logo.patch
More information about the fedora-extras-commits
mailing list