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

[Jan Steffens]

    Date: Thursday, January 25, 2018 @ 11:32:08
  Author: heftig
Revision: 315438

1.10.3dev+58+g2f991e379-1

Modified:
  networkmanager/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-25 10:42:40 UTC (rev 315437)
+++ PKGBUILD	2018-01-25 11:32:08 UTC (rev 315438)
@@ -8,7 +8,7 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.10.3dev+38+g78ef57197
+pkgver=1.10.3dev+58+g2f991e379
 pkgrel=1
 pkgdesc="Network connection manager and user applications"
 arch=(x86_64)
@@ -18,16 +18,13 @@
 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 vala jansson bluez-libs
-             glib2-docs)
+             glib2-docs dhcpcd)
 checkdepends=(libx11 python-dbus)
-_commit=78ef571972aa3bf81b287d767ae02471e2924027  # nm-1-10
+_commit=2f991e379be7fbe12a1ea717cc9f1142a93192c6  # 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)
+        0001-nmp-netns-Mount-proc-in-the-new-namespace.patch)
 sha256sums=('SKIP'
-            '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0'
-            'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
-            '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6')
+            '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0')
 
 prepare() {
   mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
@@ -58,6 +55,7 @@
     --disable-ifnet \
     --disable-ifupdown \
     --disable-lto \
+    --disable-more-logging \
     --disable-more-warnings \
     --disable-static \
     --enable-bluez5-dun \
@@ -73,12 +71,14 @@
     --enable-teamdctl \
     --enable-wifi \
     --with-config-dhcp-default=internal \
-    --with-config-dns-rc-manager-default=resolvconf \
+    --with-config-dns-rc-manager-default=symlink \
     --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-dhcpcd-supports-ipv6 \
+    --with-dhcpcd=/usr/bin/dhcpcd \
     --with-dist-version="$pkgver-$pkgrel, Arch Linux" \
     --with-dnsmasq=/usr/bin/dnsmasq \
     --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \
@@ -101,8 +101,8 @@
     --with-udev-dir=/usr/lib/udev \
     --with-wext \
     --without-consolekit \
-    --without-dhcpcd \
     --without-libaudit \
+    --without-more-asserts \
     --without-netconfig \
     --without-ofono \
     --without-selinux
@@ -122,9 +122,7 @@
            bluez-libs)
   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')
   groups=('gnome')
@@ -132,11 +130,19 @@
   cd NetworkManager
   make DESTDIR="$pkgdir" install
 
+  # 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
+
+  # /etc/NetworkManager
+  install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
   install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
-  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"
+  install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END
+# Configuration file for NetworkManager.
+# See "man 5 NetworkManager.conf" for details.
+END
 
 ### Split libnm