rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 291504 from GNOME:Next

Browse Source 
Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/291504
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=286
This commit is contained in:
Dominique Leuenberger 2015-03-19 14:34:54 +00:00 committed by Git OBS Bridge
parent 6522308580
commit 67a77691a0
7 changed files with 146 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-3.14.1.tar.xz
View File

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

3
gdm-3.15.91.2.tar.xz Normal file
View File

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

39
gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch
View File

@ -1,39 +0,0 @@
From 1721403c8c16c62c1c814d5bbf7a01714680a3fd Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <maxime.deroucy@gmail.com>
Date: Sat, 24 Jan 2015 15:12:16 +0100
Subject: [PATCH] correct ShowLocalGreeter (standalone XDMCP server)
Get the ShowLocalGreeter option from configuration file BEFORE launching
the gdm manager. In order to let the manager know if it have to launch a
local X server or not.
https://bugzilla.gnome.org/show_bug.cgi?id=743440
---
daemon/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/main.c b/daemon/main.c
index cdb41fa..848cf3c 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -448,8 +448,6 @@ on_name_acquired (GDBusConnection *bus,
g_debug ("Successfully connected to D-Bus");
- gdm_manager_start (manager);
-
show_local_greeter = TRUE;
gdm_settings_direct_get_boolean (GDM_KEY_SHOW_LOCAL_GREETER, &show_local_greeter);
gdm_manager_set_show_local_greeter (manager, show_local_greeter);
@@ -457,6 +455,8 @@ on_name_acquired (GDBusConnection *bus,
xdmcp_enabled = FALSE;
gdm_settings_direct_get_boolean (GDM_KEY_XDMCP_ENABLE, &xdmcp_enabled);
gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
+
+ gdm_manager_start (manager);
}
static void
--
1.8.5.6

57
gdm-look-at-runlevel.patch
View File

@ -1,57 +0,0 @@
Index: gdm-2.28.0/daemon/gdm-static-display.c
===================================================================
--- gdm-2.28.0.orig/daemon/gdm-static-display.c
+++ gdm-2.28.0/daemon/gdm-static-display.c
@@ -26,6 +26,7 @@
#include <fcntl.h>
#include <pwd.h>
#include <unistd.h>
+#include <utmp.h>
#include <string.h>
#include <signal.h>
#include <sys/stat.h>
@@ -96,6 +97,29 @@ gdm_static_display_manage (GdmDisplay *d
}
static gboolean
+gdm_static_display_should_manage_again (void)
+{
+ struct utmp *ut;
+
+ setutent();
+ while ((ut = getutent()) != NULL) {
+ if (ut->ut_type == RUN_LVL) {
+ char current;
+ current = ut->ut_pid % 256;
+ endutent();
+
+ if (current == '0' || current == '6')
+ return FALSE;
+ return TRUE;
+ }
+ }
+
+ endutent();
+
+ return TRUE;
+}
+
+static gboolean
gdm_static_display_finish (GdmDisplay *display)
{
int status;
@@ -108,9 +132,11 @@ gdm_static_display_finish (GdmDisplay *d
/* restart static displays */
gdm_display_unmanage (display);
- status = gdm_display_get_status (display);
- if (status != GDM_DISPLAY_FAILED) {
- gdm_display_manage (display);
+ if (gdm_static_display_should_manage_again ()) {
+ status = gdm_display_get_status (display);
+ if (status != GDM_DISPLAY_FAILED) {
+ gdm_display_manage (display);
+ }
}
return TRUE;

54
gdm-passwordless-login.patch
View File

@ -1,7 +1,7 @@
Index: gdm-3.14.1/common/gdm-settings-system-backend.c Index: gdm-3.15.90.5/common/gdm-settings-system-backend.c
=================================================================== ===================================================================
--- gdm-3.14.1.orig/common/gdm-settings-system-backend.c --- gdm-3.15.90.5.orig/common/gdm-settings-system-backend.c
+++ gdm-3.14.1/common/gdm-settings-system-backend.c +++ gdm-3.15.90.5/common/gdm-settings-system-backend.c
@@ -44,9 +44,9 @@ @@ -44,9 +44,9 @@
#define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" #define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"
#define SYSCONFIG_XDMCP_KEY "DISPLAYMANAGER_REMOTE_ACCESS" #define SYSCONFIG_XDMCP_KEY "DISPLAYMANAGER_REMOTE_ACCESS"
@ -77,23 +77,23 @@ Index: gdm-3.14.1/common/gdm-settings-system-backend.c
} else { } else {
g_set_error (error, GDM_SETTINGS_BACKEND_ERROR, GDM_SETTINGS_BACKEND_ERROR_KEY_NOT_FOUND, "Key not found"); g_set_error (error, GDM_SETTINGS_BACKEND_ERROR, GDM_SETTINGS_BACKEND_ERROR_KEY_NOT_FOUND, "Key not found");
return FALSE; return FALSE;
Index: gdm-3.14.1/common/gdm-settings-keys.h Index: gdm-3.15.90.5/common/gdm-settings-keys.h
=================================================================== ===================================================================
--- gdm-3.14.1.orig/common/gdm-settings-keys.h --- gdm-3.15.90.5.orig/common/gdm-settings-keys.h
+++ gdm-3.14.1/common/gdm-settings-keys.h +++ gdm-3.15.90.5/common/gdm-settings-keys.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS @@ -34,6 +34,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
#define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay" #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
#define GDM_KEY_INITIAL_SETUP_ENABLE "daemon/InitialSetupEnable" #define GDM_KEY_INITIAL_SETUP_ENABLE "daemon/InitialSetupEnable"
#define GDM_KEY_WAYLAND_ENABLE "daemon/WaylandEnable"
+#define GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE "daemon/SUSEPasswordlessEnable" +#define GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE "daemon/SUSEPasswordlessEnable"
#define GDM_KEY_DEBUG "debug/Enable" #define GDM_KEY_DEBUG "debug/Enable"
Index: gdm-3.14.1/data/gdm.schemas.in.in Index: gdm-3.15.90.5/data/gdm.schemas.in.in
=================================================================== ===================================================================
--- gdm-3.14.1.orig/data/gdm.schemas.in.in --- gdm-3.15.90.5.orig/data/gdm.schemas.in.in
+++ gdm-3.14.1/data/gdm.schemas.in.in +++ gdm-3.15.90.5/data/gdm.schemas.in.in
@@ -63,6 +63,12 @@ @@ -68,6 +68,12 @@
<signature>b</signature> <signature>b</signature>
<default>false</default> <default>false</default>
</schema> </schema>
@ -106,33 +106,3 @@ Index: gdm-3.14.1/data/gdm.schemas.in.in
<schema> <schema>
<key>security/DisallowTCP</key> <key>security/DisallowTCP</key>
Index: gdm-3.14.1/daemon/gdm-session.c
===================================================================
--- gdm-3.14.1.orig/daemon/gdm-session.c
+++ gdm-3.14.1/daemon/gdm-session.c
@@ -55,6 +55,9 @@
#include "gdm-session-worker-glue.h"
#include "gdm-common.h"
+#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h"
+
#define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel"
#define GDM_SESSION_DBUS_OBJECT_PATH "/org/gnome/DisplayManager/Session"
@@ -1262,6 +1265,15 @@ gdm_session_handle_client_begin_verifica
GdmSession *self)
{
GdmSessionConversation *conversation;
+ gboolean passwordless;
+
+ if (!gdm_settings_direct_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
+ &passwordless)) {
+ passwordless = FALSE;
+ }
+
+ if (passwordless)
+ service_name = "gdm-autologin";
conversation = begin_verification_conversation (self, invocation, service_name);

128
gdm.changes
View File

@ -5,6 +5,110 @@ Tue Mar 17 11:50:34 UTC 2015 - dliang@suse.com
gdm-autologin.pamd gdm-fingerprint.pamd and gdm-autologin.pamd gdm-fingerprint.pamd and
gdm-smartcard.pamd: respect /etc/nologin (bsc#897316). gdm-smartcard.pamd: respect /etc/nologin (bsc#897316).
-------------------------------------------------------------------
Wed Mar 4 18:36:13 UTC 2015 - dimstar@opensuse.org
- Add gnome-session-wayland Requires: current GDM is based on a
wayland session. The user can still choose between a X and a
wayland session.
-------------------------------------------------------------------
Tue Mar 3 16:19:54 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.91.2:
+ Fix hang on logout of wayland.
+ Drop caribou autostart file.
-------------------------------------------------------------------
Tue Mar 3 12:13:33 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.91.1:
+ Fix hang on VT switch.
+ Updated translations.
-------------------------------------------------------------------
Sat Feb 28 11:12:22 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.91:
+ Improved debug output.
+ More X-without-root fixes.
+ Pass LANG to gdm daemon.
+ Fix hang with autologin.
+ Less flicker with wayland.
-------------------------------------------------------------------
Fri Feb 27 21:26:04 CET 2015 - fcrozat@suse.com
- Drop gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch:
merged upstream.
- Rebase gdm-passwordless-login.patch.
-------------------------------------------------------------------
Fri Feb 27 03:15:56 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90.5:
+ Code clarification.
+ Initial Setup fixes.
+ X-without-root fixes.
+ Updated translations.
-------------------------------------------------------------------
Fri Feb 27 03:15:55 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90.4:
+ Pass DISPLAY/XAUTHORITY to dbus-daemon.
+ Updated translations.
-------------------------------------------------------------------
Fri Feb 27 03:15:54 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90.3:
+ Disable gnome-initial-setup for now.
+ One more stab at the widespread "No user list" problem.
+ Fix X session environment to use provided dbus-daemon.
+ Updated translations.
- Changes from version 3.15.90.2:
+ Fix crashers in gdm-wayland-session and gdm-x-session.
+ Start dbus-daemon in more platform agnostic way.
+ clean up log spew.
+ fix accountsservice race leading to gnome-shell tanking on
startup for some people.
- Drop gdm-fix-crash.patch: fixed upstream.
-------------------------------------------------------------------
Fri Feb 27 03:15:53 UTC 2015 - dimstar@opensuse.org
- Add gdm-fix-crash.patch: Fix crashes due to dbus-daemon not being
found in /usr/bin.
-------------------------------------------------------------------
Fri Feb 27 03:15:52 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90.1:
+ Fix daemon/WaylandEnable check.
+ Compiler warning fixes.
+ Updated translations.
- Drop gdm-returnvalues.patch: fixed upstream.
-------------------------------------------------------------------
Fri Feb 27 03:15:51 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90:
+ Fix pam_ecryptfs on Fedora.
+ Launch user sessions on a separate VT from login screen for
seat0.
+ Use wayland by default on login screen (can turn off with
daemon/WaylandEnable=false).
+ Deprecate ConsoleKit and disable by default.
+ Significant code clean ups.
+ Fix xdmcp/ShowLocalGreeter config option.
+ Memory leak fixes.
+ Updated translations.
- Rebase gdm-passwordless-login.patch.
- Drop gdm-look-at-runlevel.patch: no longer applicable after the
refactoring.
- Add gdm-returnvalues.patch: Ensure functions have a return value.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 26 12:03:15 UTC 2015 - fcrozat@suse.com Thu Feb 26 12:03:15 UTC 2015 - fcrozat@suse.com
@ -21,6 +125,30 @@ Tue Feb 10 11:28:29 UTC 2015 - zaitor@opensuse.org
- Only install gdm-fingerprint and gdm-smartcard pamfiles if - Only install gdm-fingerprint and gdm-smartcard pamfiles if
enable_split_authentication is enabled (boo#900836). enable_split_authentication is enabled (boo#900836).
-------------------------------------------------------------------
Fri Dec 19 14:41:33 UTC 2014 - zaitor@opensuse.org
- Update to version 3.15.3.1:
+ Actually set XDG_SESSION_TYPE in user sessions.
+ Don't require plymouth if using systemd.
+ Require --without-plymouth to disable plymouth support.
-------------------------------------------------------------------
Wed Dec 17 19:33:11 UTC 2014 - zaitor@opensuse.org
- Update to version 3.15.3:
+ Set XDG_SESSION_TYPE in user sessions.
+ Propagate XDG_CONFIG_DIRS and XCURSOR_PATH into login sessions.
+ Require plymouth if using systemd.
-------------------------------------------------------------------
Fri Nov 28 19:07:24 UTC 2014 - zaitor@opensuse.org
- Update to version 3.15.2:
+ Fix session selection for smartcard users.
+ Don't warp pointer anymore.
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 14 13:04:31 UTC 2014 - dimstar@opensuse.org Tue Oct 14 13:04:31 UTC 2014 - dimstar@opensuse.org

12
gdm.spec
View File

@ -27,13 +27,13 @@
%define enable_split_authentication 0 %define enable_split_authentication 0
Name: gdm Name: gdm
Version: 3.14.1 Version: 3.15.91.2
Release: 0 Release: 0
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://projects.gnome.org/gdm/ Url: http://projects.gnome.org/gdm/
Source: http://download.gnome.org/sources/gdm/3.14/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gdm/3.15/%{name}-%{version}.tar.xz
Source1: gdm.pamd Source1: gdm.pamd
Source2: gdm-autologin.pamd Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd Source3: gdm-launch-environment.pamd
@ -58,12 +58,8 @@ Patch9: gdm-passwordless-login.patch
Patch34: gdm-default-wm.patch Patch34: gdm-default-wm.patch
# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bnc#538064 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to current hostname when we authenticate, for local logins, to avoid issues in the session in case the hostname changes later one. See comment 24 in the bug. # PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bnc#538064 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to current hostname when we authenticate, for local logins, to avoid issues in the session in case the hostname changes later one. See comment 24 in the bug.
Patch35: gdm-xauthlocalhostname.patch Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
Patch40: gdm-look-at-runlevel.patch
# PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running # PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running
Patch41: gdm-plymouth-vt1.patch Patch41: gdm-plymouth-vt1.patch
# PATCH-FIX-UPSTREAM gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch bgo#743440 fcrozat@suse.com -- Ensure ShowLocalGreeter value is properly handled
Patch42: gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch
BuildRequires: check-devel BuildRequires: check-devel
# needed for directory ownership # needed for directory ownership
BuildRequires: dconf BuildRequires: dconf
@ -99,6 +95,7 @@ Requires: ConsoleKit-x11
%endif %endif
Requires: gdmflexiserver Requires: gdmflexiserver
Requires: gnome-session-core Requires: gnome-session-core
Requires: gnome-session-wayland
Requires: gnome-settings-daemon Requires: gnome-settings-daemon
Requires: gnome-shell Requires: gnome-shell
Requires: xorg-x11-server-extra Requires: xorg-x11-server-extra
@ -195,9 +192,7 @@ translation-update-upstream
%patch9 -p1 %patch9 -p1
%patch34 -p1 %patch34 -p1
#patch35 -p1 #patch35 -p1
%patch40 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1
%build %build
NOCONFIGURE=1 sh autogen.sh NOCONFIGURE=1 sh autogen.sh
@ -331,7 +326,6 @@ dconf update
%{_datadir}/dconf/profile/gdm %{_datadir}/dconf/profile/gdm
%{_datadir}/gdm/ %{_datadir}/gdm/
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
%{_datadir}/gnome-session/sessions/gdm-shell.session
%{_datadir}/icons/*/*/*/*.* %{_datadir}/icons/*/*/*/*.*
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%dir %{_libexecdir}/gdm %dir %{_libexecdir}/gdm