doing some updates

3 files changed, 156 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a95836573cb..4467fa4c1389 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec  1 01:42:34 UTC 2016
+# Thu Mar 16 14:36:57 UTC 2017
 pkgbase = networkmanager-git
 	pkgdesc = Network Management daemon
-	pkgver = 1.5.2.r16400.g9fafb38
+	pkgver = 1.7.1.r17077.gc2dc1c6fa
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager
 	arch = i686
@@ -10,22 +10,34 @@ pkgbase = networkmanager-git
 	license = GPL2
 	license = LGPL2.1
 	checkdepends = libx11
-	checkdepends = python-gobject
 	checkdepends = python-dbus
+	makedepends = intltool
+	makedepends = dhclient
+	makedepends = iptables
+	makedepends = gobject-introspection
+	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 = systemd
+	makedepends = libgudev
+	makedepends = libmm-glib
+	makedepends = libnewt
+	makedepends = libndp
+	makedepends = libteam
+	makedepends = vala
+	makedepends = perl-yaml
 	makedepends = python-gobject
-	makedepends = dhclient
 	makedepends = git
-	makedepends = gobject-introspection
-	makedepends = gtk-doc
-	makedepends = intltool
-	makedepends = iptables
-	makedepends = modemmanager
-	makedepends = ppp=2.4.7
-	makedepends = rp-pppoe
 	makedepends = vala
+	makedepends = jansson
+	makedepends = bluez-libs
+	makedepends = glib2-docs
 	depends = dbus-glib
 	depends = libmm-glib
 	depends = libndp
@@ -48,10 +60,13 @@ pkgbase = networkmanager-git
 	options = !emptydirs
 	source = networkmanager-git::git://github.com/NetworkManager/NetworkManager
 	source = NetworkManager.conf
+	source = 20-connectivity.conf
 	sha256sums = SKIP
 	sha256sums = 759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3
+	sha256sums = 477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6
 	sha512sums = SKIP
 	sha512sums = e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3
+	sha512sums = da52ba9603c279c1c865cc3bf63606e1daeeb2a22c68e4b0077e15c312e251b494c4f0c94bcb27c9f6923f8b69cd7ab9062d9b7ce499222d3d2240864ed9345f
 
 pkgname = networkmanager-git
 	depends = libnm-glib
@@ -63,11 +78,11 @@ pkgname = networkmanager-git
 	depends = libnewt
 	depends = libndp
 	depends = libteam
+	depends = bluez-libs
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: Bluetooth support
 	optdepends = openresolv: resolvconf support
 	optdepends = ppp: dialup connection support
-	optdepends = rp-pppoe: ADSL support
 	optdepends = dhclient: External DHCP client
 	optdepends = modemmanager: cellular network support
 	provides = networkmanager
@@ -75,7 +90,7 @@ pkgname = networkmanager-git
 	backup = etc/NetworkManager/NetworkManager.conf
 
 pkgname = libnm-glib-git
-	pkgdesc = NetworkManager library
+	pkgdesc = NetworkManager client library (legacy)
 	depends = libgudev
 	depends = nss
 	depends = dbus-glib
@@ -84,3 +99,11 @@ pkgname = libnm-glib-git
 	provides = libnm-glib
 	conflicts = libnm-glib
 
+pkgname = libnm-git
+	pkgdesc = NetworkManager client library
+	depends = glib2
+	depends = libgudev
+	depends = nss
+	depends = libutil-linux
+	depends = jansson
+
diff --git a/20-connectivity.conf b/20-connectivity.conf
new file mode 100644
index 000000000000..9631eabdfef3
--- /dev/null
+++ b/20-connectivity.conf
@@ -0,0 +1,2 @@
+[connectivity]
+uri=http://www.archlinux.org/check_network_status.txt
diff --git a/PKGBUILD b/PKGBUILD
index 541b3238ada6..f96b320ca098 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 
 pkgbase=networkmanager-git
 _gitname=NetworkManager
-pkgname=(networkmanager-git libnm-glib-git)
-pkgver=1.5.2.r16400.g9fafb38
+pkgname=(networkmanager-git libnm-glib-git libnm-git)
+pkgver=1.7.1.r17077.gc2dc1c6fa
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
@@ -19,10 +19,12 @@ url=http://www.gnome.org/projects/$_gitname
 license=(GPL2 LGPL2.1)
 depends=(dbus-glib libmm-glib libndp libnewt libnl libsoup libteam libutil-linux
     nss polkit wpa_supplicant)
-checkdepends=(libx11 python-gobject python-dbus)
+checkdepends=(libx11 python-dbus)
 _pppver=2.4.7
-makedepends=(iproute2 nss polkit python-gobject dhclient git gobject-introspection gtk-doc intltool iptables
-    modemmanager ppp=$_pppver rp-pppoe vala)
+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)
 optdepends=('dhclient: DHCPv6 support'
     'dnsmasq: connection sharing'
     'bluez: Bluetooth support'
@@ -32,11 +34,14 @@ optdepends=('dhclient: DHCPv6 support'
     'modemmanager: cellular network support')
 options=(!libtool !emptydirs)
 source=($pkgname::git://github.com/$_gitname/$_gitname
-    NetworkManager.conf)
+    NetworkManager.conf
+    20-connectivity.conf)
 sha256sums=('SKIP'
-            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3')
+            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
+            '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6')
 sha512sums=('SKIP'
-            'e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3')
+            'e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3'
+            'da52ba9603c279c1c865cc3bf63606e1daeeb2a22c68e4b0077e15c312e251b494c4f0c94bcb27c9f6923f8b69cd7ab9062d9b7ce499222d3d2240864ed9345f')
 
 pkgver() {
     cd $pkgname/
@@ -51,39 +56,76 @@ pkgver() {
 }
 
 prepare() {
+     mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
     cd $pkgname/
     2to3 -w libnm src tools
-
     NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
     cd $pkgname/
     ./configure \
-        --prefix=/usr \
         --sysconfdir=/etc \
-        --localstatedir=/var \
-        --sbindir=/usr/bin \
-        --libexecdir=/usr/lib/networkmanager \
-        --with-crypto=nss \
-        --with-dhclient=/usr/bin/dhclient \
-        --without-dhcpcd \
-        --with-iptables=/usr/bin/iptables \
-        --with-systemdsystemunitdir=/usr/lib/systemd/system \
-        --with-udev-dir=/usr/lib/udev \
-        --with-resolvconf=/usr/bin/resolvconf \
-        --with-pppd=/usr/bin/pppd \
-        --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
-        --with-pppoe=/usr/bin/pppoe \
-        --with-kernel-firmware-dir=/usr/lib/firmware \
-        --with-session-tracking=systemd \
-        --with-modem-manager-1 \
-        --enable-doc \
-        --enable-gtk-doc \
-        --enable-modify-system \
-        --disable-static \
-        --enable-more-warnings=no \
-        --disable-wimax
+         --prefix=/usr \
+    --localstatedir=/var \
+    runstatedir=/run \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/NetworkManager \
+    --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=dhclient \
+    --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, Arch Linux" \
+    --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-dnssec-trigger=/usr/lib/dnssec-trigger \
+    --with-hostname-persist=default \
+    --with-iptables=/usr/bin/iptables \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-libnm-glib \
+    --with-libsoup \
+    --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
+
      sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
     make
@@ -95,13 +137,12 @@ check() {
 }
 
 package_networkmanager-git() {
-    depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
-               libnewt libndp libteam)
+   depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam
+           bluez-libs)
     optdepends=('dnsmasq: connection sharing'
     'bluez: Bluetooth support'
     'openresolv: resolvconf support'
     'ppp: dialup connection support'
-    'rp-pppoe: ADSL support'
     'dhclient: External DHCP client'
     'modemmanager: cellular network support')
     backup=('etc/NetworkManager/NetworkManager.conf')
@@ -109,26 +150,51 @@ package_networkmanager-git() {
     provides=('networkmanager')
     cd $srcdir/$pkgname
     make -C $srcdir/$pkgname DESTDIR="$pkgdir" install
-            # Some stuff to move is left over
-            install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-            install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-            rm -rv "$pkgdir/usr/lib"
-            rm -rv "$pkgdir/usr/include"
-            rm -rv "$pkgdir/var/run"
-     }     
+            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"
+### Split libnm
+
+  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
+
+### Split libnm-glib
+
+  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}
+       
+}
+
+  package_libnm-git() {
+  pkgdesc="NetworkManager client library"
+  depends=(glib2 libgudev nss libutil-linux jansson)
+  cd $srcdir/$pkgbase
+  mv libnm/* "$pkgdir"
+}
 
    package_libnm-glib-git() {
-     pkgdesc="NetworkManager library"
+     pkgdesc="NetworkManager client library (legacy)"
        depends=(libgudev nss dbus-glib libutil-linux jansson)
        conflicts=('libnm-glib')
        provides=('libnm-glib')
-          cd $srcdir/$pkgbase
-          make DESTDIR="$pkgdir" install
-
-          rm -rv "$pkgdir/usr/bin"
-          rm -rv "$pkgdir/usr/share"
-          rm -rv "$pkgdir/etc"
+    mv libnm-glib/* "$pkgdir"
  }
-
-  
-