From: Jakub Bogusz Date: Sun, 28 May 2017 07:33:13 +0000 (+0200) Subject: - updated to 1.8.0 X-Git-Tag: auto/th/NetworkManager-1.8.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2FNetworkManager.git;a=commitdiff_plain;h=99089a17af6c78cd99c4a6d4f07ff4645f3b3388 - updated to 1.8.0 - updated systemd-fallback patch --- diff --git a/NetworkManager.spec b/NetworkManager.spec index 69817f0..a30d050 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.6.2 +Version: 1.8.0 Release: 1 Epoch: 2 License: GPL v2+ Group: Networking/Admin -Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/%{name}-%{version}.tar.xz -# Source0-md5: 89c975afe19fbac854191edb6e9bcd3b +Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/%{name}-%{version}.tar.xz +# Source0-md5: de0e70933a17ee6a682e8440015c9b1e Source1: %{name}.conf Source3: %{name}.tmpfiles Source4: %{name}.init @@ -25,6 +25,7 @@ BuildRequires: audit-libs-devel BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.12 BuildRequires: bluez-libs-devel >= 5.0 +BuildRequires: curl-devel >= 7.24.0 BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.100 BuildRequires: gettext-tools >= 0.17 @@ -37,8 +38,8 @@ BuildRequires: intltool >= 0.40.0 BuildRequires: jansson-devel BuildRequires: libndp-devel BuildRequires: libnl-devel >= 3.2.8 +BuildRequires: libpsl-devel >= 0.1 BuildRequires: libselinux-devel -BuildRequires: libsoup-devel >= 2.40.0 BuildRequires: libteamdctl-devel >= 1.9 BuildRequires: libtool >= 2:2.2 BuildRequires: libuuid-devel @@ -55,8 +56,7 @@ BuildRequires: rpmbuild(macros) >= 1.673 BuildRequires: sed >= 4.0 %{?with_systemd:BuildRequires: systemd-devel >= 1:209} BuildRequires: tar >= 1:1.22 -BuildRequires: udev-devel -BuildRequires: udev-glib-devel >= 1:165 +BuildRequires: udev-devel >= 1:175 %{?with_vala:BuildRequires: vala >= 2:0.17.1.24} BuildRequires: xz Requires(post,preun): /sbin/chkconfig @@ -67,10 +67,11 @@ Suggests: ConsoleKit-x11 %else Requires: ConsoleKit-x11 %endif +Requires: curl-libs >= 7.24.0 Requires: dhcp-client Requires: filesystem >= 3.0-37 Requires: libnl >= 3.2.8 -Requires: libsoup >= 2.40.0 +Requires: libpsl >= 0.1 Requires: libteamdctl >= 1.9 Requires: newt >= 0.52.15 Requires: polkit >= 0.97 @@ -117,7 +118,7 @@ Group: Libraries Requires: dbus-glib >= 0.100 Requires: glib2 >= 1:2.38.0 Requires: nss >= 3.11 -Requires: udev-glib >= 1:165 +Requires: udev-libs >= 1:175 Conflicts: NetworkManager < 0.6.4-0.2 %description libs @@ -135,7 +136,6 @@ Requires: dbus-glib-devel >= 0.100 Requires: glib2-devel >= 1:2.38.0 Requires: libuuid-devel Requires: nss-devel >= 3.11 -Requires: udev-glib-devel >= 1:165 %description devel Network Manager includes and more. @@ -202,13 +202,15 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli). %{__autoheader} %{__automake} %configure \ - --disable-silent-rules \ - --with-html-dir=%{_gtkdocdir} \ --enable-gtk-doc \ --enable-ifcfg-rh \ --enable-more-warnings \ + --disable-silent-rules \ + --enable-static \ + %{!?with_vala:--disable-vala} \ --with-dhclient=/sbin/dhclient \ --with-dhcpcd=/sbin/dhcpcd \ + --with-html-dir=%{_gtkdocdir} \ --with-iptables=/usr/sbin/iptables \ --with-nmcli \ --with-system-ca-path=/etc/certs \ @@ -220,9 +222,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli). --with-pppoe=/usr/sbin/pppoe \ --with-resolvconf=/sbin/resolvconf \ --with-udev-dir=/lib/udev \ - --with-dist-version=%{version}-%{release} \ - --enable-static \ - %{!?with_vala:--disable-vala} + --with-dist-version=%{version}-%{release} %{__make} diff --git a/systemd-fallback.patch b/systemd-fallback.patch index b4b4630..b27bacb 100644 --- a/systemd-fallback.patch +++ b/systemd-fallback.patch @@ -1,6 +1,6 @@ ---- 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 @@ -9,33 +9,31 @@ else have_systemd_logind=no fi -@@ -447,12 +447,13 @@ if test "$have_systemd_logind" = "yes"; - session_tracking="$session_tracking, systemd-logind" - fi +@@ -477,11 +477,12 @@ + if test "$use_consolekit" = "yes"; then -- AC_DEFINE([SESSION_TRACKING_CONSOLEKIT], 1, [Define to 1 if ConsoleKit is available]) + 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])) + AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|elogind|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.6.0/src/nm-session-monitor.c.orig 2017-01-16 15:08:37.000000000 +0100 -+++ NetworkManager-1.6.0/src/nm-session-monitor.c 2017-01-26 20:00:57.570052887 +0100 -@@ -29,6 +29,7 @@ - #include +--- 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 +#include #include + #define LOGIND_NAME "systemd-logind" #endif - -@@ -53,13 +54,11 @@ struct _NMSessionMonitor { +@@ -65,13 +66,11 @@ struct _NMSessionMonitor { } sd; #endif @@ -49,7 +47,7 @@ }; struct _NMSessionMonitorClass { -@@ -132,7 +131,6 @@ st_sd_finalize (NMSessionMonitor *monito +@@ -144,7 +143,6 @@ st_sd_finalize (NMSessionMonitor *monito /*****************************************************************************/ @@ -57,7 +55,7 @@ typedef struct { gboolean active; } CkSession; -@@ -266,7 +264,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); } @@ -65,7 +63,7 @@ /*****************************************************************************/ -@@ -338,13 +335,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 @@ -86,13 +84,13 @@ #endif return FALSE; -@@ -356,26 +356,27 @@ static void +@@ -368,26 +368,28 @@ static void nm_session_monitor_init (NMSessionMonitor *monitor) { #ifdef SESSION_TRACKING_SYSTEMD + if (sd_booted () > 0) { st_sd_init (monitor); - _LOGD ("using systemd-logind session tracking"); + _LOGD ("using "LOGIND_NAME" session tracking"); + } else #endif @@ -112,15 +110,15 @@ st_sd_finalize (NM_SESSION_MONITOR (object)); + else #endif -- + -#ifdef SESSION_TRACKING_CONSOLEKIT ck_finalize (NM_SESSION_MONITOR (object)); -#endif G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); } ---- 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 +--- 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 #include @@ -132,9 +130,9 @@ #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -40,13 +44,24 @@ +@@ -40,9 +44,9 @@ - #elif defined (SUSPEND_RESUME_SYSTEMD) + #elif defined (SUSPEND_RESUME_SYSTEMD) || defined (SUSPEND_RESUME_ELOGIND) -#define SUSPEND_DBUS_NAME "org.freedesktop.login1" -#define SUSPEND_DBUS_PATH "/org/freedesktop/login1" @@ -143,24 +141,27 @@ +#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_CONSOLEKIT, or SUSPEND_RESUME_UPOWER ++#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 -@@ -55,12 +70,6 @@ + */ +@@ -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" @@ -169,11 +170,11 @@ - -#else - --#error define one of SUSPEND_RESUME_SYSTEMD, 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 -@@ -342,6 +351,17 @@ +@@ -347,6 +356,17 @@ nm_sleep_monitor_init (NMSleepMonitor *s { self->inhibit_fd = -1; self->cancellable = g_cancellable_new ();