From 28e6474b9ce7c51b953370ce67d21f0232e975ed Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 29 May 2020 17:28:37 +0200
Subject: [PATCH] Update to 1.24.2 release

---
 .gitignore          |  1 +
 NetworkManager.spec | 42 ++++++++++++++++++++++++++++++++++++++----
 sources             |  2 +-
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 08df0b1..5172202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -373,3 +373,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.23.90.tar.xz
 /NetworkManager-1.23.91.tar.xz
 /NetworkManager-1.24.0.tar.xz
+/NetworkManager-1.24.2.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index c842322..2605b9c 100644
--- a/NetworkManager.spec
+++ b/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.24.0
-%global real_version 1.24.0
+%global rpm_version 1.24.2
+%global real_version 1.24.2
 %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
 
 ###############################################################################
 
@@ -229,10 +234,14 @@ BuildRequires: polkit-devel
 BuildRequires: jansson-devel
 %if %{with sanitizer}
 BuildRequires: libasan
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: libubsan
 %endif
 %endif
+%if %{with firewalld_zone}
+BuildRequires: firewalld-filesystem
+%endif
+BuildRequires: iproute
 
 Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
 
@@ -601,6 +610,11 @@ This tool is still experimental.
 %if %{with ppp}
 	-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
 	-Dppp=true \
+%endif
+%if %{with firewalld_zone}
+	-Dfirewalld_zone=true \
+%else
+	-Dfirewalld_zone=false \
 %endif
 	-Ddist_version=%{version}-%{release} \
 	-Dconfig_plugins_default=%{config_plugins_default} \
@@ -632,8 +646,10 @@ intltoolize --automake --copy --force
 %endif
 %if %{with sanitizer}
 	--with-address-sanitizer=exec \
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 	--enable-undefined-sanitizer \
+%else
+	--disable-undefined-sanitizer \
 %endif
 %else
 	--with-address-sanitizer=no \
@@ -732,6 +748,11 @@ intltoolize --automake --copy --force
 %if %{with ppp}
 	--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} \
@@ -815,6 +836,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}
 
@@ -856,6 +880,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}
 
@@ -921,6 +948,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
@@ -1051,6 +1081,10 @@ fi
 
 
 %changelog
+* Fri May 29 2020 Thomas Haller <thaller@redhat.com> - 1:1.24.2-1
+- Update to 1.24.2 release
+- ifcfg-rh: handle "802-1x.{,phase2-}ca-path" (rh #1841395, CVE-2020-10754)
+
 * Fri May  8 2020 Thomas Haller <thaller@redhat.com - 1:1.24.0-1
 - Update to 1.24.0
 
diff --git a/sources b/sources
index bb395ca..ef9cd6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.24.0.tar.xz) = 6fea25e11d7872697d5b55f7369922aceda0f44c782a67d3371e3722eab30ae13a4b1a5484b604ade70acd00445d98ce19ed2c68f5ac7bb12bfa1686f8601716
+SHA512 (NetworkManager-1.24.2.tar.xz) = 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923