$ git diff --patch-with-stat --summary 4dfe3676cf0f952e18507e050b4617a309887796..fc861164a26b0cecedd522b85015984d4c1e3796

 .abf.yml                                 |  2 +-
 0001-Add-Requires.private-glib-2.0.patch | 26 -----------
 NetworkManager.conf                      |  3 --
 networkmanager.spec                      | 76 +++++++++++++++++++++-----------
 shell-symbol-fetch-fix.patch             |  8 ----
 5 files changed, 51 insertions(+), 64 deletions(-)
 delete mode 100644 0001-Add-Requires.private-glib-2.0.patch
 delete mode 100644 shell-symbol-fetch-fix.patch

diff --git a/.abf.yml b/.abf.yml
index df58785..686edc9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  NetworkManager-1.32.4.tar.xz: 6e5098384bde026ad52b501248457ba348290178
+  NetworkManager-1.38.2.tar.xz: 61da95fe69c1aa71ea0b035f823545899165bff2
diff --git a/0001-Add-Requires.private-glib-2.0.patch b/0001-Add-Requires.private-glib-2.0.patch
deleted file mode 100644
index 3b4ab29..0000000
--- a/0001-Add-Requires.private-glib-2.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Thu, 27 Aug 2015 11:13:40 -0500
-Subject: [PATCH] Add Requires.private: glib-2.0
-
-since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
-a dependency to glib was added, but this wasn't reflected in pkg-config
-deps... until now.
----
- NetworkManager.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
-index 877c344..a0557ee 100644
---- a/NetworkManager.pc.in
-+++ b/NetworkManager.pc.in
-@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
- Name: NetworkManager
- Description: System for maintaining active network connection
- Requires:
-+Requires.private: glib-2.0
- Version: @VERSION@
- Cflags: -I${includedir}/NetworkManager
--- 
-1.9.3
-
diff --git a/NetworkManager.conf b/NetworkManager.conf
index 3ac6d16..7d166a0 100644
--- a/NetworkManager.conf
+++ b/NetworkManager.conf
@@ -1,8 +1,5 @@
 [main]
 plugins=keyfile
-dhcp=internal
-dns=default
-rc-manager=symlink
 
 [logging]
 level=WARN
diff --git a/networkmanager.spec b/networkmanager.spec
index 75abf25..37c4de8 100644
--- a/networkmanager.spec
+++ b/networkmanager.spec
@@ -1,3 +1,7 @@
+# NM relies on binutils __stop_SECTIONNAME symbols
+# not currently generated by lld
+%global optflags %{optflags} -fuse-ld=gold
+
 %define url_ver %(echo %{version}|cut -d. -f1,2)
 
 %define rname NetworkManager
@@ -25,29 +29,25 @@
 
 Name:		networkmanager
 Summary:	Network connection manager and user applications
-Version:	1.32.4
-Release:	1
+Version:	1.38.2
+Release:	2
 Group:		System/Base
 License:	GPLv2+
 Url:		http://www.gnome.org/projects/NetworkManager/
 Source0:	https://download.gnome.org/sources/NetworkManager/%{url_ver}/%{rname}-%{version}.tar.xz
 Source1:	NetworkManager.conf
 Source3:	00-wifi-backend.conf
-# from arch
-Patch4:		0001-Add-Requires.private-glib-2.0.patch
-#Patch5:	       shell-symbol-fetch-fix.patch
+
 # OpenMandriva specific patches
 Patch51:	networkmanager-0.9.8.4-add-systemd-alias.patch
 Patch52:	networkmanager-1.26.0-no-we-are-not-redhat.patch
 BuildRequires:	meson
 BuildRequires:	cmake
-BuildRequires:	ninja
 BuildRequires:	gtk-doc
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	intltool
 BuildRequires:	iptables
 BuildRequires:	pkgconfig(readline)
-BuildRequires:	libiw-devel
 BuildRequires:	ppp-devel = %{ppp_version}
 BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(ext2fs)
@@ -58,7 +58,7 @@ BuildRequires:	pkgconfig(libsoup-2.4)
 BuildRequires:	pkgconfig(mm-glib)
 BuildRequires:	pkgconfig(libsystemd)
 BuildRequires:	pkgconfig(nss)
-BuildRequires:	systemd-macros
+BuildRequires:	systemd-rpm-macros
 BuildRequires:	pkgconfig(glibmm-2.4)
 BuildRequires:	pkgconfig(gnutls)
 BuildRequires:	pkgconfig(polkit-gobject-1)
@@ -74,7 +74,9 @@ BuildRequires:	pkgconfig(libcurl)
 BuildRequires:	python3dist(pygobject)
 BuildRequires:	pkgconfig(udev)
 BuildRequires:	pkgconfig(vapigen)
-BuildRequires:	mobile-broadband-provider-info-devel
+BuildRequires:	pkgconfig(mobile-broadband-provider-info)
+# So we can locate polkit-agent-helper-1
+BuildRequires:	polkit
 # For wext support
 BuildRequires:	kernel-headers >= 4.11
 #BuildRequires:	python-gobject3-devel
@@ -173,7 +175,6 @@ Support for teaming network connections with NetworkManager
 Summary:	Support for controlling WiFi connections with NetworkManager
 Group:		System/Libraries
 Requires:	%{name} = %{EVRD}
-Requires:	wireless-tools
 Requires:	wireless-regdb
 Requires:	(wpa_supplicant or iwd)
 # Change once iwd becomes better than wireless-tools on non-Intel:
@@ -201,23 +202,35 @@ Requires:	modemmanager
 %description ppp
 Support for controlling PPP connections with NetworkManager
 
+%package ifcfg-rh
+Summary:	NetworkManager support for Red Hat style ifcfg-* config files
+Group:		System/Libraries
+Requires:	%{name} = %{EVRD}
+
+%description ifcfg-rh
+NetworkManager support for Red Hat style ifcfg-* config files
+
+OpenMandriva does not use Red Hat style ifcfg-* config files, but some
+third party applications (such as cloud-init) do. Install this package
+if you need to run those applications.
+
 %prep
 %autosetup -p1 -n %{rname}-%{version}
 
 %build
 %define _disable_ld_no_undefined 1
 
-%meson -Dsystemdsystemunitdir="%{_unitdir}" \
+%meson \
+    -Dsystemdsystemunitdir="%{_unitdir}" \
     -Dsystem_ca_path="%{_sysconfdir}/pki/tls/certs" \
-    -Dudev_dir="/lib/udev" \
-    -Diptables="%{_sbindir}/iptables" \
+    -Dudev_dir="$(dirname %{_udevrulesdir})" \
+    -Diptables="%{_bindir}/iptables-nft" \
     -Ddist_version="%{version}-%{release}" \
     -Dsession_tracking_consolekit=false \
     -Dsession_tracking=systemd \
     -Dsuspend_resume=systemd \
     -Dmodify_system=true \
-    -Dpolkit_agent=true \
-    -Difcfg_rh=false \
+    -Difcfg_rh=true \
     -Dofono=true \
     -Dselinux=false \
     -Dconfig_logging_backend_default=journal \
@@ -228,9 +241,10 @@ Support for controlling PPP connections with NetworkManager
     -Dbluez5_dun=true \
     -Debpf=true \
     -Dresolvconf=no \
-    -Dconfig_dns_rc_manager_default=symlink \
-    -Ddhclient="/sbin/dhclient" \
-    -Ddhcpcd="/sbin/dhcpcd" \
+    -Dconfig_dns_rc_manager_default=auto \
+    -Ddhcpcanon=no \
+    -Ddhcpcd=no \
+    -Dnft=%{_sbindir}/nft \
     -Dconfig_dhcp_default=internal \
     -Dintrospection=true \
     -Dvapi=true \
@@ -310,7 +324,7 @@ fi
 %systemd_postun NetworkManager.service NetworkManager-dispatcher.service
 
 %files -f %{rname}.lang
-%doc AUTHORS NEWS README TODO
+%doc AUTHORS NEWS README* TODO
 %dir %{_sysconfdir}/%{rname}
 %config(noreplace) %{_sysconfdir}/%{rname}/NetworkManager.conf
 %dir %{_sysconfdir}/%{rname}/conf.d
@@ -331,8 +345,9 @@ fi
 %{_libexecdir}/nm-daemon-helper
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dispatcher
-%{_libexecdir}/nm-iface-helper
+#{_libexecdir}/nm-iface-helper
 %{_libexecdir}/nm-initrd-generator
+%{_libexecdir}/nm-priv-helper
 %dir %{_libdir}/NetworkManager
 %dir %{_libdir}/NetworkManager/%{version}-%{release}
 %{_libdir}/pppd/*.*.*/nm-pppd-plugin.so
@@ -343,19 +358,22 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/dbus-1/system.d/nm-dispatcher.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
+%{_datadir}/dbus-1/system.d/nm-priv-helper.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
-/lib/udev/rules.d/*.rules
+%{_udevrulesdir}/*.rules
 /usr/lib/firewalld/zones/nm-shared.xml
 %{_presetdir}/86-%{name}.preset
 %{_unitdir}/NetworkManager-wait-online.service
 %{_unitdir}/NetworkManager-dispatcher.service
+%{_unitdir}/nm-priv-helper.service
 %dir %{_unitdir}/NetworkManager.service.d
 %{_unitdir}/dbus-org.freedesktop.nm-dispatcher.service
 %{_unitdir}/NetworkManager.service
-%{_mandir}/man1/*.1*
-%{_mandir}/man5/*.5*
-%{_mandir}/man7/nmcli-examples.7*
-%{_mandir}/man8/*.8*
+%doc %{_mandir}/man1/*.1*
+%doc %{_mandir}/man5/*.5*
+%doc %{_mandir}/man7/nmcli-examples.7*
+%doc %{_mandir}/man8/*.8*
 %{_datadir}/doc/NetworkManager/examples/server.conf
 
 %files adsl
@@ -367,7 +385,7 @@ fi
 %files openvswitch
 %{_libdir}/NetworkManager/%{version}-%{release}/libnm-device-plugin-ovs.so
 %{_unitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
-%{_mandir}/man7/nm-openvswitch.7*
+%doc %{_mandir}/man7/nm-openvswitch.7*
 
 %files team
 %{_libdir}/NetworkManager/%{version}-%{release}/libnm-device-plugin-team.so
@@ -402,3 +420,9 @@ fi
 
 %files -n %{girname}
 %{_libdir}/girepository-1.0/NM-%{api}.typelib
+
+%files ifcfg-rh
+%{_libdir}/NetworkManager/%{version}-%{release}/libnm-settings-plugin-ifcfg-rh.so
+%{_prefix}/libexec/nm-ifdown
+%{_prefix}/libexec/nm-ifup
+%{_datadir}/dbus-1/system.d/nm-ifcfg-rh.conf
diff --git a/shell-symbol-fetch-fix.patch b/shell-symbol-fetch-fix.patch
deleted file mode 100644
index d7c4a3f..0000000
--- a/shell-symbol-fetch-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- NetworkManager-1.8.4/tools/create-exports-NetworkManager.sh~	2017-09-20 11:59:40.000000000 +0100
-+++ NetworkManager-1.8.4/tools/create-exports-NetworkManager.sh	2017-10-25 09:28:09.239240755 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/zsh
- 
- set -e
- set -o pipefail