Update to 1.22.12

.gitignore

@@ -370,3 +370,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.22.6.tar.xz
 /NetworkManager-1.22.8.tar.xz
 /NetworkManager-1.22.10.tar.xz
+/NetworkManager-1.22.12.tar.xz

NetworkManager.spec

@@ -5,8 +5,8 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global rpm_version 1.22.10
-%global real_version 1.22.10
+%global rpm_version 1.22.12
+%global real_version 1.22.12
 %global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
@@ -73,6 +73,11 @@
 %else
 %bcond_without iwd
 %endif
+%if 0%{?fedora} > 31 || 0%{?rhel} > 7
+%bcond_without firewalld_zone
+%else
+%bcond_with firewalld_zone
+%endif
 
 ###############################################################################
 
@@ -112,9 +117,9 @@
 # bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
 # be related to `ulimit -l`. Anyway, this is not usable at the
 # moment.
-%global ebpf_enabled no
+%global ebpf_enabled "no"
 %else
-%global ebpf_enabled no
+%global ebpf_enabled "no"
 %endif
 
 ###############################################################################
@@ -233,6 +238,9 @@ BuildRequires: libasan
 BuildRequires: libubsan
 %endif
 %endif
+%if %{with firewalld_zone}
+BuildRequires: firewalld-filesystem
+%endif
 
 Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
 
@@ -585,7 +593,7 @@ This tool is still experimental.
 %else
 	-Dlibpsl=false \
 %endif
-%if %{ebpf_enabled} != yes
+%if %{ebpf_enabled} != "yes"
 	-Debpf=false \
 %else
 	-Debpf=true \
@@ -735,6 +743,11 @@ intltoolize --automake --copy --force
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--enable-ppp=yes \
 %endif
+%if %{with firewalld_zone}
+	--enable-firewalld-zone \
+%else
+	--disable-firewalld-zone \
+%endif        
 	--with-dist-version=%{version}-%{release} \
 	--with-config-plugins-default=%{config_plugins_default} \
 	--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
@@ -817,6 +830,9 @@ fi
 %post
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
+%if %{with firewalld_zone}
+%firewalld_reload
+%endif
 
 %systemd_post %{systemd_units}
 
@@ -858,6 +874,9 @@ fi
 %postun
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
+%if %{with firewalld_zone}
+%firewalld_reload
+%endif
 
 %systemd_postun %{systemd_units}
 
@@ -923,6 +942,9 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_prefix}/lib/udev/rules.d/*.rules
+%if %{with firewalld_zone}
+%{_prefix}/lib/firewalld/zones/nm-shared.xml
+%endif
 # systemd stuff
 %{systemd_dir}/NetworkManager.service
 %{systemd_dir}/NetworkManager-wait-online.service
@@ -1053,6 +1075,10 @@ fi
 
 
 %changelog
+* Thu May 21 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.22.12-1
+- Update to 1.22.12
+- Ship and use a firewalld zone for connection sharing (rh #1829637)
+
 * Thu Mar 12 2020 Thomas Haller <thaller@redhat.com - 1:1.22.10-1
 - Update to 1.22.10
 

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.22.10.tar.xz) = 342d0c8db2c94992f8f53b13dc4432fe566637e03e1d65cdc44ebf51a4f70d4ec804ebc48ed9cbe010c61abc665f1bb1be22f9364de991d6e5ffc5212b9efd23
+SHA512 (NetworkManager-1.22.12.tar.xz) = 5e64f657fbafe789c287455c84a2f9377f218afd7f40a35ec23e613db88f2aa2f617b7bb6939af48780c92c4f75e76dd1ae3ac0188905958e018ed0d9e541a0a