From 15c0f0d023160340bd2b8d57ae29917cdd5facf6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 4 Sep 2011 10:42:08 -0400 Subject: [PATCH 1/3] fix fast user switching --- 0001-Fix-fast-user-switching.patch | 29 +++++++++++++++++++++++++++++ accountsservice.spec | 9 ++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-fast-user-switching.patch diff --git a/0001-Fix-fast-user-switching.patch b/0001-Fix-fast-user-switching.patch new file mode 100644 index 0000000..4404c16 --- /dev/null +++ b/0001-Fix-fast-user-switching.patch @@ -0,0 +1,29 @@ +From 0bc8212b2f9f98662e33659277b9b7215a25637a Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sun, 4 Sep 2011 10:24:10 -0400 +Subject: [PATCH] Fix fast user switching + +libaccountsservice was trying to launch 'actflexiserver', which +does not exist. Use 'gdmflexiserver' instead, which does exist. +This was a copy-and-paste error from when libaccountsservice was +first introduced, a year ago. +--- + src/libaccountsservice/act-user-manager.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c +index 2ab8c61..2fd2394 100644 +--- a/src/libaccountsservice/act-user-manager.c ++++ b/src/libaccountsservice/act-user-manager.c +@@ -213,7 +213,7 @@ start_new_login_session (ActUserManager *manager) + GError *error; + gboolean res; + +- res = g_spawn_command_line_async ("actflexiserver -s", &error); ++ res = g_spawn_command_line_async ("gdmflexiserver -s", &error); + if (! res) { + if (error != NULL) { + g_warning ("Unable to start new login: %s", error->message); +-- +1.7.6.1 + diff --git a/accountsservice.spec b/accountsservice.spec index 7a69cd0..ddb0de6 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ Name: accountsservice Version: 0.6.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information Group: System Environment/Daemons @@ -10,6 +10,9 @@ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog #VCS: git:git://git.freedesktop.org/accountsservice Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz +# upstream fix +Patch0: 0001-Fix-fast-user-switching.patch + BuildRequires: glib2-devel BuildRequires: dbus-glib-devel BuildRequires: polkit-devel @@ -49,6 +52,7 @@ of these interfaces, based on the useradd, usermod and userdel commands. %prep %setup -q +%patch0 -p1 %build %configure @@ -87,6 +91,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %{_datadir}/gir-1.0/AccountsService-1.0.gir %changelog +* Sun Sep 4 2011 Matthias Clasen - 0.6.13-3 +- Fix fast user switching + * Mon Aug 15 2011 Kalev Lember - 0.6.13-2 - Rebuilt for rpm bug #728707 From cbd37c37e06abe0c2b4c626a67c23efe3559bd3d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 21 Sep 2011 15:32:48 -0400 Subject: [PATCH 2/3] Update to 0.6.14 --- .gitignore | 1 + accountsservice.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 35738fc..941d6be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /accountsservice-0.6.11.tar.bz2 /accountsservice-0.6.12.tar.bz2 /accountsservice-0.6.13.tar.xz +/accountsservice-0.6.14.tar.xz diff --git a/accountsservice.spec b/accountsservice.spec index ddb0de6..c2459e6 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ Name: accountsservice -Version: 0.6.13 -Release: 3%{?dist} +Version: 0.6.14 +Release: 1%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information Group: System Environment/Daemons @@ -10,9 +10,6 @@ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog #VCS: git:git://git.freedesktop.org/accountsservice Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz -# upstream fix -Patch0: 0001-Fix-fast-user-switching.patch - BuildRequires: glib2-devel BuildRequires: dbus-glib-devel BuildRequires: polkit-devel @@ -52,7 +49,6 @@ of these interfaces, based on the useradd, usermod and userdel commands. %prep %setup -q -%patch0 -p1 %build %configure @@ -91,6 +87,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %{_datadir}/gir-1.0/AccountsService-1.0.gir %changelog +* Wed Sep 21 2011 Ray Strode 0.6.14-1 +- Update to 0.6.14 + * Sun Sep 4 2011 Matthias Clasen - 0.6.13-3 - Fix fast user switching diff --git a/sources b/sources index e1d6922..4f44cc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d09b8b3008ffda235069e8b412c5dd54 accountsservice-0.6.13.tar.xz +3422ff158ee2834344c534516e5e8a9d accountsservice-0.6.14.tar.xz From 907d6b5138a7660cad96649160f84f29bd3430fe Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 21 Sep 2011 17:24:55 -0400 Subject: [PATCH 3/3] fix wtmp loading --- accountsservice.spec | 9 ++++++++- fix-wtmp-loading.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 fix-wtmp-loading.patch diff --git a/accountsservice.spec b/accountsservice.spec index c2459e6..993eb2f 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ Name: accountsservice Version: 0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information Group: System Environment/Daemons @@ -20,6 +20,8 @@ BuildRequires: gobject-introspection-devel Requires: polkit Requires: shadow-utils +Patch0: fix-wtmp-loading.patch + %package libs Summary: Client-side library to talk to accountservice Group: Development/Libraries @@ -49,6 +51,7 @@ of these interfaces, based on the useradd, usermod and userdel commands. %prep %setup -q +%patch0 -p1 -b .fix-wtmp-loading %build %configure @@ -87,6 +90,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %{_datadir}/gir-1.0/AccountsService-1.0.gir %changelog +* Wed Sep 21 2011 Ray Strode 0.6.14-2 +- Fix wtmp loading so users coming from the network are + remembered in the user list in subsequent boots + * Wed Sep 21 2011 Ray Strode 0.6.14-1 - Update to 0.6.14 diff --git a/fix-wtmp-loading.patch b/fix-wtmp-loading.patch new file mode 100644 index 0000000..bb9d914 --- /dev/null +++ b/fix-wtmp-loading.patch @@ -0,0 +1,29 @@ +From b73f539602f74271650a102d90253dc697488478 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Wed, 21 Sep 2011 17:20:24 -0400 +Subject: [PATCH] daemon: load wtmp after passwd file + +The passwd file handling code clears the list of loaded +users so we need to always do wtmp on top of it, instead of +before it. +--- + src/daemon.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/daemon.c b/src/daemon.c +index 79915a7..99ee161 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -427,8 +427,8 @@ reload_data (Daemon *daemon) + static void + reload_users (Daemon *daemon) + { +- reload_wtmp_history (daemon); + reload_passwd (daemon); ++ reload_wtmp_history (daemon); + reload_data (daemon); + } + +-- +1.7.6.2 +