updating

4 files changed, 94 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7575fa8eab0..6a95836573cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Thu Dec  1 01:42:34 UTC 2016
 pkgbase = networkmanager-git
 	pkgdesc = Network Management daemon
-	pkgver = 1.1.0.r12661.g72953e3
+	pkgver = 1.5.2.r16400.g9fafb38
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager
-	install = networkmanager-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -11,6 +12,10 @@ pkgbase = networkmanager-git
 	checkdepends = libx11
 	checkdepends = python-gobject
 	checkdepends = python-dbus
+	makedepends = iproute2
+	makedepends = nss
+	makedepends = polkit
+	makedepends = python-gobject
 	makedepends = dhclient
 	makedepends = git
 	makedepends = gobject-introspection
@@ -39,25 +44,43 @@ pkgbase = networkmanager-git
 	optdepends = ppp: dialup connection support
 	optdepends = rp-pppoe: ADSL support
 	optdepends = modemmanager: cellular network support
-	provides = networkmanager=1.1.0.r12661.g72953e3
-	provides = libnm-glib=1.1.0.r12661.g72953e3
-	conflicts = networkmanager
-	conflicts = libnm-glib
-	options = !emptydirs
 	options = !libtool
-	backup = etc/NetworkManager/NetworkManager.conf
-	source = networkmanager-git::git://anongit.freedesktop.org/NetworkManager/NetworkManager
-	source = git://git.gnome.org/libgsystem
+	options = !emptydirs
+	source = networkmanager-git::git://github.com/NetworkManager/NetworkManager
 	source = NetworkManager.conf
-	source = disable_set_hostname.patch
-	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3
-	sha256sums = 689e6702297a4cccfed660cb27d87accde86e89875b1f35f29ce0b6400baf1c4
-	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3
-	sha512sums = 587c1183a1dc94af4f6926a1de97e07422cb0d50f45b31a2405123df4629ad4412e7ada583c66c9d88f67e58f2559c3b80909960f1bd0a00d9adbcf5255b73af
 
 pkgname = networkmanager-git
+	depends = libnm-glib
+	depends = iproute2
+	depends = polkit
+	depends = wpa_supplicant
+	depends = libsoup
+	depends = libmm-glib
+	depends = libnewt
+	depends = libndp
+	depends = libteam
+	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
+	conflicts = networkmanager
+	backup = etc/NetworkManager/NetworkManager.conf
+
+pkgname = libnm-glib-git
+	pkgdesc = NetworkManager library
+	depends = libgudev
+	depends = nss
+	depends = dbus-glib
+	depends = libutil-linux
+	depends = jansson
+	provides = libnm-glib
+	conflicts = libnm-glib
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fc76dc4641a..541b3238ada6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,10 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 # Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
+pkgbase=networkmanager-git
 _gitname=NetworkManager
-pkgname=networkmanager-git
-pkgver=1.1.0.r12661.g72953e3
+pkgname=(networkmanager-git libnm-glib-git)
+pkgver=1.5.2.r16400.g9fafb38
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
@@ -20,7 +21,7 @@ depends=(dbus-glib libmm-glib libndp libnewt libnl libsoup libteam libutil-linux
     nss polkit wpa_supplicant)
 checkdepends=(libx11 python-gobject python-dbus)
 _pppver=2.4.7
-makedepends=(dhclient git gobject-introspection gtk-doc intltool iptables
+makedepends=(iproute2 nss polkit python-gobject dhclient git gobject-introspection gtk-doc intltool iptables
     modemmanager ppp=$_pppver rp-pppoe vala)
 optdepends=('dhclient: DHCPv6 support'
     'dnsmasq: connection sharing'
@@ -29,23 +30,13 @@ optdepends=('dhclient: DHCPv6 support'
     'ppp: dialup connection support'
     'rp-pppoe: ADSL support'
     'modemmanager: cellular network support')
-provides=(${pkgname%-*}=$pkgver libnm-glib=$pkgver)
-conflicts=(${pkgname%-*} libnm-glib)
-backup=(etc/NetworkManager/NetworkManager.conf)
-options=(!emptydirs !libtool)
-install=$pkgname.install
-source=($pkgname::git://anongit.freedesktop.org/$_gitname/$_gitname
-    git://git.gnome.org/libgsystem
-    NetworkManager.conf
-    disable_set_hostname.patch)
+options=(!libtool !emptydirs)
+source=($pkgname::git://github.com/$_gitname/$_gitname
+    NetworkManager.conf)
 sha256sums=('SKIP'
-            'SKIP'
-            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
-            '689e6702297a4cccfed660cb27d87accde86e89875b1f35f29ce0b6400baf1c4')
+            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3')
 sha512sums=('SKIP'
-            'SKIP'
-            'e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3'
-            '587c1183a1dc94af4f6926a1de97e07422cb0d50f45b31a2405123df4629ad4412e7ada583c66c9d88f67e58f2559c3b80909960f1bd0a00d9adbcf5255b73af')
+            'e7bb02132503f8c5d021ac0354f156c7775c35ea6590eb48143e7ff61b1b0b6507c3d9679c69d2315eb0e15c8805d41c2f6cbef2370058b34fc8eefc0f471bc3')
 
 pkgver() {
     cd $pkgname/
@@ -61,14 +52,13 @@ pkgver() {
 
 prepare() {
     cd $pkgname/
-    patch -p1 -i ../disable_set_hostname.patch
-    rm -rf libgsystem/
-    ln -sf ../libgsystem
+    2to3 -w libnm src tools
+
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
     cd $pkgname/
-    NOCONFIGURE=1 ./autogen.sh
     ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
@@ -76,9 +66,8 @@ build() {
         --sbindir=/usr/bin \
         --libexecdir=/usr/lib/networkmanager \
         --with-crypto=nss \
-        --with-distro=arch \
         --with-dhclient=/usr/bin/dhclient \
-        --with-dhcpcd=/usr/bin/dhcpcd \
+        --without-dhcpcd \
         --with-iptables=/usr/bin/iptables \
         --with-systemdsystemunitdir=/usr/lib/systemd/system \
         --with-udev-dir=/usr/lib/udev \
@@ -88,21 +77,58 @@ build() {
         --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
+     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
+
 }
 
 check() {
     make -kC $pkgname check
 }
 
-package() {
-    make -C $pkgname DESTDIR="$pkgdir" install
+package_networkmanager-git() {
+    depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
+               libnewt libndp libteam)
+    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')
+    conflicts=('networkmanager')
+    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 -m644 $_gitname.conf "$pkgdir"/etc/$_gitname/
-    install -m755 -d "$pkgdir"/etc/NetworkManager/dnsmasq.d
+   package_libnm-glib-git() {
+     pkgdesc="NetworkManager library"
+       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"
+ }
+
+  
 
-    rm -r "$pkgdir"/var/run
-}
diff --git a/disable_set_hostname.patch b/disable_set_hostname.patch
deleted file mode 100644
index 421f9f65dc51..000000000000
--- a/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -400,6 +400,7 @@
-	}
-	g_free (configured_hostname);
-
-+#if 0
-	/* Try automatically determined hostname from the best device's IP config */
-	if (!best4)
-		best4 = get_best_ip4_device (policy, TRUE);
-@@ -454,6 +455,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/networkmanager-git.install b/networkmanager-git.install
deleted file mode 100644
index 6e57afe91e1b..000000000000
--- a/networkmanager-git.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat << __MSG__
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-__MSG__
-  true
-}