pool/gdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 73903 from home:vuntz:branches:GNOME:Factory

Browse Source 
Update to 3.1.2

OBS-URL: https://build.opensuse.org/request/show/73903
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=163
This commit is contained in:
Dominique Leuenberger 2011-06-17 07:02:57 +00:00 committed by Git OBS Bridge
parent 7280a703b0
commit 8c2f11b142
10 changed files with 134 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-3.0.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60c45428ee6d4cc67c0a780a333fac621a923a6f744507e52bf409947a533087
size 2268295

3
gdm-3.1.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c591d2e9cf8cde0c5d92b82adcd0d0a176a6141b8c337c09126ac8572bfa87f1
size 2351352

4
gdm-desktop-session-env-pam.patch
View File

@ -80,8 +80,8 @@ Index: gdm-2.91.6/daemon/gdm-session-direct.c
+static const char *get_session_name (GdmSessionDirect *session);
+
static gboolean
send_dbus_message (DBusConnection *connection,
DBusMessage *message)
send_dbus_message (GdmSessionConversation *conversation,
DBusMessage *message)
@@ -707,10 +709,14 @@ get_default_session_name (GdmSessionDire
static void
gdm_session_direct_defaults_changed (GdmSessionDirect *session)

80
gdm-passwordless-login.patch
View File

@ -1,7 +1,7 @@
Index: gdm-2.91.93/common/gdm-settings-system-backend.c
Index: gdm-3.1.2/common/gdm-settings-system-backend.c
===================================================================
--- gdm-2.91.93.orig/common/gdm-settings-system-backend.c
+++ gdm-2.91.93/common/gdm-settings-system-backend.c
--- gdm-3.1.2.orig/common/gdm-settings-system-backend.c
+++ gdm-3.1.2/common/gdm-settings-system-backend.c
@@ -44,11 +44,11 @@
#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN"
#define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"
@ -78,10 +78,10 @@ Index: gdm-2.91.93/common/gdm-settings-system-backend.c
} else {
g_set_error (error, GDM_SETTINGS_BACKEND_ERROR, GDM_SETTINGS_BACKEND_ERROR_KEY_NOT_FOUND, "Key not found");
return FALSE;
Index: gdm-2.91.93/common/gdm-settings-keys.h
Index: gdm-3.1.2/common/gdm-settings-keys.h
===================================================================
--- gdm-2.91.93.orig/common/gdm-settings-keys.h
+++ gdm-2.91.93/common/gdm-settings-keys.h
--- gdm-3.1.2.orig/common/gdm-settings-keys.h
+++ gdm-3.1.2/common/gdm-settings-keys.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
@ -90,10 +90,10 @@ Index: gdm-2.91.93/common/gdm-settings-keys.h
#define GDM_KEY_DEBUG "debug/Enable"
Index: gdm-2.91.93/data/gdm.schemas.in.in
Index: gdm-3.1.2/data/gdm.schemas.in.in
===================================================================
--- gdm-2.91.93.orig/data/gdm.schemas.in.in
+++ gdm-2.91.93/data/gdm.schemas.in.in
--- gdm-3.1.2.orig/data/gdm.schemas.in.in
+++ gdm-3.1.2/data/gdm.schemas.in.in
@@ -47,6 +47,12 @@
<signature>i</signature>
<default>30</default>
@ -107,56 +107,40 @@ Index: gdm-2.91.93/data/gdm.schemas.in.in
<schema>
<key>debug/Enable</key>
Index: gdm-2.91.93/daemon/gdm-factory-slave.c
Index: gdm-3.1.2/daemon/gdm-greeter-server.c
===================================================================
--- gdm-2.91.93.orig/daemon/gdm-factory-slave.c
+++ gdm-2.91.93/daemon/gdm-factory-slave.c
@@ -44,6 +44,9 @@
--- gdm-3.1.2.orig/daemon/gdm-greeter-server.c
+++ gdm-3.1.2/daemon/gdm-greeter-server.c
@@ -46,6 +46,9 @@
#include "gdm-common.h"
#include "gdm-greeter-server.h"
+#include "gdm-settings-client.h"
+#include "gdm-settings-keys.h"
+
#include "gdm-factory-slave.h"
#include "gdm-factory-slave-glue.h"
#define GDM_GREETER_SERVER_DBUS_PATH "/org/gnome/DisplayManager/GreeterServer"
#define GDM_GREETER_SERVER_DBUS_INTERFACE "org.gnome.DisplayManager.GreeterServer"
@@ -478,6 +481,7 @@ handle_begin_verification_for_user (GdmG
DBusError error;
const char *text;
const char *service_name;
+ gboolean passwordless;
dbus_error_init (&error);
if (! dbus_message_get_args (message, &error,
@@ -488,6 +492,14 @@ handle_begin_verification_for_user (GdmG
}
dbus_error_free (&error);
@@ -406,9 +409,16 @@ on_greeter_begin_verification_for_user (
const char *username,
GdmFactorySlave *slave)
{
+ gboolean passwordless;
+
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
+ &passwordless)) {
+ passwordless = FALSE;
+ }
+
g_debug ("GdmFactorySlave: begin verification for user");
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
- "gdm",
+ passwordless ? "gdm-autologin" : "gdm",
username);
}
Index: gdm-2.91.93/daemon/gdm-simple-slave.c
===================================================================
--- gdm-2.91.93.orig/daemon/gdm-simple-slave.c
+++ gdm-2.91.93/daemon/gdm-simple-slave.c
@@ -952,9 +952,15 @@ static void
on_greeter_begin_verification (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
+ gboolean passwordless;
+ if (passwordless)
+ service_name = "gdm-autologin";
+
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
+ &passwordless)) {
+ passwordless = FALSE;
+ }
g_debug ("GdmSimpleSlave: begin verification");
gdm_session_setup (GDM_SESSION (slave->priv->session),
- "gdm");
+ passwordless ? "gdm-autologin" : "gdm");
}
g_debug ("GreeterServer: BeginVerificationForUser for '%s'", text);
static void
reply = dbus_message_new_method_return (message);

2
gdm-plymouth.patch
View File

@ -473,7 +473,7 @@ Index: gdm-2.91.94/configure.ac
--- gdm-2.91.94.orig/configure.ac
+++ gdm-2.91.94/configure.ac
@@ -1271,6 +1271,23 @@ AC_SUBST(GDM_SCREENSHOT_DIR)
AC_SUBST(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)
dnl ---------------------------------------------------------------------------
+dnl - Directory to spool events from other processes

34
gdm-selecting-desktop-environment.patch
View File

@ -1,34 +0,0 @@
Index: gdm-2.91.93/daemon/gdm-session-worker.c
===================================================================
--- gdm-2.91.93.orig/daemon/gdm-session-worker.c
+++ gdm-2.91.93/daemon/gdm-session-worker.c
@@ -153,6 +153,8 @@ typedef int (* GdmSessionWorkerPamNewMes
const struct pam_message **,
struct pam_response **,
gpointer);
+static void on_saved_session_name_read (GdmSessionWorker *worker);
+static void on_saved_language_name_read (GdmSessionWorker *worker);
G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT)
@@ -595,6 +597,20 @@ attempt_to_load_user_settings (GdmSessio
g_debug ("GdmSessionWorker: attempting to load user settings");
gdm_session_settings_load (worker->priv->user_settings,
username);
+
+
+ /* These singal handlers should be disconnected after the loading,
+ * so that gdm_session_settings_set_* APIs don't cause the emitting
+ * of Saved*NameRead D-Bus signals any more.
+ */
+ g_signal_handlers_disconnect_by_func (worker->priv->user_settings,
+ G_CALLBACK (on_saved_session_name_read),
+ worker);
+
+ g_signal_handlers_disconnect_by_func (worker->priv->user_settings,
+ G_CALLBACK (on_saved_language_name_read),
+ worker);
+
}
static void

7
gdm-sysconfig-settings.patch
View File

@ -24,7 +24,7 @@ Index: gdm-2.32.0/common/gdm-settings-system-backend.c
===================================================================
--- /dev/null
+++ gdm-2.32.0/common/gdm-settings-system-backend.c
@@ -0,0 +1,349 @@
@@ -0,0 +1,348 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Hans Petter Jansson <hpj@copyleft.no>
@ -65,7 +65,6 @@ Index: gdm-2.32.0/common/gdm-settings-system-backend.c
+#include "gdm-settings-keys.h"
+#include "gdm-settings-system-backend.h"
+
+#include "gdm-marshal.h"
+#include "gdm-log.h"
+
+#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN"
@ -445,8 +444,8 @@ Index: gdm-2.32.0/common/gdm-settings.c
#include "gdm-settings-desktop-backend.h"
+#include "gdm-settings-system-backend.h"
#include "gdm-marshal.h"
#define GDM_DBUS_PATH "/org/gnome/DisplayManager"
#define GDM_SETTINGS_DBUS_PATH GDM_DBUS_PATH "/Settings"
@@ -53,7 +54,7 @@
struct GdmSettingsPrivate
{

2
gdm-xauthlocalhostname.patch
View File

@ -72,5 +72,5 @@ Index: daemon/gdm-welcome-session.c
+ }
+
g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH")));
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));

34
gdm.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Jun 15 10:16:44 CEST 2011 - vuntz@opensuse.org
- Update to version 3.1.2:
+ GTK size negotiation fixes
+ Do not propagate WINDOWPATH if its unset to begin with
+ Audit fixes
+ Break cycle between greeter and slave for session notification
+ Screenshots in docs!
+ Don't hardcode path to grep
+ Fix introspection xml
+ Allow .xsession-errors to be a symlink or FIFO
+ PAM fixes
+ Dconf fixes
+ Land multi-stack
+ Updated translations.
- Add pkgconfig(nss) BuildRequires since nss is now required.
- Drop gdm-selecting-desktop-environment.patch: fixed upstream,
another way.
- Rebase the following patches in a trivial way:
+ gdm-desktop-session-env-pam.patch
+ gdm-plymouth.patch
+ gdm-sysconfig-settings.patch
+ gdm-xauthlocalhostname.patch
- Rebase and optimize gdm-passwordless-login.patch thanks to code
changes.
- Update descriptions of packages, based on text from README.
- Add libgdmsimplegreeter1 and libgdmsimplegreeter-devel
subpackages for new library used to write greeter plugins.
- Pass --disable-static to configure and remove .la files.
- Create the directory where greeter plugins are put, if it doesn't
already exist, so we can package it.
- Fix permissions of /var/lib/gdm/.local directory in file list.
-------------------------------------------------------------------
Tue May 31 16:33:44 UTC 2011 - fcrozat@novell.com

72
gdm.spec
View File

@ -21,7 +21,7 @@
Name: gdm
License: GPLv2+
Group: System/GUI/GNOME
Version: 3.0.4
Version: 3.1.2
Release: 1
Summary: The GNOME Display Manager
Url: http://www.gnome.org/
@ -52,8 +52,6 @@ Patch10: gdm-domain-logon.patch
Patch15: gdm-greeter-greater-ui.patch
# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
Patch18: gdm-always-reflect-keyboard-layout.patch
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
Patch20: gdm-selecting-desktop-environment.patch
# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE
Patch31: gdm-gconf-path.patch
# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default
@ -88,6 +86,7 @@ BuildRequires: update-desktop-files
BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(nss)
Requires: %{name}-branding
Requires: ConsoleKit-x11
Requires: gnome-session-core
@ -109,10 +108,28 @@ DocDir: %{_defaultdocdir}
%gconf_schemas_prereq
%description
This version of GDM, the GNOME display manager, is based on GTK2 and is
suited for the GNOME Desktop. GDM is a flexible X Window System
display manager that has many options, is usable for remote login, and
provides a good looking graphical interface.
The GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.
%package -n libgdmsimplegreeter1
License: GPLv2+
Summary: Library for GDM Simple Greeter Plugins
Group: System/Libraries
Recommends: gdm
%description -n libgdmsimplegreeter1
The GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.
%package -n libgdmsimplegreeter-devel
License: GPLv2+
Summary: Library for GDM Simple Greeter Plugins -- Development Files
Group: Development/Libraries/GNOME
Requires: libgdmsimplegreeter1 = %{version}
%description -n libgdmsimplegreeter-devel
The GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.
%package branding-upstream
License: GPLv2+
@ -127,10 +144,8 @@ Supplements: packageand(%{name}:branding-upstream)
#NOTE: We may want to create gdm-themes with upstream themes.
%description branding-upstream
This version of GDM, the GNOME display manager, is based on GTK2 and is
suited for the GNOME Desktop. GDM is a flexible X Window System
display manager that has many options, is usable for remote login, and
provides a good looking graphical interface.
The GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.
%lang_package
%prep
@ -151,7 +166,6 @@ translation-update-upstream
# needs rebase (bnc#689552)
##%patch15 -p1
%patch18 -p1
%patch20 -p1
%patch31 -p1
%patch34 -p1
%patch35 -p0
@ -163,6 +177,7 @@ translation-update-upstream
libtoolize -f -i
autoreconf -f -i
%configure\
--disable-static \
--libexecdir=%{_prefix}/lib/gdm \
--localstatedir=%{_localstatedir} \
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
@ -175,11 +190,15 @@ autoreconf -f -i
%__make %{?jobs:-j%jobs} V=1
%install
%makeinstall
%make_install
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%find_gconf_schemas
# Create extensions directory if it's not there yet, so we can package it
test ! -d %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
# Install PAM files.
@ -237,6 +256,10 @@ fi
%insserv_cleanup
%icon_theme_cache_postun
%post -n libgdmsimplegreeter1 -p /sbin/ldconfig
%postun -n libgdmsimplegreeter1 -p /sbin/ldconfig
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
@ -263,13 +286,34 @@ fi
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share/applications
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local/share/applications/mime-dummy-handler.desktop
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local/share/applications/mimeapps.list
%dir %{_localstatedir}/cache/gdm
%config /etc/pam.d/*
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
%{_sysconfdir}/dconf/db/gdm
%{_sysconfdir}/dconf/profile/gdm
%files -n libgdmsimplegreeter1
%defattr(-,root,root)
%{_libdir}/libgdmsimplegreeter.so.*
# Own directory where extensions are put
%dir %{_datadir}/gdm
%dir %{_datadir}/gdm/simple-greeter
%dir %{_datadir}/gdm/simple-greeter/extensions
%dir %{_libdir}/gdm
%dir %{_libdir}/gdm/simple-greeter
%dir %{_libdir}/gdm/simple-greeter/extensions
%files -n libgdmsimplegreeter-devel
%defattr(-,root,root)
%{_includedir}/gdm/
%{_libdir}/libgdmsimplegreeter.so
%{_libdir}/pkgconfig/gdmsimplegreeter.pc
%files branding-upstream
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/gdm/custom.conf