Hello community,

here is the log from the commit of package NetworkManager for openSUSE:Factory 
checked in at 2018-03-08 10:53:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
 and      /work/SRC/openSUSE:Factory/.NetworkManager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "NetworkManager"

Thu Mar  8 10:53:10 2018 rev:180 rq:583664 version:1.10.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes    
2018-02-28 20:00:54.843910192 +0100
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes       
2018-03-08 10:53:11.730633387 +0100
@@ -1,0 +2,16 @@
+Tue Mar  6 13:01:57 UTC 2018 - fab...@ritter-vogt.de
+
+- Add nm-fix-autoconnect.patch: Fix autoconnect with agent-owned
+  secrets (bgo#794014, boo#1079672).
+
+-------------------------------------------------------------------
+Sat Mar  3 11:01:36 UTC 2018 - seife+...@b1-systems.com
+
+- fix nfs dispatcher script (boo#1083831)
+
+-------------------------------------------------------------------
+Wed Feb 28 16:37:33 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------

New:
----
  nm-fix-autoconnect.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.kbxXRY/_old  2018-03-08 10:53:12.766596093 +0100
+++ /var/tmp/diff_new_pack.kbxXRY/_new  2018-03-08 10:53:12.766596093 +0100
@@ -21,7 +21,6 @@
 # they are touched too
 %define with_cacert_patch 0
 %define _udevdir %(pkg-config --variable udevdir udev)
-
 Name:           NetworkManager
 Version:        1.10.4
 Release:        0
@@ -30,12 +29,10 @@
 Group:          Productivity/Networking/System
 Url:            http://www.gnome.org/projects/NetworkManager/
 Source0:        
http://download.gnome.org/sources/NetworkManager/1.10/%{name}-%{version}.tar.xz
-
 Source1:        nfs
 Source2:        NetworkManager.conf
 Source3:        baselibs.conf
 Source99:       NetworkManager-rpmlintrc
-
 # PATCH-FEATURE-OPENSUSE systemd-network-config.patch -- don't try to start NM 
under systemd if it is disabled in system configuration
 Patch0:         systemd-network-config.patch
 # PATCH-FIX-UPSTREAM nm-probe-radius-server-cert.patch bnc#574266 
g...@suse.com -- Probe the RADIUS server certificate
@@ -50,7 +47,8 @@
 Patch5:         NetworkManager-1.10.4-buildfixes.patch
 # PATCH-FIX-UPSTREAM 
nm-preserve-agent-owned-secrets-on-connection-update.patch bgo#793324 
bsc#1082762 sck...@suse.com -- settings: preserve agent-owned secrets on 
connection update
 Patch6:         nm-preserve-agent-owned-secrets-on-connection-update.patch
-
+# PATCH-FIX-UPSTREAM nm-fix-autoconnect.patch bgo#794014 boo#1079672 
fab...@ritter-vogt.de -- Fix setting the autoconnect block reason
+Patch7:         nm-fix-autoconnect.patch
 BuildRequires:  dnsmasq
 BuildRequires:  fdupes
 BuildRequires:  intltool
@@ -59,9 +57,9 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
 BuildRequires:  ppp-devel
-BuildRequires:  python3-gobject
 # Required for tests
 BuildRequires:  python3-dbus-python
+BuildRequires:  python3-gobject
 BuildRequires:  readline-devel
 BuildRequires:  rp-pppoe
 # Do not use suse-release, it's very late in build chain and not needed
@@ -217,7 +215,7 @@
 Group:          Productivity/Networking/System
 Requires:       NetworkManager = %{version}
 Supplements:    packageand(NetworkManager:branding-upstream)
-Conflicts:      otherproviders(NetworkManager-branding)
+Conflicts:      NetworkManager-branding
 Provides:       NetworkManager-branding = %{version}
 BuildArch:      noarch
 
@@ -244,13 +242,14 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
 pppddir=`ls -1d %{_libdir}/pppd/2*`
 test -n "$pppddir" || exit 1
 export CFLAGS="%{optflags} -fno-strict-aliasing"
-export PYTHON=/usr/bin/python3
+export PYTHON=%{_bindir}/python3
 %configure \
     --disable-silent-rules \
     --with-hostname-persist=suse \

++++++ nfs ++++++
--- /var/tmp/diff_new_pack.kbxXRY/_old  2018-03-08 10:53:12.838593501 +0100
+++ /var/tmp/diff_new_pack.kbxXRY/_new  2018-03-08 10:53:12.838593501 +0100
@@ -52,7 +52,7 @@
     fi
 }
 
-NET_MOUNTS=$(sed -e '/^.*#/d' -e '/^.*:/!d' -e 's/\t/ /g' /etc/fstab | tr -s " 
")$'\n'b
+NET_MOUNTS=$(sed -e '/^.*#/d' -e '/^.*:/!d' -e 's/\t/ /g' /etc/fstab | tr -s " 
")$'\n'
 
 case "$COMMAND" in
     up|dhcp4-change|dhcp6-change)
@@ -66,6 +66,7 @@
         ;;
     pre-down|down|vpn-pre-down)
         printf %s "$NET_MOUNTS" | while IFS= read -r line; do
+            [[ $line ]] || continue
             MOUNT_POINT=$(echo $line | cut -f2 -d" ")
             HOST=$(echo $line |  cut -f1 -d":")
             if other_reaches $HOST; then

++++++ nm-fix-autoconnect.patch ++++++
From: Fabian Vogt <fab...@ritter-vogt.de>
Subject: Fix setting the autoconnect block reason

device_state_changed only sets the autoconnect block reason if:
- The impossible happens (con_v can never be 0, except for integer overflows)
- The agent version id is now different, which means that new agents registered
  meanwhile

That's the opposite of what we need. It leads to only setting the blocked state
if a race condition got detected.

With this patch, the block reason is only set if the agent version id stayed
the same, which means that no agents registered in between.

Index: NetworkManager-1.10.4/src/nm-policy.c
===================================================================
--- NetworkManager-1.10.4.orig/src/nm-policy.c
+++ NetworkManager-1.10.4/src/nm-policy.c
@@ -1760,8 +1760,7 @@ device_state_changed (NMDevice *device,
                                 * We detect this by using a version-id of the 
agent-manager, which increments
                                 * whenever new agents register. */
                                con_v = 
nm_settings_connection_get_last_secret_agent_version_id (connection);
-                               if (   con_v == 0
-                                   || con_v != 
nm_agent_manager_get_agent_version_id (priv->agent_mgr))
+                               if (con_v == 
nm_agent_manager_get_agent_version_id (priv->agent_mgr))
                                        block_no_secrets = TRUE;
                        }
 

Reply via email to