[packages/NetworkManager] - updated to 1.4.0 - updated ifcfg-path,systemd-fallback patches
qboosh
qboosh at pld-linux.org
Tue Sep 27 17:31:24 CEST 2016
commit 13a8788ce0a1d013382feacd874a42072c4c68f4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 27 17:33:00 2016 +0200
- updated to 1.4.0
- updated ifcfg-path,systemd-fallback patches
NetworkManager.spec | 14 ++++----
ifcfg-path.patch | 14 ++++----
systemd-fallback.patch | 98 ++++++++++++++++++++++++--------------------------
3 files changed, 61 insertions(+), 65 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index ded02c8..f901a43 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,13 +6,13 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.2.2
-Release: 3
+Version: 1.4.0
+Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/%{name}-%{version}.tar.xz
-# Source0-md5: a922bf20c2243c9014fb14c4427ad035
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/%{name}-%{version}.tar.xz
+# Source0-md5: 337e676261ca94af08f8e9b6f9b09a5b
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
@@ -34,6 +34,7 @@ BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtk-doc-automake >= 1.0
BuildRequires: intltool >= 0.40.0
+BuildRequires: jansson-devel
BuildRequires: libndp-devel
BuildRequires: libnl-devel >= 3.2.8
BuildRequires: libselinux-devel
@@ -66,8 +67,8 @@ Requires: ConsoleKit-x11
Requires: dhcp-client
Requires: filesystem >= 3.0-37
Requires: libnl >= 3.2.8
-Requires: libsoup >= 2.26.0
-Requires: libteam >= 1.9
+Requires: libsoup >= 2.40.0
+Requires: libteamdctl >= 1.9
Requires: newt >= 0.52.15
Requires: polkit >= 0.97
Requires: rc-scripts >= 0.4.3.0
@@ -76,6 +77,7 @@ Requires: wpa_supplicant >= 0.7.3-4
Suggests: ModemManager >= 1.0.0
Suggests: mobile-broadband-provider-info
Suggests: resolvconf
+Suggests: teamd >= 1.9
Obsoletes: NetworkManager-systemd
Obsoletes: dhcdbd < 3.0-1
# sr at Latn vs. sr at latin
diff --git a/ifcfg-path.patch b/ifcfg-path.patch
index ae23c2a..6317c39 100644
--- a/ifcfg-path.patch
+++ b/ifcfg-path.patch
@@ -1,15 +1,13 @@
TODO: make it configurable via dist tag in configure.ac
---- NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/common.h~ 2011-05-31 10:37:37.000000000 +0300
-+++ NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/common.h 2011-08-19 11:07:06.325518503 +0300
-@@ -36,7 +36,9 @@
+--- NetworkManager-1.4.0/src/settings/plugins/ifcfg-rh/common.h.orig 2016-09-26 21:39:01.171161668 +0200
++++ NetworkManager-1.4.0/src/settings/plugins/ifcfg-rh/common.h 2016-09-26 21:53:39.584484971 +0200
+@@ -36,7 +36,7 @@
#define AUGNEW_TAG ".augnew"
#define AUGTMP_TAG ".augtmp"
--#define IFCFG_DIR SYSCONFDIR"/sysconfig/network-scripts"
-+#ifndef IFCFG_DIR
-+#define IFCFG_DIR SYSCONFDIR"/sysconfig/interfaces"
-+#endif
+-#define IFCFG_DIR SYSCONFDIR "/sysconfig/network-scripts"
++#define IFCFG_DIR SYSCONFDIR "/sysconfig/interfaces"
#define IFCFG_PLUGIN_NAME "ifcfg-rh"
- #define IFCFG_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
+ #define IFCFG_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 689b858..0fddee9 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -122,9 +122,9 @@
#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 @@
+--- NetworkManager-1.4.0/src/nm-sleep-monitor.c.orig 2016-08-24 15:09:03.000000000 +0200
++++ NetworkManager-1.4.0/src/nm-sleep-monitor.c 2016-09-27 16:43:07.397044526 +0200
+@@ -26,6 +26,10 @@
#include <sys/stat.h>
#include <gio/gunixfdlist.h>
@@ -135,66 +135,62 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
-@@ -33,23 +37,18 @@
- #error either define SUSPEND_RESUME_SYSTEMD or SUSPEND_RESUME_CONSOLEKIT
- #endif
+@@ -40,13 +44,24 @@
--#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)
--#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
+ #define _NMLOG_PREFIX_NAME "sleep-monitor-sd"
+
+ #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_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"
+@@ -55,12 +70,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_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
+
+ #endif
+
+@@ -342,6 +351,17 @@
{
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) {
-+ 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);
-+ } else {
-+#endif
++ 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,
-+ CK_SUSPEND_DBUS_NAME, CK_SUSPEND_DBUS_PATH, CK_SUSPEND_DBUS_INTERFACE,
-+ NULL,
++ SD_SUSPEND_DBUS_NAME, SD_SUSPEND_DBUS_PATH, SD_SUSPEND_DBUS_INTERFACE,
++ self->cancellable,
+ (GAsyncReadyCallback) on_proxy_acquired, self);
-+#ifdef SUSPEND_RESUME_SYSTEMD
-+ }
++ else
+#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,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/13a8788ce0a1d013382feacd874a42072c4c68f4
More information about the pld-cvs-commit
mailing list