version 1.10.5dev+3+g5159c34ea-1

2 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c70fa1735775..ff98ca0c586d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jan 12 07:10:26 UTC 2018
+# Fri Feb 16 06:49:12 UTC 2018
 pkgbase = networkmanager-consolekit
 	pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems and user applications
-	pkgver = 1.10.3dev+38+g78ef57197
+	pkgver = 1.10.5dev+3+g5159c34ea
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/NetworkManager
 	install = networkmanager.install
@@ -24,7 +24,8 @@ pkgbase = networkmanager-consolekit
 	makedepends = git
 	makedepends = jansson
 	makedepends = glib2-docs
-	depends = libnm-glib>=1.10.3dev+38+g78ef57197
+	makedepends = dhcpcd
+	depends = libnm-glib>=1.10.5dev+3+g5159c34ea
 	depends = iproute2
 	depends = polkit-consolekit
 	depends = consolekit
@@ -38,16 +39,16 @@ pkgbase = networkmanager-consolekit
 	depends = curl
 	optdepends = modemmanager: for modem management service
 	optdepends = dhclient: External DHCP client
-	optdepends = dhcpcd: alternative DHCP client; does not support DHCPv6
+	optdepends = dhcpcd: alternative DHCP client
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: bluetooth support
 	optdepends = openresolv: resolvconf support
 	optdepends = ppp: dialup connection support
-	provides = networkmanager=1.10.3dev+38+g78ef57197
+	provides = networkmanager=1.10.5dev+3+g5159c34ea
 	conflicts = networkmanager
 	replaces = networkmanager
 	backup = etc/NetworkManager/NetworkManager.conf
-	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=78ef571972aa3bf81b287d767ae02471e2924027
+	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3
 	source = 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
 	source = NetworkManager.conf
 	source = networkmanager.rc
diff --git a/PKGBUILD b/PKGBUILD
index 322f605c3fcb..ee506a80995d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Chris Cromer <chris@cromer.cl>
 
 pkgname=networkmanager-consolekit
-pkgver=1.10.3dev+38+g78ef57197
+pkgver=1.10.5dev+3+g5159c34ea
 pkgrel=1
 _pppver=2.4.7
 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems and user applications"
@@ -22,10 +22,10 @@ depends=("libnm-glib>=$pkgver" 'iproute2' 'polkit-consolekit' 'consolekit'
          'bluez-libs' 'curl')
 makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc'
              "ppp=$_pppver" 'modemmanager' 'vala' 'perl-yaml' 'python-gobject'
-             'git' 'jansson' 'glib2-docs')
+             'git' 'jansson' 'glib2-docs' 'dhcpcd')
 optdepends=('modemmanager: for modem management service'
             'dhclient: External DHCP client'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+            'dhcpcd: alternative DHCP client'
             'dnsmasq: connection sharing'
             'bluez: bluetooth support'
             'openresolv: resolvconf support'
@@ -36,7 +36,7 @@ conflicts=('networkmanager')
 backup=('etc/NetworkManager/NetworkManager.conf')
 groups=('gnome')
 install=networkmanager.install
-_commit=78ef571972aa3bf81b287d767ae02471e2924027  # nm-1-10
+_commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3  # nm-1-10
 source=(#https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
         "git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
         0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
@@ -74,6 +74,7 @@ build() {
     --disable-ifnet \
     --disable-ifupdown \
     --disable-lto \
+    --disable-more-logging \
     --disable-more-warnings \
     --disable-static \
     --enable-bluez5-dun \
@@ -90,12 +91,14 @@ build() {
     --enable-tests=no \
     --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=syslog \
     --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-dnsmasq=/usr/bin/dnsmasq \
     --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \
     --with-hostname-persist=default \
@@ -115,8 +118,8 @@ build() {
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
     --with-wext \
-    --without-dhcpcd \
     --without-libaudit \
+    --without-more-asserts \
     --without-netconfig \
     --without-ofono \
     --without-selinux \