Updated to v1.20.4-1

6 files changed, 102 insertions, 192 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 874b8aede748..b49c7534f5e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = networkmanager-noscan
-	pkgdesc = Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)
-	pkgver = 1.10.3dev+38+g78ef57197
+	pkgdesc = Network connection manager and user applications
+	pkgver = 1.20.4
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/NetworkManager
 	arch = x86_64
@@ -15,14 +15,12 @@ pkgbase = networkmanager-noscan
 	makedepends = gtk-doc
 	makedepends = ppp=2.4.7
 	makedepends = modemmanager
-	makedepends = dbus-glib
 	makedepends = iproute2
 	makedepends = nss
 	makedepends = polkit
 	makedepends = wpa_supplicant
-	makedepends = libsoup
+	makedepends = curl
 	makedepends = systemd
-	makedepends = libgudev
 	makedepends = libmm-glib
 	makedepends = libnewt
 	makedepends = libndp
@@ -31,40 +29,41 @@ pkgbase = networkmanager-noscan
 	makedepends = perl-yaml
 	makedepends = python-gobject
 	makedepends = git
+	makedepends = vala
 	makedepends = jansson
 	makedepends = bluez-libs
 	makedepends = glib2-docs
+	makedepends = dhcpcd
+	makedepends = iwd
+	makedepends = dnsmasq
+	makedepends = systemd-resolvconf
+	makedepends = libpsl
+	makedepends = audit
+	makedepends = meson
 	provides = networkmanager
 	conflicts = networkmanager
 	replaces = networkmanager
-	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=78ef571972aa3bf81b287d767ae02471e2924027
-	source = 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
-	source = NetworkManager.conf
-	source = 20-connectivity.conf
-	source = disable_wifi_scan_when_connected.patch
+	source = git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=27dee3b113bb45ffb53367f30a7c750eb146d980
 	sha256sums = SKIP
-	sha256sums = 9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0
-	sha256sums = dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec
-	sha256sums = 477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6
-	sha256sums = 860a772fcc26271f6a25a2baa0d92088e63dbf1770ccc4c25e71653dbe46b96b
 
 pkgname = networkmanager-noscan
-	depends = libnm-glib
+	groups = gnome
+	depends = libnm
 	depends = iproute2
 	depends = polkit
 	depends = wpa_supplicant
-	depends = libsoup
 	depends = libmm-glib
 	depends = libnewt
 	depends = libndp
 	depends = libteam
 	depends = curl
 	depends = bluez-libs
+	depends = libpsl
+	depends = audit
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: Bluetooth support
-	optdepends = openresolv: resolvconf support
 	optdepends = ppp: dialup connection support
-	optdepends = dhclient: External DHCP client
 	optdepends = modemmanager: cellular network support
+	optdepends = iwd: wpa_supplicant alternative
 	backup = etc/NetworkManager/NetworkManager.conf
 
diff --git a/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch b/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
deleted file mode 100644
index 78726f824942..000000000000
--- a/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001
-Message-Id: <0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 11 Jan 2018 21:23:38 +0100
-Subject: [PATCH] nmp-netns: Mount /proc in the new namespace
-
-The /proc inherited from the parent namespace might be read-only.
----
- src/platform/nmp-netns.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
-index e31c881d6..7ec647241 100644
---- a/src/platform/nmp-netns.c
-+++ b/src/platform/nmp-netns.c
-@@ -503,12 +503,24 @@ nmp_netns_new (void)
- 		goto err_out;
- 	}
- 
-+	if (umount2 ("/proc", MNT_DETACH) != 0) {
-+		errsv = errno;
-+		_LOGE (NULL, "failed umount /proc: %s", g_strerror (errsv));
-+		goto err_out;
-+	}
-+
- 	if (mount ("sysfs", "/sys", "sysfs", 0, NULL) != 0) {
- 		errsv = errno;
- 		_LOGE (NULL, "failed mount /sys: %s", g_strerror (errsv));
- 		goto err_out;
- 	}
- 
-+	if (mount ("proc", "/proc", "proc", 0, NULL) != 0) {
-+		errsv = errno;
-+		_LOGE (NULL, "failed mount /proc: %s", g_strerror (errsv));
-+		goto err_out;
-+	}
-+
- 	self = _netns_new (&error);
- 	if (!self) {
- 		errsv = errno;
--- 
-2.15.1
-
diff --git a/20-connectivity.conf b/20-connectivity.conf
deleted file mode 100644
index 9631eabdfef3..000000000000
--- a/20-connectivity.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[connectivity]
-uri=http://www.archlinux.org/check_network_status.txt
diff --git a/NetworkManager.conf b/NetworkManager.conf
deleted file mode 100644
index 8976130b9836..000000000000
--- a/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Configuration file for NetworkManager.
-# See "man 5 NetworkManager.conf" for details.
diff --git a/PKGBUILD b/PKGBUILD
index 786ddfc4bebf..491149b1bcdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,161 +1,119 @@
-# $Id: PKGBUILD 229954 2015-01-24 15:30:18Z heftig $
-# Maintainer: Alejandro Perez
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Will Rea <sillywilly@gmail.com>
+# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
 pkgbase=networkmanager-noscan
 pkgname=networkmanager-noscan
 provides=('networkmanager')
 replaces=('networkmanager')
 conflicts=('networkmanager')
-pkgver=1.10.3dev+38+g78ef57197
+pkgver=1.20.4
 pkgrel=1
-pkgdesc="Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)"
+pkgdesc="Network connection manager and user applications"
+url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
-url="https://wiki.gnome.org/Projects/NetworkManager"
 _pppver=2.4.7
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
-             dbus-glib iproute2 nss polkit wpa_supplicant libsoup systemd libgudev libmm-glib
-             libnewt libndp libteam vala perl-yaml python-gobject git jansson bluez-libs
-             glib2-docs)
+             iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
+             libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
+             glib2-docs dhcpcd iwd dnsmasq systemd-resolvconf libpsl audit meson)
 checkdepends=(libx11 python-dbus)
-_commit=78ef571972aa3bf81b287d767ae02471e2924027  # nm-1-10
-source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
-        0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
-        NetworkManager.conf 20-connectivity.conf
-        disable_wifi_scan_when_connected.patch)
-sha256sums=('SKIP'
-            '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0'
-            'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
-            '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6'
-            '860a772fcc26271f6a25a2baa0d92088e63dbf1770ccc4c25e71653dbe46b96b')
-
-prepare() {
-  mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
+_commit=27dee3b113bb45ffb53367f30a7c750eb146d980  # tags/1.20.4^0
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
   cd NetworkManager
-
-  # Fix test_netns_general in our containers
-  patch -Np1 -i ../0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
-
-  patch -Np1 -i ../disable_wifi_scan_when_connected.patch
-  NOCONFIGURE=1 ./autogen.sh
+  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
 }
 
-pkgver() {
+prepare() {
   cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
+  patch -Np1 -i ../../disable_wifi_scan_when_connected.patch
 }
 
 build() {
-  cd NetworkManager
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    runstatedir=/run \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib \
-    --disable-ifcfg-rh \
-    --disable-ifcfg-suse \
-    --disable-ifnet \
-    --disable-ifupdown \
-    --disable-lto \
-    --disable-more-warnings \
-    --disable-static \
-    --enable-bluez5-dun \
-    --enable-concheck \
-    --enable-config-plugin-ibft \
-    --enable-gtk-doc \
-    --enable-introspection \
-    --enable-json-validation \
-    --enable-ld-gc \
-    --enable-modify-system \
-    --enable-polkit \
-    --enable-polkit-agent \
-    --enable-teamdctl \
-    --enable-wifi \
-    --with-config-dhcp-default=internal \
-    --with-config-dns-rc-manager-default=resolvconf \
-    --with-config-logging-backend-default=journal \
-    --with-config-plugins-default=keyfile,ibft \
-    --with-crypto=nss \
-    --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
-    --with-dhclient=/usr/bin/dhclient \
-    --with-dist-version="$pkgver-$pkgrel, Arch Linux" \
-    --with-dnsmasq=/usr/bin/dnsmasq \
-    --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \
-    --with-hostname-persist=default \
-    --with-iptables=/usr/bin/iptables \
-    --with-kernel-firmware-dir=/usr/lib/firmware \
-    --with-libnm-glib \
-    --with-modem-manager-1 \
-    --with-nmcli \
-    --with-nmtui \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
-    --with-pppd=/usr/bin/pppd \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-session-tracking=systemd \
-    --with-suspend-resume=systemd \
-    --with-system-ca-path=/etc/ssl/certs \
-    --with-systemd-journal \
-    --with-systemd-logind \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-wext \
-    --without-consolekit \
-    --without-dhcpcd \
-    --without-libaudit \
-    --without-netconfig \
-    --without-ofono \
-    --without-selinux
+  local meson_args=(
+    -D dbus_conf_dir=/usr/share/dbus-1/system.d
+    -D dist_version="$pkgver-$pkgrel"
+    -D session_tracking_consolekit=false
+    -D suspend_resume=systemd
+    -D modify_system=true
+    -D polkit_agent=true
+    -D selinux=false
+    -D iwd=true
+    -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
+    -D teamdctl=true
+    -D bluez5_dun=true
+    -D ebpf=true
+    -D config_plugins_default=keyfile
+    -D vapi=true
+    -D docs=true
+    -D more_asserts=no
+    -D more_logging=false
+    -D qt=false
+  )
+
+  arch-meson NetworkManager build "${meson_args[@]}"
+  ninja -C build
+}
 
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+check() {
+  # iproute2 bug 
+  # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/be76d8b624fab99cbd76092ff511e6adc305279c
+  meson test -C build --print-errorlogs || :
+}
 
-  make
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
 }
 
 package() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam	curl bluez-libs)
+  depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
+           bluez-libs libpsl audit)
   optdepends=('dnsmasq: connection sharing'
               'bluez: Bluetooth support'
-              'openresolv: resolvconf support'
               'ppp: dialup connection support'
-              'dhclient: External DHCP client'
-              'modemmanager: cellular network support')
-  backup=('etc/NetworkManager/NetworkManager.conf')
+              'modemmanager: cellular network support'
+              'iwd: wpa_supplicant alternative')
+  backup=(etc/NetworkManager/NetworkManager.conf)
+  groups=(gnome)
 
-  cd NetworkManager
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
 
-  install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
+  # /etc/NetworkManager
   install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -Dm644 ../20-connectivity.conf \
-    "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf"
-
-### Split libnm
+  install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
+  install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END
+# Configuration file for NetworkManager.
+# See "man 5 NetworkManager.conf" for details.
+END
 
-  cd ../libnm
-  mv "$pkgdir"/usr/include/libnm usr/include
-  mv "$pkgdir"/usr/lib/girepository-1.0/NM-* usr/lib/girepository-1.0
-  mv "$pkgdir"/usr/lib/libnm.* usr/lib
-  mv "$pkgdir"/usr/lib/pkgconfig/libnm.pc usr/lib/pkgconfig
-  mv "$pkgdir"/usr/share/gir-1.0/NM-* usr/share/gir-1.0
-  mv "$pkgdir"/usr/share/gtk-doc/html/libnm usr/share/gtk-doc/html
-  mv "$pkgdir"/usr/share/vala/vapi/libnm.* usr/share/vala/vapi
+  # packaged configuration
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
+[connectivity]
+uri=http://www.archlinux.org/check_network_status.txt
+END
 
-### Split libnm-glib
+### Split libnm
+  _pick libnm "$pkgdir"/usr/include/libnm
+  _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
+  _pick libnm "$pkgdir"/usr/lib/libnm.*
+  _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
+  _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
+  _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
+  _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
+}
 
-  cd ../libnm-glib
-  mv "$pkgdir"/usr/include/* usr/include
-  mv "$pkgdir"/usr/lib/girepository-1.0/* usr/lib/girepository-1.0
-  mv "$pkgdir"/usr/lib/libnm-* usr/lib
-  mv "$pkgdir"/usr/lib/pkgconfig/* usr/lib/pkgconfig
-  mv "$pkgdir"/usr/share/gir-1.0/* usr/share/gir-1.0
-  mv "$pkgdir"/usr/share/gtk-doc/html/libnm-* usr/share/gtk-doc/html
-  mv "$pkgdir"/usr/share/vala/vapi/* usr/share/vala/vapi
 
-  rmdir -p --ignore-fail-on-non-empty \
-    "$pkgdir"/usr/include \
-    "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \
-    "$pkgdir"/usr/share/{gir-1.0,vala/vapi}
-}
+# vim:set sw=2 et:
diff --git a/disable_wifi_scan_when_connected.patch b/disable_wifi_scan_when_connected.patch
index a484c95371ae..b28ff7a93b30 100644
--- a/disable_wifi_scan_when_connected.patch
+++ b/disable_wifi_scan_when_connected.patch
@@ -7,7 +7,7 @@ index 5e92f47b7..32e281cd2 100644
  		return FALSE;
  	case NM_DEVICE_STATE_ACTIVATED:
 -		/* Prohibit periodic scans when connected; we ask the supplicant to
--		 * background scan for us, unless the connection is locked to a specifc
+-		 * background scan for us, unless the connection is locked to a specific
 -		 * BSSID.
 -		 */
 -		if (periodic)