[arch-commits] Commit in networkmanager/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, December 7, 2020 @ 20:24:40
  Author: heftig
Revision: 403084

1.28.0-2: Disable resolvconf support

NM 1.28 changed the way detection of the default resolv.conf handler
works; it now prefers using resolvconf if available. However, this
does not work properly if systemd-resolvconf is installed, as NM
already configures systemd-resolved over D-Bus.

So we get the choice between enabling resolvconf support (supporting
openresolv but crashing and burning if systemd-resolvconf is
installed) and disabling resolvconf support, which then allows other
network managers to use systemd-resolvconf to merge configuration for
their interfaces with NetworkManager's.

Choose the latter and disable resolvconf support.

Modified:
  networkmanager/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-07 19:33:04 UTC (rev 403083)
+++ PKGBUILD	2020-12-07 20:24:40 UTC (rev 403084)
@@ -8,7 +8,7 @@
 pkgbase=networkmanager
 pkgname=(networkmanager libnm nm-cloud-setup)
 pkgver=1.28.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network connection manager and user applications"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(x86_64)
@@ -17,7 +17,7 @@
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
              iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
-             glib2-docs iwd dnsmasq openresolv libpsl audit meson)
+             glib2-docs iwd dnsmasq libpsl audit meson)
 checkdepends=(libx11 python-dbus)
 _commit=6f32c5c10736d194322c760b108ce7d5de44d4a0  # tags/1.28.0^0
 source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
@@ -56,6 +56,11 @@
     # configuration plugins
     -D config_plugins_default=keyfile
 
+    # handlers for resolv.conf
+    -D resolvconf=no
+    -D netconfig=no
+    -D config_dns_rc_manager_default=auto
+
     # dhcp clients
     -D dhcpcd=no
 
@@ -94,7 +99,6 @@
               'modemmanager: cellular network support'
               'iwd: wpa_supplicant alternative'
               'dhclient: alternative DHCP client'
-              'openresolv: alternative resolv.conf manager'
               'firewalld: Firewall support')
   backup=(etc/NetworkManager/NetworkManager.conf)
   groups=(gnome)