From db3de05c40025087533f401ff34a5f7d42ae80fb Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 14 Jan 2022 06:37:10 +0100 Subject: [PATCH] - updated to 1.34.0 - updated systemd-fallback patch --- NetworkManager.spec | 14 +++++++----- systemd-fallback.patch | 48 +++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 25174bb..94e9489 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,13 +8,13 @@ Summary: Network Manager for GNOME Summary(pl.UTF-8): Zarządca sieci dla GNOME Name: NetworkManager -Version: 1.32.12 +Version: 1.34.0 Release: 1 Epoch: 2 License: GPL v2+ Group: Networking/Admin -Source0: https://download.gnome.org/sources/NetworkManager/1.32/%{name}-%{version}.tar.xz -# Source0-md5: 0913815a98c60d0d2bcc6e930b596906 +Source0: https://download.gnome.org/sources/NetworkManager/1.34/%{name}-%{version}.tar.xz +# Source0-md5: e5cf85f8023bbfe4acbf88ff848bb268 Source1: %{name}.conf Source3: %{name}.tmpfiles Source4: %{name}.init @@ -325,6 +325,7 @@ exit 0 %attr(755,root,root) %{_libexecdir}/nm-ifdown %attr(755,root,root) %{_libexecdir}/nm-ifup %attr(755,root,root) %{_libexecdir}/nm-initrd-generator +%attr(755,root,root) %{_libexecdir}/nm-priv-helper %attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so %attr(754,root,root) /etc/rc.d/init.d/NetworkManager %if "%{_lib}" != "lib" @@ -339,14 +340,17 @@ exit 0 %{systemdunitdir}/NetworkManager.service %{systemdunitdir}/NetworkManager-dispatcher.service %{systemdunitdir}/NetworkManager-wait-online.service -%{systemdunitdir}/nm-cloud-setup.service -%{systemdunitdir}/nm-cloud-setup.timer %dir %{systemdunitdir}/NetworkManager.service.d %{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf +%{systemdunitdir}/nm-cloud-setup.service +%{systemdunitdir}/nm-cloud-setup.timer +%{systemdunitdir}/nm-priv-helper.service %{systemdtmpfilesdir}/%{name}.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.nm-priv-helper.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system.d/nm-dispatcher.conf %{_datadir}/dbus-1/system.d/nm-ifcfg-rh.conf +%{_datadir}/dbus-1/system.d/nm-priv-helper.conf %{_datadir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy /lib/udev/rules.d/84-nm-drivers.rules diff --git a/systemd-fallback.patch b/systemd-fallback.patch index fb8c913..17d1eeb 100644 --- a/systemd-fallback.patch +++ b/systemd-fallback.patch @@ -9,15 +9,15 @@ else have_systemd_logind=no fi ---- NetworkManager-1.28.0/src/core/nm-session-monitor.c.orig 2020-11-17 22:24:23.000000000 +0100 -+++ NetworkManager-1.28.0/src/core/nm-session-monitor.c 2020-12-07 17:27:16.046393625 +0100 +--- NetworkManager-1.34.0/src/core/nm-session-monitor.c.orig 2022-01-13 15:49:26.000000000 +0100 ++++ NetworkManager-1.34.0/src/core/nm-session-monitor.c 2022-01-13 20:47:31.545775434 +0100 @@ -18,6 +18,7 @@ #endif #if SESSION_TRACKING_SYSTEMD -+ #include - #include - #define LOGIND_NAME "systemd-logind" ++#include + #include + #define LOGIND_NAME "systemd-logind" #endif @@ -52,13 +53,11 @@ struct _NMSessionMonitor { } sd; @@ -101,8 +101,8 @@ G_OBJECT_CLASS(nm_session_monitor_parent_class)->finalize(object); } ---- NetworkManager-1.28.0/src/core/nm-sleep-monitor.c.orig 2020-11-17 22:24:23.000000000 +0100 -+++ NetworkManager-1.28.0/src/core/nm-sleep-monitor.c 2020-12-07 21:18:39.301181579 +0100 +--- NetworkManager-1.34.0/src/core/nm-sleep-monitor.c.orig 2022-01-13 15:49:26.000000000 +0100 ++++ NetworkManager-1.34.0/src/core/nm-sleep-monitor.c 2022-01-13 21:09:37.908589909 +0100 @@ -11,6 +11,10 @@ #include #include @@ -118,21 +118,21 @@ #elif defined(SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_ELOGIND) -- #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" +-#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" @@ -36,6 +40,17 @@ #elif defined(SUSPEND_RESUME_CONSOLEKIT) -+ #define USE_UPOWER 0 -+ #define _NMLOG_PREFIX_NAME "sleep-monitor-ck" ++#define USE_UPOWER 0 ++#define _NMLOG_PREFIX_NAME "sleep-monitor-ck" + +#else + @@ -146,15 +146,15 @@ * uses. http://consolekit2.github.io/ConsoleKit2/#Manager.Inhibit */ @@ -43,12 +58,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" + #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" - -#else - -- #error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER +-#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER #endif -- 2.44.0