community/networkmanager: upgrade to 1.22.0

4 files changed, 114 insertions, 138 deletions

diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 62d38c7ffd..ba38eb1c1d 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,13 +2,13 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=networkmanager
-pkgver=1.20.8
+pkgver=1.22.0
 pkgrel=0
 pkgdesc="Network Management daemon"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch="all"
 license="GPL-2.0-or-later"
-depends="dhcpcd iptables dbus"
+depends="dhcpcd iptables dbus mobile-broadband-provider-info"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 makedepends="$depends_dev
 	curl-dev
@@ -46,7 +46,6 @@ source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkM
 	musl-fix-includes.patch
 	musl-process-util.patch
 	musl-compar.patch
-	fix-ppc64le-build.patch
 	musl-no-drand.patch
 	py3.patch
 	"
@@ -109,15 +108,14 @@ wifi.backend=iwd
 EOF
 }
 
-sha512sums="e61335e88be83de56d0867bcceb8f73ae426ce708da0849a22542d3cfdfb47b16c179f6974eb916ba6b178c0b251c7f039bc45cb8a1b5b2b6b273b2a2e507c18  NetworkManager-1.20.8.tar.xz
+sha512sums="f6a2f621b42f7788646c81cc61d17261aa6df6351e6acfbc70d3d1b034416476f1c14b2444565d6abac2ee1b9aa2680fdb513b523fe6cad1bc37102d4bee41d0  NetworkManager-1.22.0.tar.xz
 a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faeacefbe3c6c0c748e4ef499a55bb5ee40f0f04bbf766fbbc82  networkmanager.conf
 5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f  networkmanager.initd
 9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6  networkmanager.rules
 9d1a9185b0b50f677a4173a8b67e808ba36971111165ae446e9a15b5c7adcc8cc6d44fa7bddac05762c50d80b04818a483756eaf2aaefe0162e1f37cd070fca4  musl-basic.patch
 095c1d944f3274ba31435cd1af8e2affb4187bdd921a0cc0c185b59810b73cfab7919b5f551bab3d9e4644fbee8f9ac017b4c5d69a771fb68319cbefa37c71a3  musl-network-support.patch
-c4d10e6f7484267d2f1471b7c072bcadc332bff66c0387f7f4cca6604d3ca558e01c63850aff128507d48ea1e8ead1fe415013ca962b7bf4b5b5605f79ff97bf  musl-fix-includes.patch
+693f0a60c25bdc6b07da70b4e7ffd753f6f4504964562fd8f32d2ca4ce840ec0e8036bd8f1484c50bdd7ff6c67667585c3f37d92c83a8bfbf86d9601b1c89215  musl-fix-includes.patch
 b5cd94928ca3ba1fb71aec28d9ff66f319f6d23131e02c90f1dfbfaf16c537935228a9981c95f29ffb74e91752a17801c94d09ca57b7ba98028262b9e8e5d322  musl-process-util.patch
 634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2  musl-compar.patch
-c2dbdf31adb472dc6b14aad6d7a0981b2618880df7c9081ebb9bc6da8af4c5e791c36c4e997878d5e1e7f96bd65814f718e7ae23dcfea5ac5aa91acdab3775ae  fix-ppc64le-build.patch
 342fb3eef0e7057b6d8f1a00687af17dc633387d8a25d475e3e9c8de5712221eec8ada634a189e3458dcbb12b20625b99b552acda3927b5baa61b960ce5740eb  musl-no-drand.patch
-b79a8d9581e843eeb0d773b2ba53f7a8081a788143f9684280f436d8797e7ca1af2e878300e1388f43f60fba3e25358de4245426b80c3d9b001679a72cf37b03  py3.patch"
+929add0500198f5bdeaf06daee34c116155ee7182337d5f104693263263871c108eb5278ef748834408803168636e9ece6e39047bf82160c211da47b34e8ca6b  py3.patch"
diff --git a/community/networkmanager/fix-ppc64le-build.patch b/community/networkmanager/fix-ppc64le-build.patch
deleted file mode 100644
index f03a3b478b..0000000000
--- a/community/networkmanager/fix-ppc64le-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libnm/meson.build b/libnm/meson.build
-index 4b3df97..31c6fa6 100644
---- a/libnm/meson.build
-+++ b/libnm/meson.build
-@@ -162,6 +162,7 @@ libnm = shared_library(
-     libnm_core_dep,
-     uuid_dep,
-     libnm_systemd_shared_no_logging_dep,
-+    libnmdbus_dep,
-   ],
-   c_args: cflags,
-   link_with: libnm_utils,
diff --git a/community/networkmanager/musl-fix-includes.patch b/community/networkmanager/musl-fix-includes.patch
index f05c074abf..33d840e8a4 100644
--- a/community/networkmanager/musl-fix-includes.patch
+++ b/community/networkmanager/musl-fix-includes.patch
@@ -1,8 +1,8 @@
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index bd4fbcc..cb5436f 100644
+index e7a4a05..7578abf 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
-@@ -32,7 +32,11 @@
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -15,22 +15,22 @@ index bd4fbcc..cb5436f 100644
  #include <linux/pkt_sched.h>
  
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 40e068a..aa57ce8 100644
+index 132cf5a..0dd71dd 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+@@ -15,6 +15,7 @@
+ #include <sys/stat.h>
+ #include <sys/sendfile.h>
+ #include <limits.h>
 +#include <asm/types.h>
  
  #include "nm-glib-aux/nm-c-list.h"
  
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index d4b0115..c934f10 100644
+index 305ae52..10cfec6 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
-@@ -20,6 +20,7 @@
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -38,7 +38,7 @@ index d4b0115..c934f10 100644
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -28,7 +29,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -50,11 +50,13 @@ index d4b0115..c934f10 100644
  #include <linux/if_bridge.h>
  #include <linux/if_link.h>
  #include <linux/if_tun.h>
+diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index e1150f9..3cb8390 100644
 --- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
 +++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,7 +8,11 @@
+@@ -7,7 +7,11 @@
+ 
  #include <errno.h>
- #include <string.h>
  #include <sys/ioctl.h>
 +#if defined(__GLIBC__)
  #include <linux/if_arp.h>
@@ -64,4 +66,3 @@ index d4b0115..c934f10 100644
  #include <linux/if_infiniband.h>
  
  #include "sd-dhcp6-client.h"
-
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
  
-