Commit 266291c3 authored by Rex Dieter's avatar Rex Dieter
Browse files

1.9.8-1

- lightdm-1.9.8 (#1021834)
- lightdm adds /usr/libexec/lightdm: to user $PATH (#888337)
parent 19f23f4b
/lightdm-1.8.7.tar.xz
/lightdm-1.9.8.tar.xz
diff -up lightdm-1.6.0/src/accounts.c.no_dmrc_save lightdm-1.6.0/src/accounts.c
--- lightdm-1.6.0/src/accounts.c.no_dmrc_save 2013-03-05 20:40:10.000000000 -0600
+++ lightdm-1.6.0/src/accounts.c 2013-05-20 17:50:19.421437397 -0500
@@ -131,7 +131,7 @@
dmrc = dmrc_load (username);
g_key_file_set_string (dmrc, group, key, value);
- dmrc_save (dmrc, username);
+ /* dmrc_save (dmrc, username); */
g_key_file_free (dmrc);
}
diff -up lightdm-1.9.8/common/dmrc.c.no_dmrc_save lightdm-1.9.8/common/dmrc.c
--- lightdm-1.9.8/common/dmrc.c.no_dmrc_save 2014-02-19 18:22:51.000000000 -0600
+++ lightdm-1.9.8/common/dmrc.c 2014-02-20 06:30:41.503707318 -0600
@@ -68,6 +68,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
data = g_key_file_to_data (dmrc_file, &length, NULL);
+#if 0
/* Update the users .dmrc */
path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
@@ -81,6 +82,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
privileges_reclaim ();
g_free (path);
+#endif
/* Update the .dmrc cache */
cache_dir = config_get_string (config_get_instance (), "LightDM", "cache-directory");
diff -up lightdm-1.9.8/common/user-list.c.no_dmrc_save lightdm-1.9.8/common/user-list.c
diff -up lightdm-1.9.8/src/accounts.c.no_dmrc_save lightdm-1.9.8/src/accounts.c
# HG changeset patch
# Parent b329fa1badaa454239690c3feb93d53324134915
try to lock the screen before switching users
diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
--- a/utils/gdmflexiserver
+++ b/utils/gdmflexiserver
@@ -9,9 +9,47 @@
#
# See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
+PATH=/usr/local/bin:/bin:/usr/bin
+export PATH
+
if [ -z "$XDG_SEAT_PATH" ]; then
# something went wrong
exit 1
fi
+find_command () {
+ cmd="$1"
+ oIFS="${IFS}"; IFS=:
+ set -- ${PATH}
+ IFS="${oIFS}"
+
+ for part; do
+ [ -x "${part}/${cmd}" ] && return 0
+ done
+ return 1
+}
+
+lock_screen () {
+ for lock_cmd in \
+ "xscreensaver-command -lock" \
+ "gnome-screensaver-command --lock" \
+ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
+ do
+ ${lock_cmd} >/dev/null 2>&1 && return
+ done
+
+ for lock_cmd in \
+ "slock" \
+ "xlock -mode blank"
+ do
+ set -- ${lock_cmd}
+ if find_command "$1"; then
+ ${lock_cmd} >/dev/null 2>&1 &
+ return
+ fi
+ done
+}
+
+lock_screen
+
dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter
......@@ -4,14 +4,13 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.8.7
Version: 1.9.8
Release: 1%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
#URL: http://www.freedesktop.org/wiki/Software/LightDM
URL: https://launchpad.net/lightdm/
Source0: https://launchpad.net/lightdm/1.8/%{version}/+download/lightdm-%{version}.tar.xz
Source0: https://launchpad.net/lightdm/1.9/%{version}/+download/lightdm-%{version}.tar.xz
Source1: lightdm.pam
Source2: lightdm-autologin.pam
......@@ -19,13 +18,12 @@ Source3: lightdm-tmpfiles.conf
Source4: lightdm.service
Source6: lightdm.rules
Patch0: lightdm-lock-screen-before-switch.patch
## Downstream patches:
Patch10: lightdm-1.8.4-fedora_config.patch
# hack in support for --nodaemon option
Patch11: lightdm-nodaemon_option.patch
# disable saving to ~/.dmrc
Patch12: lightdm-1.6.0-no_dmrc_save.patch
# disable saving to ~/.dmrc (runs afoul of selinux, http://bugzilla.redhat.com/963238 )
Patch12: lightdm-1.9.8-no_dmrc_save.patch
## upstreamable patches
# https://bugzilla.redhat.com/show_bug.cgi?id=973584
......@@ -118,7 +116,6 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%prep
%setup -q
%patch0 -p1 -b .lock-screen
%patch10 -p1 -b .fedora_config
%patch11 -p1 -b .nodaemon_option
%patch12 -p1 -b .no_dmrc_save
......@@ -206,9 +203,10 @@ exit 0
%config(noreplace) %{_sysconfdir}/lightdm/users.conf
%{_bindir}/dm-tool
%{_sbindir}/lightdm
%{_libexecdir}/lightdm/
%{_libexecdir}/lightdm-guest-session
%{_datadir}/lightdm/
%{_libdir}/girepository-1.0/LightDM-1.typelib
%{_mandir}/man1/dm-tool.1*
%{_mandir}/man1/lightdm*
%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
%{_unitdir}/lightdm.service
......@@ -250,6 +248,10 @@ exit 0
%changelog
* Thu Feb 20 2014 Rex Dieter <rdieter@fedoraproject.org> 1.9.8-1
- lightdm-1.9.8 (#1021834)
- lightdm adds /usr/libexec/lightdm: to user $PATH (#888337)
* Thu Feb 06 2014 Rex Dieter <rdieter@fedoraproject.org> 1.8.7-1
- lightdm-1.8.7
......
b97b1eec5d7074334f6c1d5cda2868d5 lightdm-1.8.7.tar.xz
dcd37257fe672235e246a3abf1c5273b lightdm-1.9.8.tar.xz
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment