community/networkmanager: upgrade to 1.22.0

1 files changed, 95 insertions, 106 deletions

diff --git a/community/networkmanager/py3.patch b/community/networkmanager/py3.patch
index adf9eacf5f..4efcbc1dde 100644
--- a/community/networkmanager/py3.patch
+++ b/community/networkmanager/py3.patch
@@ -1,5 +1,5 @@
 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
-index ff5a360..0e25df1 100755
+index 2742824..8225818 100755
 --- a/clients/tests/test-client.py
 +++ b/clients/tests/test-client.py
 @@ -1,4 +1,4 @@
@@ -9,325 +9,315 @@ index ff5a360..0e25df1 100755
  from __future__ import print_function
  
 diff --git a/examples/python/dbus/add-connection-compat.py b/examples/python/dbus/add-connection-compat.py
-index 8806fca..6588267 100755
+index 6c389f1..936586f 100755
 --- a/examples/python/dbus/add-connection-compat.py
 +++ b/examples/python/dbus/add-connection-compat.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/add-connection.py b/examples/python/dbus/add-connection.py
-index 510f7c8..8d5151e 100755
+index fec9343..dbaf3a2 100755
 --- a/examples/python/dbus/add-connection.py
 +++ b/examples/python/dbus/add-connection.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/add-wifi-eap-connection.py b/examples/python/dbus/add-wifi-eap-connection.py
-index e8ce6df..eae37bd 100755
+index 2611113..f9231bc 100755
 --- a/examples/python/dbus/add-wifi-eap-connection.py
 +++ b/examples/python/dbus/add-wifi-eap-connection.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2011 Red Hat, Inc.
 diff --git a/examples/python/dbus/add-wifi-psk-connection.py b/examples/python/dbus/add-wifi-psk-connection.py
-index d8268b1..a590b6c 100755
+index 8f2294f..4615085 100755
 --- a/examples/python/dbus/add-wifi-psk-connection.py
 +++ b/examples/python/dbus/add-wifi-psk-connection.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2015 Red Hat, Inc.
 diff --git a/examples/python/dbus/create-bond.py b/examples/python/dbus/create-bond.py
-index 4347b2a..2451107 100755
+index 1ce988c..4e6f39c 100755
 --- a/examples/python/dbus/create-bond.py
 +++ b/examples/python/dbus/create-bond.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2015 Red Hat, Inc.
 diff --git a/examples/python/dbus/disconnect-device.py b/examples/python/dbus/disconnect-device.py
-index e884df6..754197e 100755
+index 2387daf..13ee6c1 100755
 --- a/examples/python/dbus/disconnect-device.py
 +++ b/examples/python/dbus/disconnect-device.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 Red Hat, Inc.
 diff --git a/examples/python/dbus/get-active-connection-uuids.py b/examples/python/dbus/get-active-connection-uuids.py
-index 6e4310d..910dbc8 100755
+index 8d0e5c1..15c1358 100755
 --- a/examples/python/dbus/get-active-connection-uuids.py
 +++ b/examples/python/dbus/get-active-connection-uuids.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 Red Hat, Inc.
 diff --git a/examples/python/dbus/is-wwan-default.py b/examples/python/dbus/is-wwan-default.py
-index c16aadc..d0c7918 100755
+index d6e2b12..c4ebb73 100755
 --- a/examples/python/dbus/is-wwan-default.py
 +++ b/examples/python/dbus/is-wwan-default.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2011 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/list-connections.py b/examples/python/dbus/list-connections.py
-index 90aec3b..45f8fc5 100755
+index 43a9c4e..cab312b 100755
 --- a/examples/python/dbus/list-connections.py
 +++ b/examples/python/dbus/list-connections.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 - 2011 Red Hat, Inc.
 diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py
-index fd58695..b1c853a 100755
+index 4a9ebe4..b27d739 100755
 --- a/examples/python/dbus/list-devices.py
 +++ b/examples/python/dbus/list-devices.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2011 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/nm-state.py b/examples/python/dbus/nm-state.py
-index 68979ef..3ca9764 100755
+index 38d10ae..a26bef0 100755
 --- a/examples/python/dbus/nm-state.py
 +++ b/examples/python/dbus/nm-state.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/show-bssids.py b/examples/python/dbus/show-bssids.py
-index b364ed0..7c4294e 100755
+index b4217a5..fa9533f 100755
 --- a/examples/python/dbus/show-bssids.py
 +++ b/examples/python/dbus/show-bssids.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 Red Hat, Inc.
 diff --git a/examples/python/dbus/update-ip4-method.py b/examples/python/dbus/update-ip4-method.py
-index 5a1cd4c..97436db 100755
+index 2c12c2b..fdf4011 100755
 --- a/examples/python/dbus/update-ip4-method.py
 +++ b/examples/python/dbus/update-ip4-method.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2014 Red Hat, Inc.
 diff --git a/examples/python/dbus/update-secrets.py b/examples/python/dbus/update-secrets.py
-index 1fc7320..6d3801a 100755
+index a0b53b7..6805d32 100755
 --- a/examples/python/dbus/update-secrets.py
 +++ b/examples/python/dbus/update-secrets.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2011 - 2012 Red Hat, Inc.
 diff --git a/examples/python/dbus/vpn.py b/examples/python/dbus/vpn.py
-index 0c4b2bb..dc3ef48 100755
+index 8939d26..d85f288 100755
 --- a/examples/python/dbus/vpn.py
 +++ b/examples/python/dbus/vpn.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2009 Novell, Inc.
 diff --git a/examples/python/dbus/wifi-active-ap.py b/examples/python/dbus/wifi-active-ap.py
-index c0ed671..fa8f829 100755
+index 78673e7..db01626 100755
 --- a/examples/python/dbus/wifi-active-ap.py
 +++ b/examples/python/dbus/wifi-active-ap.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2015 Red Hat, Inc.
 diff --git a/examples/python/dbus/wifi-hotspot.py b/examples/python/dbus/wifi-hotspot.py
-index 9b057a2..9378cde 100755
+index d4f17d0..09dcfea 100755
 --- a/examples/python/dbus/wifi-hotspot.py
 +++ b/examples/python/dbus/wifi-hotspot.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2010 - 2012 Red Hat, Inc.
 diff --git a/examples/python/gi/add_connection.py b/examples/python/gi/add_connection.py
-index 3b0abef..eac7977 100755
+index 9cf9e34..648a2e8 100755
 --- a/examples/python/gi/add_connection.py
 +++ b/examples/python/gi/add_connection.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- 
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2014 Red Hat, Inc.
 diff --git a/examples/python/gi/deactivate-all.py b/examples/python/gi/deactivate-all.py
-index 7a9b2ce..2a4906c 100755
+index 3af350e..dce04bb 100755
 --- a/examples/python/gi/deactivate-all.py
 +++ b/examples/python/gi/deactivate-all.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- 
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2015 Red Hat, Inc.
 diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
-index 70ab887..98b8862 100755
+index 18848d0..e974e46 100755
 --- a/examples/python/gi/device-state-ip4config.py
 +++ b/examples/python/gi/device-state-ip4config.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2012 Red Hat, Inc.
 diff --git a/examples/python/gi/firewall-zone.py b/examples/python/gi/firewall-zone.py
-index 6be18dd..260c465 100755
+index 6cbd8c2..00bbe27 100755
 --- a/examples/python/gi/firewall-zone.py
 +++ b/examples/python/gi/firewall-zone.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2013 - 2014 Red Hat, Inc.
 diff --git a/examples/python/gi/get-active-connections.py b/examples/python/gi/get-active-connections.py
-index d7d3566..56d2c21 100755
+index 072f245..8f0da1c 100755
 --- a/examples/python/gi/get-active-connections.py
 +++ b/examples/python/gi/get-active-connections.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2014 Red Hat, Inc.
 diff --git a/examples/python/gi/get_ips.py b/examples/python/gi/get_ips.py
-index 48bbac6..2b82e7e 100755
+index 13b0a8b..54e7859 100755
 --- a/examples/python/gi/get_ips.py
 +++ b/examples/python/gi/get_ips.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2014 Red Hat, Inc.
 diff --git a/examples/python/gi/list-connections.py b/examples/python/gi/list-connections.py
-index 4cd15fe..c1d0403 100755
+index 7278faf..0bb4bcd 100755
 --- a/examples/python/gi/list-connections.py
 +++ b/examples/python/gi/list-connections.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- 
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2012 - 2014 Red Hat, Inc.
 diff --git a/examples/python/gi/nm-add-connection2.py b/examples/python/gi/nm-add-connection2.py
-index b78016d..2d0c0a1 100755
+index 01c1ae7..7c77480 100755
 --- a/examples/python/gi/nm-add-connection2.py
 +++ b/examples/python/gi/nm-add-connection2.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2019 Red Hat, Inc.
 diff --git a/examples/python/gi/nm-connection-update-stable-id.py b/examples/python/gi/nm-connection-update-stable-id.py
-index bd4f12b..f4a18d2 100755
+index 3629d07..7269687 100755
 --- a/examples/python/gi/nm-connection-update-stable-id.py
 +++ b/examples/python/gi/nm-connection-update-stable-id.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2017 Red Hat, Inc.
 diff --git a/examples/python/gi/nm-update2.py b/examples/python/gi/nm-update2.py
-index 36449fd..f990769 100755
+index 5a65879..68189d8 100755
 --- a/examples/python/gi/nm-update2.py
 +++ b/examples/python/gi/nm-update2.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-diff --git a/examples/python/gi/nm-wg-set b/examples/python/gi/nm-wg-set
-index 5f284c2..d9db2f8 100755
---- a/examples/python/gi/nm-wg-set
-+++ b/examples/python/gi/nm-wg-set
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2019 Red Hat, Inc.
 diff --git a/examples/python/gi/setting-user-data.py b/examples/python/gi/setting-user-data.py
-index d5e0010..db3b9a1 100755
+index fd86445..ca051d9 100755
 --- a/examples/python/gi/setting-user-data.py
 +++ b/examples/python/gi/setting-user-data.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- 
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
+ # Copyright (C) 2017 Red Hat, Inc.
 diff --git a/examples/python/gi/show-wifi-networks.py b/examples/python/gi/show-wifi-networks.py
-index 6eb6ac9..0308bd2 100755
+index e1ee4c3..4117a36 100755
 --- a/examples/python/gi/show-wifi-networks.py
 +++ b/examples/python/gi/show-wifi-networks.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # coding=utf-8
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
 diff --git a/examples/python/gi/update-ip4-method.py b/examples/python/gi/update-ip4-method.py
-index e4c603f..4cb742f 100755
+index 9bba619..8893f10 100755
 --- a/examples/python/gi/update-ip4-method.py
 +++ b/examples/python/gi/update-ip4-method.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0+
  #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+ # Copyright (C) 2014 Red Hat, Inc.
 diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
-index 7e89007..f5d31c2 100755
+index 025689e..eb17f22 100755
 --- a/libnm/generate-setting-docs.py
 +++ b/libnm/generate-setting-docs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of the GNU Lesser General Public
- # License as published by the Free Software Foundation; either
+ # SPDX-License-Identifier: LGPL-2.1+
+ #
+ # Copyright (C) 2009 - 2017 Red Hat, Inc.
 diff --git a/src/tests/test-secret-agent.py b/src/tests/test-secret-agent.py
 index d8cabc6..5f0ed5e 100755
 --- a/src/tests/test-secret-agent.py
@@ -339,7 +329,7 @@ index d8cabc6..5f0ed5e 100755
  from gi.repository import GLib
  import sys
 diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
-index c921aed..030546f 100755
+index 56a53a4..9d712fe 100755
 --- a/tools/test-networkmanager-service.py
 +++ b/tools/test-networkmanager-service.py
 @@ -1,4 +1,4 @@
@@ -348,4 +338,3 @@ index c921aed..030546f 100755
  
  from __future__ import print_function
  
-