diff --git a/timedatex-0.5.tar.gz b/timedatex-0.5.tar.gz deleted file mode 100644 index aaf5c60..0000000 Binary files a/timedatex-0.5.tar.gz and /dev/null differ diff --git a/timedatex-0.6.tar.gz b/timedatex-0.6.tar.gz new file mode 100644 index 0000000..3beb203 Binary files /dev/null and b/timedatex-0.6.tar.gz differ diff --git a/timedatex-timeout.patch b/timedatex-timeout.patch deleted file mode 100644 index a380b8d..0000000 --- a/timedatex-timeout.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit 3f0b85db1d4eedd3fdc9db0832e114215812d15c -Author: Miroslav Lichvar -Date: Wed Jan 10 15:55:05 2018 +0100 - - don't remove timeout after each main context iteration - - With glib2-2.54.3 adding a new timeout causes g_main_context_iteration() - to immediately return FALSE, which triggered an infinite loop removing - and adding the timeout. - - Instead of removing the timeout after all iterations, use a flag to - remove the timeout only when a valid call was handled. - - This fixes issue #4. - -diff --git a/timedatex.c b/timedatex.c -index 28e562c..e671bb5 100644 ---- a/timedatex.c -+++ b/timedatex.c -@@ -120,7 +120,7 @@ struct hwclock_call { - - /* Global variables */ - static GDBusProxy *systemd_proxy, *polkit_proxy; --static gboolean main_quit, running_auth_checks; -+static gboolean main_quit, running_auth_checks, had_activity; - static GArray *ntp_units; - - -@@ -948,6 +948,8 @@ static void handle_method_call(GDBusConnection *connection, const gchar *caller, - } else { - g_assert_not_reached(); - } -+ -+ had_activity = TRUE; - } - - static const GDBusInterfaceVTable interface_vtable = { -@@ -1022,19 +1024,24 @@ int main(int argc, char **argv) { - read_ntp_units(); - - main_quit = FALSE; -+ had_activity = FALSE; - - /* This is the main loop. Quit when idle for QUIT_TIMEOUT seconds. */ - - while (!main_quit) { - /* Add timeout when not waiting for an authorization check */ -- if (!running_auth_checks) -+ if (!timeout_id && !running_auth_checks) - timeout_id = g_timeout_add(QUIT_TIMEOUT * 1000, stop_main_loop, NULL); - - g_main_context_iteration(g_main_context_default(), TRUE); - -- if (timeout_id) -- g_source_remove(timeout_id); -- timeout_id = 0; -+ if (had_activity || running_auth_checks) { -+ had_activity = FALSE; -+ -+ if (timeout_id) -+ g_source_remove(timeout_id); -+ timeout_id = 0; -+ } - } - - ret = 0; diff --git a/timedatex.spec b/timedatex.spec index 15b0e09..81c8677 100644 --- a/timedatex.spec +++ b/timedatex.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: timedatex -Version: 0.5 -Release: 10 +Version: 0.6 +Release: 1 Summary: D-Bus service for system clock and RTC settings License: GPLv2+ URL: https://github.com/mlichvar/timedatex @@ -11,8 +11,6 @@ Source0: https://github.com/mlichvar/timedatex/archive/v%{version}/%{name BuildRequires: glib2-devel libselinux-devel Requires: polkit systemd util-linux -Patch1: timedatex-timeout.patch - %description timedatex is a D-Bus service that implements the org.freedesktop.timedate1 interface. It can be used to read and set the system clock, the real-time clock @@ -64,6 +62,12 @@ make test %{_mandir}/man8/%{name}.8* %changelog +* Fri Jul 24 2020 Hugel - 0.6.1 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: update to 0.6 + * Mon Mar 16 2020 openEuler Buildteam - 0.5.10 - Type: enhancement - ID: NA