diff --git a/gdm-3.6.2.tar.xz b/gdm-3.6.2.tar.xz deleted file mode 100644 index aad2f75..0000000 --- a/gdm-3.6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9 -size 1627356 diff --git a/gdm-3.8.0.tar.xz b/gdm-3.8.0.tar.xz new file mode 100644 index 0000000..c19341f --- /dev/null +++ b/gdm-3.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a0894ae50d1f090c6ccc450b74142243fff9ee17e2924c0f363ea51b3ba6bd5 +size 1665812 diff --git a/gdm-autologin-session-logout.patch b/gdm-autologin-session-logout.patch deleted file mode 100644 index e4ecd8e..0000000 --- a/gdm-autologin-session-logout.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 47c73024739a65614c6a0ddcdd1c08239798044a Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 04 Oct 2012 21:36:57 +0000 -Subject: slave: only set up autologin conversations - -Right now any time any session conversation is started, -we run its setup call if autologin is enabled. We should only do this -for autologin sessions, otherwise, we may repeat work done by -the greeter. - -https://bugzilla.gnome.org/show_bug.cgi?id=682467 ---- -diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 9bc8522..4bbf503 100644 ---- a/daemon/gdm-simple-slave.c -+++ b/daemon/gdm-simple-slave.c -@@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession *session, - char *username; - int delay; - -+ g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name); -+ -+ if (g_strcmp0 (service_name, "gdm-autologin") != 0) { -+ return; -+ } - -- g_debug ("GdmSimpleSlave: session conversation started"); - enabled = FALSE; - gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); - if (! enabled) { --- -cgit v0.9.0.2 - diff --git a/gdm-move-everything-to-run.patch b/gdm-move-everything-to-run.patch deleted file mode 100644 index 29546fc..0000000 --- a/gdm-move-everything-to-run.patch +++ /dev/null @@ -1,80 +0,0 @@ -Index: gdm-3.6.2/configure -=================================================================== ---- gdm-3.6.2.orig/configure -+++ gdm-3.6.2/configure -@@ -26020,7 +26020,7 @@ fi - if ! test -z "$with_pid_file"; then - GDM_PID_FILE=$with_pid_file - else -- GDM_PID_FILE=/var/run/gdm.pid -+ GDM_PID_FILE=/run/gdm.pid - fi - - -@@ -26041,7 +26041,7 @@ fi - if ! test -z "$with_ran_once_marker_directory"; then - GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory - else -- GDM_RAN_ONCE_MARKER_DIR=${localstatedir}/run/gdm -+ GDM_RAN_ONCE_MARKER_DIR=/run/gdm - fi - - -@@ -26085,7 +26085,7 @@ fi - if ! test -z "$with_xauth_dir"; then - GDM_XAUTH_DIR=$with_xauth_dir - else -- GDM_XAUTH_DIR=${localstatedir}/run/gdm -+ GDM_XAUTH_DIR=/run/gdm - fi - - -@@ -26101,7 +26101,7 @@ fi - if ! test -z "$with_screenshot_dir"; then - GDM_SCREENSHOT_DIR=$with_screenshot_dir - else -- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter -+ GDM_SCREENSHOT_DIR=/run/gdm/greeter - fi - - -Index: gdm-3.6.2/configure.ac -=================================================================== ---- gdm-3.6.2.orig/configure.ac -+++ gdm-3.6.2/configure.ac -@@ -1326,7 +1326,7 @@ AC_ARG_WITH(pid-file, - if ! test -z "$with_pid_file"; then - GDM_PID_FILE=$with_pid_file - else -- GDM_PID_FILE=/var/run/gdm.pid -+ GDM_PID_FILE=/run/gdm.pid - fi - - AC_SUBST(GDM_PID_FILE) -@@ -1343,7 +1343,7 @@ AC_ARG_WITH(ran-once-marker-directory, - if ! test -z "$with_ran_once_marker_directory"; then - GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory - else -- GDM_RAN_ONCE_MARKER_DIR=${localstatedir}/run/gdm -+ GDM_RAN_ONCE_MARKER_DIR=/run/gdm - fi - AC_SUBST(GDM_RAN_ONCE_MARKER_DIR) - AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR", [ran once marker dir]) -@@ -1379,7 +1379,7 @@ AC_ARG_WITH(xauth-dir, - if ! test -z "$with_xauth_dir"; then - GDM_XAUTH_DIR=$with_xauth_dir - else -- GDM_XAUTH_DIR=${localstatedir}/run/gdm -+ GDM_XAUTH_DIR=/run/gdm - fi - - AC_SUBST(GDM_XAUTH_DIR) -@@ -1395,7 +1395,7 @@ AC_ARG_WITH(screenshot-dir, - if ! test -z "$with_screenshot_dir"; then - GDM_SCREENSHOT_DIR=$with_screenshot_dir - else -- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter -+ GDM_SCREENSHOT_DIR=/run/gdm/greeter - fi - - AC_SUBST(GDM_SCREENSHOT_DIR) diff --git a/gdm-sysconfig-settings.patch b/gdm-sysconfig-settings.patch index e7b9722..1480d07 100644 --- a/gdm-sysconfig-settings.patch +++ b/gdm-sysconfig-settings.patch @@ -1,8 +1,8 @@ -Index: gdm-3.5.4/common/Makefile.am +Index: gdm-3.7.5/common/Makefile.am =================================================================== ---- gdm-3.5.4.orig/common/Makefile.am -+++ gdm-3.5.4/common/Makefile.am -@@ -77,6 +77,8 @@ libgdmcommon_la_SOURCES = \ +--- gdm-3.7.5.orig/common/Makefile.am ++++ gdm-3.7.5/common/Makefile.am +@@ -61,6 +61,8 @@ libgdmcommon_la_SOURCES = \ gdm-settings-backend.h \ gdm-settings-desktop-backend.c \ gdm-settings-desktop-backend.h \ @@ -11,7 +11,7 @@ Index: gdm-3.5.4/common/Makefile.am gdm-settings-keys.h \ gdm-settings-utils.h \ gdm-settings-utils.c \ -@@ -84,6 +86,8 @@ libgdmcommon_la_SOURCES = \ +@@ -68,6 +70,8 @@ libgdmcommon_la_SOURCES = \ gdm-settings-direct.h \ gdm-settings-client.h \ gdm-settings-client.c \ @@ -19,11 +19,11 @@ Index: gdm-3.5.4/common/Makefile.am + gdm-sysconfig.h \ gdm-log.h \ gdm-log.c \ - gdm-md5.h \ -Index: gdm-3.5.4/common/gdm-settings-system-backend.c + $(MKDTEMP_FILES) \ +Index: gdm-3.7.5/common/gdm-settings-system-backend.c =================================================================== --- /dev/null -+++ gdm-3.5.4/common/gdm-settings-system-backend.c ++++ gdm-3.7.5/common/gdm-settings-system-backend.c @@ -0,0 +1,348 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -373,10 +373,10 @@ Index: gdm-3.5.4/common/gdm-settings-system-backend.c + + return GDM_SETTINGS_BACKEND (object); +} -Index: gdm-3.5.4/common/gdm-settings-system-backend.h +Index: gdm-3.7.5/common/gdm-settings-system-backend.h =================================================================== --- /dev/null -+++ gdm-3.5.4/common/gdm-settings-system-backend.h ++++ gdm-3.7.5/common/gdm-settings-system-backend.h @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -434,10 +434,10 @@ Index: gdm-3.5.4/common/gdm-settings-system-backend.h +G_END_DECLS + +#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */ -Index: gdm-3.5.4/common/gdm-settings.c +Index: gdm-3.7.5/common/gdm-settings.c =================================================================== ---- gdm-3.5.4.orig/common/gdm-settings.c -+++ gdm-3.5.4/common/gdm-settings.c +--- gdm-3.7.5.orig/common/gdm-settings.c ++++ gdm-3.7.5/common/gdm-settings.c @@ -39,6 +39,7 @@ #include "gdm-settings-glue.h" @@ -565,10 +565,10 @@ Index: gdm-3.5.4/common/gdm-settings.c G_OBJECT_CLASS (gdm_settings_parent_class)->finalize (object); } -Index: gdm-3.5.4/common/gdm-sysconfig.c +Index: gdm-3.7.5/common/gdm-sysconfig.c =================================================================== --- /dev/null -+++ gdm-3.5.4/common/gdm-sysconfig.c ++++ gdm-3.7.5/common/gdm-sysconfig.c @@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -1054,10 +1054,10 @@ Index: gdm-3.5.4/common/gdm-sysconfig.c + g_strfreev (lines); + return result; +} -Index: gdm-3.5.4/common/gdm-sysconfig.h +Index: gdm-3.7.5/common/gdm-sysconfig.h =================================================================== --- /dev/null -+++ gdm-3.5.4/common/gdm-sysconfig.h ++++ gdm-3.7.5/common/gdm-sysconfig.h @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -1102,10 +1102,10 @@ Index: gdm-3.5.4/common/gdm-sysconfig.h +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -Index: gdm-3.5.4/data/gdm.conf-custom.in +Index: gdm-3.7.5/data/gdm.conf-custom.in =================================================================== ---- gdm-3.5.4.orig/data/gdm.conf-custom.in -+++ gdm-3.5.4/data/gdm.conf-custom.in +--- gdm-3.7.5.orig/data/gdm.conf-custom.in ++++ gdm-3.7.5/data/gdm.conf-custom.in @@ -1,4 +1,7 @@ # GDM configuration storage +# diff --git a/gdm-xauthlocalhostname.patch b/gdm-xauthlocalhostname.patch index 1e5d78c..d4d7e22 100644 --- a/gdm-xauthlocalhostname.patch +++ b/gdm-xauthlocalhostname.patch @@ -3,9 +3,9 @@ Index: gdm-3.7.3.1/daemon/gdm-display-access-file.c --- gdm-3.7.3.1.orig/daemon/gdm-display-access-file.c +++ gdm-3.7.3.1/daemon/gdm-display-access-file.c @@ -443,13 +443,10 @@ _get_auth_info_for_display (GdmDisplayAc - gdm_display_is_local (display, &is_local, NULL); - - if (is_local) { + * + * https://bugs.freedesktop.org/show_bug.cgi?id=43425 + */ - char localhost[HOST_NAME_MAX + 1] = ""; *family = FamilyLocal; - if (gethostname (localhost, HOST_NAME_MAX) == 0) { @@ -13,8 +13,8 @@ Index: gdm-3.7.3.1/daemon/gdm-display-access-file.c - } else { - *address = g_strdup ("localhost"); - } -+ /* using the new function we create in the patch, to detect -+ * changes here, in the original code */ ++ /* using the new function we create in the patch, to detect ++ * changes here, in the original code */ + *address = gdm_gethostname (); } else { *family = FamilyWild; diff --git a/gdm.changes b/gdm.changes index 334ddb2..5f9f49b 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,93 @@ +------------------------------------------------------------------- +Tue Mar 26 09:42:27 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.8.0: + + No changes since version 3.7.92. + +------------------------------------------------------------------- +Tue Mar 19 19:03:05 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.7.92: + + Add --disable-fallback-greeter configure option. + + Updated translations. + +------------------------------------------------------------------- +Wed Mar 6 10:30:17 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.7.91: + + Correct path of run dir. + + Don't set _XROOTPMAP_ID at startup anymore. + + Updated translations. + +------------------------------------------------------------------- +Fri Mar 1 11:43:10 UTC 2013 - dimstar@opensuse.org + +- Drop klogd Requires: this is no longer needed due to the changes + with earlygdm / systemd integration. + +------------------------------------------------------------------- +Wed Feb 20 19:51:07 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.7.90: + + Add gdm-pin service file. + + use 0711 for directories. + + don't enable systemd journal if systemd is disabled. + + Add a --with-run-dir. + + Start to land prerequisite bits needed for future + systemd-ification. +- Drop gdm-move-everything-to-run.patch: fixed upstream (slightly + different) +- Pass --with-run-dir=/run/gdm to configure. + +------------------------------------------------------------------- +Tue Feb 5 13:24:31 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.7.5: + + Randr performance improvement + + Remove gdm wrapper script + + Integrate better with systemd journal + + Use glib signal handling helpers instead of home brew ones + + Don't load gio modules in launch environment + + Enable gsd keyboard plugin in launch environment + + Don't warp pointer to 0,0 + + Don't record a login uid for gdm's login session + + Other misc fixes + + Updated translations. +- Add pkgconfig(libsystemd-journal) BuildRequries: new dependency. + +------------------------------------------------------------------- +Tue Jan 29 23:00:00 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.7.3.1: + + Fix xauthoriation for su/ssh compatibility. +- Changes from version 3.7.3: + + Drop dead code. + + Deprecation fixes. + + Compiler warning fixes. + + Change default location of language config file. + + Be more resiliant against hostname changes. + + Fix spew in error path. +- Changes from version 3.7.2: + + Ignore pam info messages for automatic logins + + Unlock fixes + + User switching fix on consolekit systems + + Be more robust against empty user shells/home dirs + + Create program session log file as root instead of after setuid + + Properly reload gdm.schemas on SIGHUP + + Bring back gdmflexiserver + + Fix shutdown and restart with ConsoleKit (bgo#686125) + + Refactor autologin conversation handling (bgo#682467) + + Add host authorizations individually (bgo#686186) + + Make gdm socket world accessible (bgo#685935) + + Allow NULs in X11 cookies (bgo#687691) + + Dont set a busy cursor (bgo#687791) + + Use a whitelist for gsd plugins (bgo#662220) + + Drop obsolete desktop files (bgo#684508) + + Updated translations. +- Drop gdm-autologin-session-logout.patch: fixed upstream. +- Rebase gdm-sysconfig-settings.patch and + gdm-xauthlocalhostname.patch. + ------------------------------------------------------------------- Mon Jan 28 10:36:39 UTC 2013 - rmilasan@suse.com diff --git a/gdm.spec b/gdm.spec index ac96962..a44c1b5 100644 --- a/gdm.spec +++ b/gdm.spec @@ -27,13 +27,13 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.6.2 +Version: 3.8.0 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0+ Group: System/GUI/GNOME Url: http://projects.gnome.org/gdm/ -Source: http://download.gnome.org/sources/gdm/3.6/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gdm/3.8/%{name}-%{version}.tar.xz Source1: gdm.pamd Source2: gdm-autologin.pamd Source3: gdm-launch-environment.pamd @@ -64,10 +64,6 @@ Patch34: gdm-default-wm.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-autologin-session-logout.patch bgo#682467 dimstar@opensuse.org -- Fix login after logging out from a auto-login session -Patch41: gdm-autologin-session-logout.patch -# PATCH-FIX-OPENSUSE gdm-move-everything-to-run.patch bgo#692733 rmilasan@suse.com -- Move everything (socket and pid files) to /run -Patch42: gdm-move-everything-to-run.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -92,6 +88,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: pkgconfig(accountsservice) %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: pkgconfig(libsystemd-login) >= 186 %endif BuildRequires: pkgconfig(nss) @@ -105,7 +102,6 @@ Requires: ConsoleKit-x11 %endif Requires: gdmflexiserver Requires: gnome-session-core -Requires: klogd Requires: xorg-x11-server-extra ### Packages for the gdm session (see /usr/share/gnome-session/sessions/{gdm,gdm-fallback}.session and /usr/share/gdm/greeter/applications) ## Fallback @@ -238,8 +234,6 @@ translation-update-upstream %patch34 -p1 %patch35 -p1 %patch40 -p1 -%patch41 -p1 -%patch42 -p1 %build NOCONFIGURE=1 gnome-autogen.sh @@ -264,7 +258,8 @@ NOCONFIGURE=1 gnome-autogen.sh --disable-split-authentication \ %endif --disable-scrollkeeper \ - --with-initial-vt=7 + --with-initial-vt=7 \ + --with-run-dir=/run/gdm %__make %{?jobs:-j%jobs} V=1 %install @@ -279,8 +274,6 @@ mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions %if %{with_systemd} rm %{buildroot}%{systemdsystemunitdir}/gdm.service %endif -# Remove wrapper, it is not needed. -mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm # dconf database, rebuilt in scriptlets; touch it for %%ghost touch %{buildroot}%{_sysconfdir}/dconf/db/gdm ## Install PAM files.