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

Accepting request 635607 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/635607
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=412
This commit is contained in:
Luciano Santos
2018-09-23 01:30:29 +00:00
committed by Git OBS Bridge
parent 36f7ff3648
commit eeabd7a7c4
11 changed files with 215 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-3.28.4.tar.xz
View File

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

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

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

8
gdm-default-wm.patch
View File

@@ -1,7 +1,7 @@
Index: gdm-3.19.2/daemon/gdm-session.c
Index: gdm-3.29.90/daemon/gdm-session.c
===================================================================
--- gdm-3.19.2.orig/daemon/gdm-session.c
+++ gdm-3.19.2/daemon/gdm-session.c
--- gdm-3.29.90.orig/daemon/gdm-session.c 2018-08-03 16:20:50.000000000 +0200
+++ gdm-3.29.90/daemon/gdm-session.c 2018-08-04 00:31:42.875646365 +0200
@@ -43,6 +43,8 @@
#include <glib-object.h>
#include <gio/gio.h>
@@ -11,7 +11,7 @@ Index: gdm-3.19.2/daemon/gdm-session.c
#include "gdm-session.h"
#include "gdm-session-glue.h"
#include "gdm-dbus-util.h"
@@ -523,6 +525,14 @@ get_fallback_session_name (GdmSession *s
@@ -541,6 +543,14 @@ get_fallback_session_name (GdmSession *s
}
}

10
gdm-fails-to-restart-gnome-shell.patch
View File

@@ -1,8 +1,8 @@
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index ab84ba4..e1d0996 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -673,7 +673,7 @@ gdm_display_unmanage (GdmDisplay *self)
Index: gdm-3.29.90/daemon/gdm-display.c
===================================================================
--- gdm-3.29.90.orig/daemon/gdm-display.c 2018-08-03 16:20:47.000000000 +0200
+++ gdm-3.29.90/daemon/gdm-display.c 2018-08-04 00:31:42.919646968 +0200
@@ -706,7 +706,7 @@ gdm_display_unmanage (GdmDisplay *self)
}
elapsed = g_timer_elapsed (self->priv->server_timer, NULL);

18
gdm-ignore-duplicate-session.patch
View File

@@ -1,8 +1,8 @@
Index: gdm-3.26.2.1/libgdm/gdm-sessions.c
Index: gdm-3.29.90/libgdm/gdm-sessions.c
===================================================================
--- gdm-3.26.2.1.orig/libgdm/gdm-sessions.c
+++ gdm-3.26.2.1/libgdm/gdm-sessions.c
@@ -202,6 +202,34 @@ collect_sessions_from_directory (const c
--- gdm-3.29.90.orig/libgdm/gdm-sessions.c 2018-06-26 19:59:06.000000000 +0200
+++ gdm-3.29.90/libgdm/gdm-sessions.c 2018-08-04 00:34:12.709684550 +0200
@@ -212,6 +212,34 @@ collect_sessions_from_directory (const c
g_dir_close (dir);
}
@@ -37,17 +37,17 @@ Index: gdm-3.26.2.1/libgdm/gdm-sessions.c
static void
collect_sessions (void)
{
@@ -233,6 +261,7 @@ collect_sessions (void)
#ifdef ENABLE_WAYLAND_SUPPORT
@@ -269,6 +269,7 @@ collect_sessions (void)
#ifdef ENABLE_USER_DISPLAY_SERVER
if (g_getenv ("WAYLAND_DISPLAY") == NULL && g_getenv ("RUNNING_UNDER_GDM") != NULL) {
g_array_free (wayland_search_array, TRUE);
+ remove_duplicated_session_name();
return;
}
#endif
@@ -241,6 +270,8 @@ collect_sessions (void)
collect_sessions_from_directory (wayland_search_dirs [i]);
}
@@ -279,6 +280,8 @@ collect_sessions (void)
g_array_free (wayland_search_array, TRUE);
#endif
+
+ remove_duplicated_session_name();

59
gdm-make-udev-dir-configurable.patch Normal file
View File

@@ -0,0 +1,59 @@
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,10 @@ AC_ARG_ENABLE(wayland-support,
[Enable support for wayland sessions @<:@default=auto@:>@]),
[enable_wayland_support=$enableval],
[enable_wayland_support=yes])
+AC_ARG_WITH([udevdir],
+ AS_HELP_STRING([--with-udevdir=DIR],
+ [Directory for udev files]),
+ [with_udevdir=$withval], [with_udevdir=$($PKG_CONFIG --variable=udevdir udev)])
AC_ARG_WITH(plymouth,
AS_HELP_STRING([--with-plymouth],
@@ -872,6 +876,9 @@ if test "x$with_systemdsystemunitdir" !=
fi
AM_CONDITIONAL(INSTALL_SYSTEMD_UNITS, test x$with_systemdsystemunitdir != xno)
+if test "x$with_udevdir" != xno; then
+ AC_SUBST(UDEV_DIR, [$with_udevdir])
+fi
dnl ---------------------------------------------------------------------------
dnl - Check for plymouth support
@@ -1517,6 +1524,7 @@ echo \
XDMCP support: ${XDMCP_SUPPORT}
SELinux support: ${use_selinux}
systemd unit dir: ${with_systemdsystemunitdir}
+ udev dir: ${with_udevdir}
plymouth support: ${use_plymouth}
wayland support: ${enable_wayland_support}
Build with RBAC: ${msg_rbac_shutdown}
Index: b/data/Makefile.am
===================================================================
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -154,7 +154,7 @@ if ENABLE_ARCH_PAM_CONFI
pam_files = $(pam_arch_files)
endif
-udevrulesdir = /lib/udev/rules.d
+udevrulesdir = $(UDEV_DIR)/rules.d
udevrules_DATA = 61-gdm.rules
EXTRA_DIST += $(srcdir)/61-gdm.rules.in
Index: b/data/Makefile.in
===================================================================
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -572,7 +572,7 @@ pam_arch_files = pam-arch/gdm-autologin.
@ENABLE_LFS_PAM_CONFIG_TRUE@pam_files = $(pam_lfs_files)
@ENABLE_OPENEMBEDDED_PAM_CONFIG_TRUE@pam_files = $(pam_openembedded_files)
@ENABLE_REDHAT_PAM_CONFIG_TRUE@pam_files = $(pam_redhat_files)
-udevrulesdir = /lib/udev/rules.d
+udevrulesdir = $(UDEV_DIR)/rules.d
udevrules_DATA = 61-gdm.rules
CLEANFILES = Xsession gdm.conf-custom Init PreSession PostSession \
greeter-dconf-defaults $(NULL) gdm.service $(am__append_2)

10
gdm-plymouth-vt1.patch
View File

@@ -1,7 +1,7 @@
Index: gdm-3.26.1/daemon/main.c
Index: gdm-3.29.90/daemon/main.c
===================================================================
--- gdm-3.26.1.orig/daemon/main.c
+++ gdm-3.26.1/daemon/main.c
--- gdm-3.29.90.orig/daemon/main.c 2018-08-03 16:20:51.000000000 +0200
+++ gdm-3.29.90/daemon/main.c 2018-08-04 00:35:56.183076931 +0200
@@ -33,6 +33,8 @@
#include <sys/wait.h>
#include <locale.h>
@@ -43,7 +43,7 @@ Index: gdm-3.26.1/daemon/main.c
static gboolean do_timed_exit = FALSE;
static gboolean print_version = FALSE;
static gboolean fatal_warnings = FALSE;
@@ -383,6 +403,8 @@ main (int argc,
@@ -382,6 +402,8 @@ main (int argc,
g_chdir ("/");
@@ -52,7 +52,7 @@ Index: gdm-3.26.1/daemon/main.c
main_loop = g_main_loop_new (NULL, FALSE);
g_unix_signal_add (SIGTERM, on_shutdown_signal_cb, main_loop);
@@ -405,6 +427,10 @@ main (int argc,
@@ -404,6 +426,10 @@ main (int argc,
g_main_loop_unref (main_loop);

42
gdm-sysconfig-settings.patch
View File

@@ -1,8 +1,8 @@
Index: b/common/Makefile.am
Index: gdm-3.29.90/common/Makefile.am
===================================================================
--- a/common/Makefile.am 2018-01-19 20:09:39.075556951 +0800
+++ b/common/Makefile.am 2018-01-19 20:10:57.572967891 +0800
@@ -52,11 +52,15 @@
--- gdm-3.29.90.orig/common/Makefile.am 2018-08-01 20:59:59.000000000 +0200
+++ gdm-3.29.90/common/Makefile.am 2018-08-04 00:23:24.620553113 +0200
@@ -46,11 +46,15 @@ libgdmcommon_la_SOURCES = \
gdm-settings-backend.h \
gdm-settings-desktop-backend.c \
gdm-settings-desktop-backend.h \
@@ -17,11 +17,11 @@ Index: b/common/Makefile.am
+ gdm-sysconfig.h \
gdm-log.h \
gdm-log.c \
$(MKDTEMP_FILES) \
Index: b/common/gdm-settings-system-backend.c
$(NULL)
Index: gdm-3.29.90/common/gdm-settings-system-backend.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/common/gdm-settings-system-backend.c 2018-01-19 20:10:57.572967891 +0800
+++ gdm-3.29.90/common/gdm-settings-system-backend.c 2018-08-04 00:23:24.620553113 +0200
@@ -0,0 +1,369 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -392,10 +392,10 @@ Index: b/common/gdm-settings-system-backend.c
+
+ return GDM_SETTINGS_BACKEND (object);
+}
Index: b/common/gdm-settings-system-backend.h
Index: gdm-3.29.90/common/gdm-settings-system-backend.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/common/gdm-settings-system-backend.h 2018-01-19 20:10:57.572967891 +0800
+++ gdm-3.29.90/common/gdm-settings-system-backend.h 2018-08-04 00:23:24.620553113 +0200
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -453,10 +453,10 @@ Index: b/common/gdm-settings-system-backend.h
+G_END_DECLS
+
+#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */
Index: b/common/gdm-settings.c
Index: gdm-3.29.90/common/gdm-settings.c
===================================================================
--- a/common/gdm-settings.c 2018-01-19 20:10:02.587982412 +0800
+++ b/common/gdm-settings.c 2018-01-19 20:12:09.186231713 +0800
--- gdm-3.29.90.orig/common/gdm-settings.c 2018-06-26 19:59:06.000000000 +0200
+++ gdm-3.29.90/common/gdm-settings.c 2018-08-04 00:23:24.620553113 +0200
@@ -38,6 +38,7 @@
#include "gdm-settings.h"
@@ -465,7 +465,7 @@ Index: b/common/gdm-settings.c
#define GDM_SETTINGS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SETTINGS, GdmSettingsPrivate))
@@ -198,6 +199,8 @@
@@ -198,6 +199,8 @@ gdm_settings_init (GdmSettings *settings
if (backend)
settings->priv->backends = g_list_prepend (NULL, backend);
@@ -474,10 +474,10 @@ Index: b/common/gdm-settings.c
backend = gdm_settings_desktop_backend_new (GDM_RUNTIME_CONF);
if (backend)
settings->priv->backends = g_list_prepend (settings->priv->backends, backend);
Index: b/common/gdm-sysconfig.c
Index: gdm-3.29.90/common/gdm-sysconfig.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/common/gdm-sysconfig.c 2018-01-19 20:10:57.572967891 +0800
+++ gdm-3.29.90/common/gdm-sysconfig.c 2018-08-04 00:23:24.620553113 +0200
@@ -0,0 +1,484 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -963,10 +963,10 @@ Index: b/common/gdm-sysconfig.c
+ g_strfreev (lines);
+ return result;
+}
Index: b/common/gdm-sysconfig.h
Index: gdm-3.29.90/common/gdm-sysconfig.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/common/gdm-sysconfig.h 2018-01-19 20:10:57.572967891 +0800
+++ gdm-3.29.90/common/gdm-sysconfig.h 2018-08-04 00:23:24.624553173 +0200
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1011,10 +1011,10 @@ Index: b/common/gdm-sysconfig.h
+G_END_DECLS
+
+#endif /* __GDM_SYSCONFIG_H */
Index: b/data/gdm.conf-custom.in
Index: gdm-3.29.90/data/gdm.conf-custom.in
===================================================================
--- a/data/gdm.conf-custom.in 2018-01-19 20:09:39.075556951 +0800
+++ b/data/gdm.conf-custom.in 2018-01-19 20:10:57.572967891 +0800
--- gdm-3.29.90.orig/data/gdm.conf-custom.in 2018-08-01 21:00:01.000000000 +0200
+++ gdm-3.29.90/data/gdm.conf-custom.in 2018-08-04 00:23:24.624553173 +0200
@@ -1,4 +1,7 @@
# GDM configuration storage
+#
@@ -1022,4 +1022,4 @@ Index: b/data/gdm.conf-custom.in
+#
[daemon]
# Uncoment the line below to force the login screen to use Xorg
# Uncomment the line below to force the login screen to use Xorg

48
gdm-xauthlocalhostname.patch
View File

@@ -1,8 +1,8 @@
Index: gdm-3.26.1/common/gdm-common.c
Index: gdm-3.29.90/common/gdm-common.c
===================================================================
--- gdm-3.26.1.orig/common/gdm-common.c
+++ gdm-3.26.1/common/gdm-common.c
@@ -591,6 +591,8 @@ gdm_get_script_environment (const char *
--- gdm-3.29.90.orig/common/gdm-common.c 2018-08-02 22:02:19.000000000 +0200
+++ gdm-3.29.90/common/gdm-common.c 2018-08-04 00:26:09.874978033 +0200
@@ -628,6 +628,8 @@ gdm_get_script_environment (const char *
if (display_hostname) {
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (display_hostname));
@@ -11,7 +11,7 @@ Index: gdm-3.26.1/common/gdm-common.c
}
/* Runs as root */
@@ -797,3 +799,14 @@ gdm_shell_expand (const char *str,
@@ -839,3 +841,14 @@ gdm_shell_expand (const char *str,
}
return g_string_free (s, FALSE);
}
@@ -26,22 +26,22 @@ Index: gdm-3.26.1/common/gdm-common.c
+ return g_strdup ("localhost");
+ }
+}
Index: gdm-3.26.1/common/gdm-common.h
Index: gdm-3.29.90/common/gdm-common.h
===================================================================
--- gdm-3.26.1.orig/common/gdm-common.h
+++ gdm-3.26.1/common/gdm-common.h
@@ -54,6 +54,7 @@ const char * gdm_make_temp_dir
char *gdm_generate_random_bytes (gsize size,
GError **error);
--- gdm-3.29.90.orig/common/gdm-common.h 2018-08-02 22:02:19.000000000 +0200
+++ gdm-3.29.90/common/gdm-common.h 2018-08-04 00:26:09.874978033 +0200
@@ -56,6 +56,7 @@ char *gdm_generate_random_bytes
gboolean gdm_get_login_window_session_id (const char *seat_id,
char **session_id);
gboolean gdm_goto_login_session (GError **error);
+char *gdm_gethostname (void);
GPtrArray *gdm_get_script_environment (const char *username,
const char *display_name,
Index: gdm-3.26.1/daemon/gdm-display-access-file.c
Index: gdm-3.29.90/daemon/gdm-display-access-file.c
===================================================================
--- gdm-3.26.1.orig/daemon/gdm-display-access-file.c
+++ gdm-3.26.1/daemon/gdm-display-access-file.c
--- gdm-3.29.90.orig/daemon/gdm-display-access-file.c 2018-08-03 16:20:47.000000000 +0200
+++ gdm-3.29.90/daemon/gdm-display-access-file.c 2018-08-04 00:26:09.874978033 +0200
@@ -443,13 +443,10 @@ _get_auth_info_for_display (GdmDisplayAc
*
* https://bugs.freedesktop.org/show_bug.cgi?id=43425
@@ -59,11 +59,11 @@ Index: gdm-3.26.1/daemon/gdm-display-access-file.c
} else {
*family = FamilyWild;
gdm_display_get_remote_hostname (display, address, NULL);
Index: gdm-3.26.1/daemon/gdm-launch-environment.c
Index: gdm-3.29.90/daemon/gdm-launch-environment.c
===================================================================
--- gdm-3.26.1.orig/daemon/gdm-launch-environment.c
+++ gdm-3.26.1/daemon/gdm-launch-environment.c
@@ -201,6 +201,11 @@ build_launch_environment (GdmLaunchEnvir
--- gdm-3.29.90.orig/daemon/gdm-launch-environment.c 2018-08-03 16:20:48.000000000 +0200
+++ gdm-3.29.90/daemon/gdm-launch-environment.c 2018-08-04 00:26:09.874978033 +0200
@@ -218,6 +218,11 @@ build_launch_environment (GdmLaunchEnvir
g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
}
@@ -72,14 +72,14 @@ Index: gdm-3.26.1/daemon/gdm-launch-environment.c
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), gdm_gethostname ());
+ }
+
g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
Index: gdm-3.26.1/daemon/gdm-session.c
return hash;
Index: gdm-3.29.90/daemon/gdm-session.c
===================================================================
--- gdm-3.26.1.orig/daemon/gdm-session.c
+++ gdm-3.26.1/daemon/gdm-session.c
@@ -2570,6 +2570,14 @@ set_up_session_environment (GdmSession *
--- gdm-3.29.90.orig/daemon/gdm-session.c 2018-08-04 00:26:09.862977860 +0200
+++ gdm-3.29.90/daemon/gdm-session.c 2018-08-04 00:26:09.874978033 +0200
@@ -2578,6 +2578,14 @@ set_up_session_environment (GdmSession *
}
}

66
gdm.changes
View File

@@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Sep 5 02:42:59 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.30.0:
+ No visible changes for the user.
- Drop gdm-ignore-spurios-SeatNew-signal.patch: fixed upstream.
- Add gdm-make-udev-dir-configurable.patch: Make udev directory
configurable. Patch provided by upstream (glgo#GNOME/gdm!44).
- Rebase gdm-ignore-duplicate-session.patch.
-------------------------------------------------------------------
Sat Sep 1 19:20:01 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.92:
+ Search for sessions in XDG_DATA_DIRS.
+ Blacklist some more wayland unfriendly hardware.
+ Initial setup fix.
+ Flicker fix.
+ Misc bug fixes.
-------------------------------------------------------------------
Fri Aug 24 03:29:91 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.91:
+ CVE-2018-14424: double free fix.
+ Follow up fixes dealing with login screen reaping form last
release.
+ Add more debug logging.
+ Updated translations.
- Drop gdm-CVE-2018-14424.patch: Fixed upstream.
- Add gdm-ignore-spurios-SeatNew-signal.patch: Fix crashes.
-------------------------------------------------------------------
Thu Aug 23 15:03:13 UTC 2018 - bjorn.lie@gmail.com
@@ -33,6 +65,30 @@ Wed Aug 15 06:50:36 UTC 2018 - fezhang@suse.com
transient displays (CVE-2018-14424, glgo#GNOME#gdm#401,
boo#1103737).
-------------------------------------------------------------------
Fri Aug 3 22:16:38 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.90:
+ Display wayland on certain server machines.
+ Lifecycle fixes to libgdm/GdmClient.
+ Drop intltool.
+ Build goo clean ups
+ Kill login screen when not in use.
+ Cclean up stale utmp entries.
+ Misc fixes.
+ Updated translations.
- Rebase gdm-disable-wayland-on-unsupported-chipsets.patch.
- Disable
dm-add-runtime-option-to-disable-starting-X-server-as-u.patch:
Needs rebase.
- Refresh the following patches with quilt:
+ gdm-default-wm.patch.
+ gdm-fails-to-restart-gnome-shell.patch.
+ gdm-ignore-duplicate-session.patch.
+ gdm-plymouth-vt1.patch.
+ gdm-sysconfig-settings.patch
+ gdm-xauthlocalhostname.patch
-------------------------------------------------------------------
Tue Jul 31 12:43:52 UTC 2018 - bwiedemann@suse.com
@@ -44,6 +100,16 @@ Thu Jul 26 11:52:06 UTC 2018 - dimstar@opensuse.org
- Enable pam_keyinit module (boo#1081947).
-------------------------------------------------------------------
Sat Jun 2 02:39:31 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.1:
+ Reference counting fixes for GdmClient- ensure plymouth is quit
properly even when local greeter is disabled.
+ Make sure GDM doesn't hang when called with unknown command
line arguments.
- Rebase gdm-xauthlocalhostname.patch.
-------------------------------------------------------------------
Sun May 20 02:19:32 UTC 2018 - luc14n0@linuxmail.org

28
gdm.spec
View File

@@ -19,14 +19,15 @@
%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd)
# FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
%define enable_split_authentication 0
Name: gdm
Version: 3.28.4
Version: 3.30.0
Release: 0
Summary: The GNOME Display Manager
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://wiki.gnome.org/Projects/GDM
Source: http://download.gnome.org/sources/gdm/3.28/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gdm/3.30/%{name}-%{version}.tar.xz
Source1: gdm.pamd
Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd
@@ -38,6 +39,7 @@ Source6: gdmflexiserver-wrapper
Source7: X11-displaymanager-gdm
# GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
Source8: autogen.sh
# WARNING: do not remove/significantly change patch0 without updating the relevant patch in accountsservice too
# PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch)
Patch0: gdm-sysconfig-settings.patch
@@ -53,15 +55,18 @@ Patch5: gdm-ignore-duplicate-session.patch
Patch6: gdm-plymouth-vt1.patch
# PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 tyang@suse.com -- Gdm should stop after a few times fails
Patch7: gdm-fails-to-restart-gnome-shell.patch
# PATCH-FIX-UPSTREAM gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present.
# PATCH-NEEDS-REBASE gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present. WAS: PATCH-FIX-UPSTREAM, rejected upstream
Patch8: gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
# PATCH-FIX-UPSTREAM gdm-make-udev-rules-dir-configurable.patch glgo#GNOME/gdm!44 luc14n0@linuxmail.org Make the udev rules dir configurable.
Patch9: gdm-make-udev-dir-configurable.patch
### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
# PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
Patch1000: gdm-disable-gnome-initial-setup.patch
BuildRequires: check-devel
# needed for directory ownership
# dconf and gnome-session-core are needed for directory ownership
BuildRequires: dconf
# needed for directory ownership
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-session-core
@@ -196,12 +201,17 @@ cp %{SOURCE8} .
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
#patch8 -p1
%patch9 -p1
# SLE-only patches start at 1000
%if !0%{?is_opensuse}
%patch1000 -p1
%endif
# Force 61-gdm.rules to be override and make it use of libexecdir variable instead of hardcoding
rm data/61-gdm.rules
%build
NOCONFIGURE=1 sh autogen.sh
autoreconf -fiv
@@ -228,7 +238,8 @@ autoreconf -fiv
--disable-split-authentication \
%endif
--with-initial-vt=7 \
--with-run-dir=/run/gdm
--with-run-dir=/run/gdm \
--with-udevdir=/usr/lib/udev
%make_build V=1
%install
@@ -268,7 +279,6 @@ install -D -m 644 %{SOURCE7} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
# Install other files
mkdir -p %{buildroot}%{_localstatedir}/log/gdm
mkdir -p %{buildroot}/run/gdm
@@ -322,7 +332,7 @@ dconf update
%files
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%doc AUTHORS NEWS README.md
%doc %{_datadir}/help/C/%{name}/
%dir %config %{_sysconfdir}/gdm
%config %{_sysconfdir}/gdm/[IPXl]*