---- NetworkManager-1.2.2/configure.ac.systemd 2016-05-17 22:29:49.567521947 +0200
-+++ NetworkManager-1.2.2/configure.ac 2016-05-17 23:14:31.594510933 +0200
-@@ -435,7 +435,7 @@ AS_IF([test -z "$use_consolekit"], [use_
+--- NetworkManager-1.8.0/configure.ac.orig 2017-05-27 22:30:22.001467624 +0200
++++ NetworkManager-1.8.0/configure.ac 2017-05-27 22:57:15.061449204 +0200
+@@ -447,7 +447,7 @@
# output
session_tracking=
if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then
-- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-daemon libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
+- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-daemon libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
else
- have_systemd_logind=no
+ have_systemd_logind=no
fi
-@@ -447,12 +447,13 @@ if test "$have_systemd_logind" = "yes";
- session_tracking="$session_tracking, systemd-logind"
- fi
- if test "$use_consolekit" = "yes"; then
-- AC_DEFINE([SESSION_TRACKING_CONSOLEKIT], 1, [Define to 1 if ConsoleKit is available])
-- AC_DEFINE([CKDB_PATH], "/var/run/ConsoleKit/database", [Path to ConsoleKit database])
-+ AC_DEFINE([SESSION_TRACKING_CONSOLEKIT], 1, [Define to 1 if ConsoleKit is available])
- session_tracking="$session_tracking, consolekit"
- fi
- session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')"
-
-+AC_DEFINE([CKDB_PATH], "/var/run/ConsoleKit/database", [Path to ConsoleKit database])
-+
- AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|consolekit], [Build NetworkManager with specific suspend/resume support]))
- if test "z$with_suspend_resume" = "z"; then
- PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes],
---- NetworkManager-1.2.2/src/nm-session-monitor.c.systemd 2016-04-25 16:46:58.000000000 +0200
-+++ NetworkManager-1.2.2/src/nm-session-monitor.c 2016-05-28 23:23:37.337347753 +0200
-@@ -30,6 +30,7 @@
- #include "NetworkManagerUtils.h"
+--- NetworkManager-1.8.0/src/nm-session-monitor.c.orig 2017-05-10 10:59:08.000000000 +0200
++++ NetworkManager-1.8.0/src/nm-session-monitor.c 2017-05-27 23:07:26.988108884 +0200
+@@ -33,6 +33,7 @@
+ #endif
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_SYSTEMD
+#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
+ #define LOGIND_NAME "systemd-logind"
#endif
-
-@@ -52,13 +53,11 @@ struct _NMSessionMonitor {
+@@ -65,13 +66,11 @@ struct _NMSessionMonitor {
} sd;
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
struct {
GFileMonitor *monitor;
GHashTable *cache;
};
struct _NMSessionMonitorClass {
-@@ -138,7 +137,6 @@ st_sd_finalize (NMSessionMonitor *monito
+@@ -144,7 +143,6 @@ st_sd_finalize (NMSessionMonitor *monito
- /********************************************************************/
+ /*****************************************************************************/
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
typedef struct {
gboolean active;
} CkSession;
-@@ -272,7 +270,6 @@ ck_finalize (NMSessionMonitor *monitor)
+@@ -278,7 +276,6 @@ ck_finalize (NMSessionMonitor *monitor)
g_clear_pointer (&monitor->ck.cache, g_hash_table_unref);
g_clear_object (&monitor->ck.monitor);
}
-#endif /* SESSION_TRACKING_CONSOLEKIT */
- /********************************************************************/
+ /*****************************************************************************/
-@@ -383,13 +380,16 @@ nm_session_monitor_session_exists (NMSes
+@@ -350,13 +347,16 @@ nm_session_monitor_session_exists (NMSes
g_return_val_if_fail (NM_IS_SESSION_MONITOR (self), FALSE);
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_XLOGIND
- if (st_sd_session_exists (self, uid, active))
- return TRUE;
+ if (sd_booted () > 0) {
+ } else {
#endif
-
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
if (ck_session_exists (self, uid, active))
return TRUE;
+
-+#ifdef SESSION_TRACKING_SYSTEMD
++#if SESSION_TRACKING_XLOGIND
+ }
#endif
return FALSE;
-@@ -401,11 +401,15 @@ static void
+@@ -368,26 +368,28 @@ static void
nm_session_monitor_init (NMSessionMonitor *monitor)
{
- #ifdef SESSION_TRACKING_SYSTEMD
-- st_sd_init (monitor);
+ #if SESSION_TRACKING_XLOGIND
+ if (sd_booted () > 0) {
-+ st_sd_init (monitor);
-+ } else {
+ st_sd_init (monitor);
+ _LOGD ("using "LOGIND_NAME" session tracking");
++ } else
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
++ {
ck_init (monitor);
-+
-+#ifdef SESSION_TRACKING_SYSTEMD
+ _LOGD ("using ConsoleKit session tracking");
+-#endif
+ }
- #endif
}
-@@ -413,11 +417,15 @@ static void
- nm_session_monitor_finalize (GObject *object)
+ static void
+ finalize (GObject *object)
{
- #ifdef SESSION_TRACKING_SYSTEMD
-- st_sd_finalize (NM_SESSION_MONITOR (object));
-+ if (sd_booted () > 0) {
-+ st_sd_finalize (NM_SESSION_MONITOR (object));
-+ } else {
+ #if SESSION_TRACKING_XLOGIND
++ if (sd_booted () > 0)
+ st_sd_finalize (NM_SESSION_MONITOR (object));
++ else
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
ck_finalize (NM_SESSION_MONITOR (object));
-+
-+#ifdef SESSION_TRACKING_SYSTEMD
-+ }
- #endif
+-#endif
- if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
---- NetworkManager-1.2.2/src/nm-sleep-monitor-systemd.c.systemd 2016-05-17 23:14:52.878336245 +0200
-+++ NetworkManager-1.2.2/src/nm-sleep-monitor-systemd.c 2016-05-17 23:19:33.924628324 +0200
-@@ -24,6 +24,10 @@
+ G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
+ }
+--- NetworkManager-1.8.0/src/nm-sleep-monitor.c.orig 2017-05-10 10:59:08.000000000 +0200
++++ NetworkManager-1.8.0/src/nm-sleep-monitor.c 2017-05-27 23:22:47.011431711 +0200
+@@ -26,6 +26,10 @@
#include <sys/stat.h>
#include <gio/gunixfdlist.h>
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
-@@ -33,23 +37,18 @@
- #error either define SUSPEND_RESUME_SYSTEMD or SUSPEND_RESUME_CONSOLEKIT
- #endif
+@@ -40,9 +44,9 @@
--#ifdef SUSPEND_RESUME_SYSTEMD
--
- #define SUSPEND_DBUS_NAME "org.freedesktop.login1"
- #define SUSPEND_DBUS_PATH "/org/freedesktop/login1"
- #define SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
+ #elif defined (SUSPEND_RESUME_SYSTEMD) || defined (SUSPEND_RESUME_ELOGIND)
--#else
+-#define SUSPEND_DBUS_NAME "org.freedesktop.login1"
+-#define SUSPEND_DBUS_PATH "/org/freedesktop/login1"
+-#define SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
++#define SD_SUSPEND_DBUS_NAME "org.freedesktop.login1"
++#define SD_SUSPEND_DBUS_PATH "/org/freedesktop/login1"
++#define SD_SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
+ #define USE_UPOWER 0
+ #if defined (SUSPEND_RESUME_SYSTEMD)
+ #define _NMLOG_PREFIX_NAME "sleep-monitor-sd"
+@@ -52,6 +56,17 @@
+
+ #elif defined(SUSPEND_RESUME_CONSOLEKIT)
++#define USE_UPOWER 0
++#define _NMLOG_PREFIX_NAME "sleep-monitor-ck"
++
++#else
++
++#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
++
++#endif
++
++#if defined (SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_CONSOLEKIT)
++
/* ConsoleKit2 has added the same suspend/resume DBUS API that Systemd
* uses. http://consolekit2.github.io/ConsoleKit2/#Manager.Inhibit
*/
-
--#define SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit"
--#define SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
--#define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+@@ -59,12 +74,6 @@
+ #define SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit"
+ #define SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
+ #define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+-#define USE_UPOWER 0
+-#define _NMLOG_PREFIX_NAME "sleep-monitor-ck"
-
--#endif
-+#define CK_SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit"
-+#define CK_SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
-+#define CK_SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
-
- struct _NMSleepMonitor {
- GObject parent_instance;
-@@ -204,13 +203,28 @@ static void
- nm_sleep_monitor_init (NMSleepMonitor *self)
+-#else
+-
+-#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
+
+ #endif
+
+@@ -347,6 +356,17 @@ nm_sleep_monitor_init (NMSleepMonitor *s
{
self->inhibit_fd = -1;
-- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-- NULL,
-- SUSPEND_DBUS_NAME, SUSPEND_DBUS_PATH, SUSPEND_DBUS_INTERFACE,
-- NULL,
-- (GAsyncReadyCallback) on_proxy_acquired, self);
-+
+ self->cancellable = g_cancellable_new ();
+#ifdef SUSPEND_RESUME_SYSTEMD
-+ if (sd_booted () > 0) {
++ if (sd_booted () > 0)
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
-+ SUSPEND_DBUS_NAME, SUSPEND_DBUS_PATH, SUSPEND_DBUS_INTERFACE,
-+ NULL,
++ SD_SUSPEND_DBUS_NAME, SD_SUSPEND_DBUS_PATH, SD_SUSPEND_DBUS_INTERFACE,
++ self->cancellable,
+ (GAsyncReadyCallback) on_proxy_acquired, self);
-+ } else {
++ else
+#endif
-+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+ NULL,
-+ CK_SUSPEND_DBUS_NAME, CK_SUSPEND_DBUS_PATH, CK_SUSPEND_DBUS_INTERFACE,
-+ NULL,
-+ (GAsyncReadyCallback) on_proxy_acquired, self);
-+#ifdef SUSPEND_RESUME_SYSTEMD
-+ }
-+#endif
- }
-
- static void
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
projects / packages / NetworkManager.git / blobdiff