networkmanager: 1.6.2 -> 1.8.0

7 files changed, 32 insertions, 198 deletions

diff --git a/networkmanager/.footprint b/networkmanager/.footprint
index dac76e050..e3dfa760f 100644
--- a/networkmanager/.footprint
+++ b/networkmanager/.footprint
@@ -26,76 +26,6 @@ drwxr-xr-x	root/root	usr/etc/dbus-1/system.d/
 -rw-r--r--	root/root	usr/etc/dbus-1/system.d/nm-dispatcher.conf
 -rw-r--r--	root/root	usr/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/NetworkManager/
--rw-r--r--	root/root	usr/include/NetworkManager/NetworkManager.h
--rw-r--r--	root/root	usr/include/NetworkManager/NetworkManagerVPN.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-connection.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-8021x.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-adsl.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-bluetooth.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-bond.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-bridge-port.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-bridge.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-cdma.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-connection.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-dcb.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-generic.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-gsm.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-infiniband.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-ip4-config.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-ip6-config.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-olpc-mesh.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-ppp.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-pppoe.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-serial.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-team-port.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-team.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-vlan.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-vpn.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-wimax.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-wired.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-wireless-security.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting-wireless.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-setting.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-utils-enum-types.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-utils.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-version-macros.h
--rw-r--r--	root/root	usr/include/NetworkManager/nm-version.h
-drwxr-xr-x	root/root	usr/include/libnm-glib/
--rw-r--r--	root/root	usr/include/libnm-glib/libnm_glib.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-access-point.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-active-connection.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-client.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-adsl.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-bond.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-bridge.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-bt.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-ethernet.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-generic.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-infiniband.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-modem.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-olpc-mesh.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-team.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-vlan.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-wifi.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device-wimax.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-device.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-dhcp4-config.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-dhcp6-config.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-glib-enum-types.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-ip4-config.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-ip6-config.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-object.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-remote-connection.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-remote-settings.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-secret-agent.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-types.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-vpn-connection.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-vpn-enum-types.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-vpn-plugin-ui-interface.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-vpn-plugin-utils.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-vpn-plugin.h
--rw-r--r--	root/root	usr/include/libnm-glib/nm-wimax-nsp.h
 drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/NetworkManager.h
 -rw-r--r--	root/root	usr/include/libnm/nm-access-point.h
@@ -109,6 +39,7 @@ drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/nm-device-bond.h
 -rw-r--r--	root/root	usr/include/libnm/nm-device-bridge.h
 -rw-r--r--	root/root	usr/include/libnm/nm-device-bt.h
+-rw-r--r--	root/root	usr/include/libnm/nm-device-dummy.h
 -rw-r--r--	root/root	usr/include/libnm/nm-device-ethernet.h
 -rw-r--r--	root/root	usr/include/libnm/nm-device-generic.h
 -rw-r--r--	root/root	usr/include/libnm/nm-device-infiniband.h
@@ -140,6 +71,7 @@ drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-cdma.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-connection.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-dcb.h
+-rw-r--r--	root/root	usr/include/libnm/nm-setting-dummy.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-generic.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-gsm.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-infiniband.h
@@ -157,6 +89,7 @@ drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-team-port.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-team.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-tun.h
+-rw-r--r--	root/root	usr/include/libnm/nm-setting-user.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-vlan.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-vpn.h
 -rw-r--r--	root/root	usr/include/libnm/nm-setting-vxlan.h
@@ -186,22 +119,8 @@ drwxr-xr-x	root/root	usr/lib/NetworkManager/conf.d/
 -rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-device-plugin-adsl.so
 -rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-device-plugin-wifi.la
 -rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-device-plugin-wifi.so
--rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-ppp-plugin.la
--rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-ppp-plugin.so
 -rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-settings-plugin-ibft.la
 -rwxr-xr-x	root/root	usr/lib/NetworkManager/libnm-settings-plugin-ibft.so
--rwxr-xr-x	root/root	usr/lib/libnm-glib-vpn.la
-lrwxrwxrwx	root/root	usr/lib/libnm-glib-vpn.so -> libnm-glib-vpn.so.1.2.0
-lrwxrwxrwx	root/root	usr/lib/libnm-glib-vpn.so.1 -> libnm-glib-vpn.so.1.2.0
--rwxr-xr-x	root/root	usr/lib/libnm-glib-vpn.so.1.2.0
--rwxr-xr-x	root/root	usr/lib/libnm-glib.la
-lrwxrwxrwx	root/root	usr/lib/libnm-glib.so -> libnm-glib.so.4.9.0
-lrwxrwxrwx	root/root	usr/lib/libnm-glib.so.4 -> libnm-glib.so.4.9.0
--rwxr-xr-x	root/root	usr/lib/libnm-glib.so.4.9.0
--rwxr-xr-x	root/root	usr/lib/libnm-util.la
-lrwxrwxrwx	root/root	usr/lib/libnm-util.so -> libnm-util.so.2.7.0
-lrwxrwxrwx	root/root	usr/lib/libnm-util.so.2 -> libnm-util.so.2.7.0
--rwxr-xr-x	root/root	usr/lib/libnm-util.so.2.7.0
 -rwxr-xr-x	root/root	usr/lib/libnm.la
 lrwxrwxrwx	root/root	usr/lib/libnm.so -> libnm.so.0.1.0
 lrwxrwxrwx	root/root	usr/lib/libnm.so.0 -> libnm.so.0.1.0
@@ -212,14 +131,7 @@ drwxr-xr-x	root/root	usr/lib/networkmanager/
 -rwxr-xr-x	root/root	usr/lib/networkmanager/nm-iface-helper
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/NetworkManager.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libnm-glib-vpn.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libnm-glib.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libnm-util.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnm.pc
-drwxr-xr-x	root/root	usr/lib/pppd/
-drwxr-xr-x	root/root	usr/lib/pppd/2.4.5/
--rwxr-xr-x	root/root	usr/lib/pppd/2.4.5/nm-pppd-plugin.la
--rwxr-xr-x	root/root	usr/lib/pppd/2.4.5/nm-pppd-plugin.so
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/NetworkManager
 drwxr-xr-x	root/root	usr/share/
@@ -235,6 +147,7 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Bluetooth.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Bond.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Bridge.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Dummy.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Generic.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.IPTunnel.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.NetworkManager.Device.Infiniband.xml
diff --git a/networkmanager/.md5sum b/networkmanager/.md5sum
index c388a668c..d51bc107c 100644
--- a/networkmanager/.md5sum
+++ b/networkmanager/.md5sum
@@ -1,3 +1,3 @@
-89c975afe19fbac854191edb6e9bcd3b  NetworkManager-1.6.2.tar.xz
+de0e70933a17ee6a682e8440015c9b1e  NetworkManager-1.8.0.tar.xz
 49dd5996e5a9a7f825e75501a8eb3066  NetworkManager.conf
-50aaf6583e7f2941d167ae29795b26f0  networkmanager.rc
+8959cd1832461aa0255c3a42fbc5b52f  networkmanager.rc
diff --git a/networkmanager/.signature b/networkmanager/.signature
index b8165b5e4..b247e154e 100644
--- a/networkmanager/.signature
+++ b/networkmanager/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/cG9+o0IFTa9+NR87l5ETN3EiyaCMvkNmyfKTbSDy3u26OK+9wh98YGTEddZu7h+wh215wOccUNIqwnP9zT5AQ=
-SHA256 (Pkgfile) = 3aeaeb837163a5a840956a8a3631a54bfcbbddf8a6f4fc67282d4e891ca4c028
-SHA256 (.footprint) = f545aad040b98e46a6fbd9240f699922e83dd4ecc11148553d19e85bc01621eb
-SHA256 (NetworkManager-1.6.2.tar.xz) = b22b6f55cde37bec4982f9be4b1808a21101d807a05049c670116d95059a26f9
-SHA256 (networkmanager.rc) = 4a1c651328a6c4c9b7b22329a1d97139b94f62f65401f73924ac9245f9b3b77e
+RWSagIOpLGJF36QbMgXDymvRn5EWfVjxTf2FdzUvLo7dY5OOh1Nhq/l8uKRi1qeA1l7btveMeWrZVNs9WmBSM3sfxf6TelKUfgw=
+SHA256 (Pkgfile) = 54670e93b93e5fa70c3430108904ad6c4155fa3f0bbc698bd1eb7dbf6abe56c2
+SHA256 (.footprint) = 9b30f8e00f8080087f73487869bc3e9ff034669532eb7cb29f199d2387505cb9
+SHA256 (NetworkManager-1.8.0.tar.xz) = fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e
+SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
 SHA256 (NetworkManager.conf) = b854c04d516f832d93416fd4150d30bb0188e1125c431fddbc6b8a84ba53f8d1
diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile
index 9d4943777..dcfadbc38 100644
--- a/networkmanager/Pkgfile
+++ b/networkmanager/Pkgfile
@@ -1,11 +1,11 @@
-# Description:	Network configuration tool
-# URL:		http://www.gnome.org/projects/NetworkManager/
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	dbus libnl p5-xml-parser openresolv dhcpcd polkit upower libsoup iptables nss libndp jansson
-# Optional:	ppp avahi bash-completion
+# Description: Network configuration tool
+# URL:         http://www.gnome.org/projects/NetworkManager/
+# Maintainer:  Alan Mizrahi, alan at mizrahi dot com dot ve
+# Depends on:  intltool dbus-glib libnl nss libndp p5-xml-parser openresolv dhcpcd polkit upower
+# Optional:    ppp avahi bash-completion dbus libnl jansson libteam dnsmasq
 
 name=networkmanager
-version=1.6.2
+version=1.8.0
 release=1
 source=(
 http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz
@@ -16,17 +16,18 @@ NetworkManager.conf
 build() {
 	cd NetworkManager-$version
 
+	CONFIG_SHELL=/bin/bash \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/networkmanager \
 		--localstatedir=/var \
+		--libexecdir=/usr/lib/networkmanager \
 		--with-udev-dir=/lib/udev \
 		--with-systemdsystemunitdir=no \
 		--disable-nls \
 		--disable-static \
 		--enable-polkit \
-		--enable-ppp \
+		--enable-wifi \
 		--enable-tests=no \
 		--enable-gtk-doc=no \
 		--enable-gtk-doc-html=no \
@@ -39,7 +40,9 @@ build() {
 		--enable-more-warnings=no \
 		--enable-modify-system \
 		--with-session-tracking=consolekit \
-		--with-suspend-resume=upower
+		--with-suspend-resume=upower \
+		--without-libnm-glib \
+		--$(test -f /usr/include/pppd/pppd.h && echo enable || echo disable)-ppp
 
 	make
 	make DESTDIR=$PKG install
@@ -55,7 +58,7 @@ build() {
 	install -D -m 755 -o root -g root $SRC/$name.rc $PKG/etc/rc.d/$name
 
 	# Remove rundir
-	rm -rf $PKG/var/run $PKG/usr/share/doc $PKG/usr/share/man/man5/nmcli-examples.5
+	rm -rf $PKG/var/run $PKG/usr/share/{gtk-,}doc $PKG/usr/share/man/man5/nmcli-examples.5
 
 	# Remove bash-completion config unless it's installed
 	if [ ! -f /usr/lib/pkgconfig/bash-completion.pc ]; then
diff --git a/networkmanager/README b/networkmanager/README
index 62b984a13..29ede6497 100644
--- a/networkmanager/README
+++ b/networkmanager/README
@@ -1,5 +1,9 @@
 README for networkmanager
 
+NOTE
+
+The only strict dependencies to build NetworkManager are: intltool, dbus-glib, libnl, nss and libndp
+
 REQUIREMENTS
 
 POST-INSTALL
diff --git a/networkmanager/networkmanager.rc b/networkmanager/networkmanager.rc
index 607562da9..d1667c5e2 100644
--- a/networkmanager/networkmanager.rc
+++ b/networkmanager/networkmanager.rc
@@ -1,10 +1,10 @@
 #!/bin/sh
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
-NAME=networkmanager
-USER=root
-RUNDIR=/var/run/$NAME
-PIDFILE=$RUNDIR/$NAME.pid
+NAME="NetworkManager"
+USER="root"
+RUNDIR="/var/run/$NAME"
+PIDFILE="$RUNDIR/$NAME.pid"
 PROG="/usr/sbin/NetworkManager"
 ARGS=""
 
diff --git a/networkmanager/post-install b/networkmanager/post-install
deleted file mode 100644
index 7fd5e0800..000000000
--- a/networkmanager/post-install
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-#
-# This script creates sample default system-connections files
-# in /etc/NetworkManager/system-connections/ based on your current
-# ethernet and wireless devices.
-#
-# You can skip it if you prefer to configure them yourself
-# by creating the ini-files, via nmcli(1) or the networkmanager applet
-#
-# Note:
-# You may override the default ssid by doing:
-#
-# ssid=my_wifi sh post-install
-
-# workaround prt-get shortcoming
-if [ -z "$BASH_VERSION" ]; then
-	echo "Running /bin/bash $0 $@"
-	exec /bin/bash $0 "$@"
-fi
-
-ssid="${ssid:-at_STARBUCKS_Wi2}"
-name="${name:-Wireless connection for $ssid}"
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-umask 077
-
-shopt -s nullglob
-
-# Generate config for each device
-for sysdir in /sys/class/net/enp* /sys/class/net/eth* /sys/class/net/wlp* /sys/class/net/wlan*; do
-	iface=${sysdir##*/}
-	cfg=/etc/NetworkManager/system-connections/$iface
-	if [ -f $cfg ]; then
-		echo "Skipping $iface: $cfg found"
-		continue
-	fi
-	echo "Generating sample config: $cfg"
-	macaddr=$(<$sysdir/address)
-	uuid=$(uuidgen)
-	timestamp=$(date +%s)
-	case $iface in
-	eth*|enp*)
-		cat > $cfg << EOF
-[connection]
-name=Wired connection $iface
-id=$iface
-uuid=$uuid
-type=802-3-ethernet
-autoconnect=true
-timestamp=$timestamp
-
-[802-3-ethernet]
-mac-address=$macaddr
-
-[ipv4]
-method=auto
-EOF
-		;;
-	wlan*|wlp*)
-		# Convert ssid to an array of bytes
-		ssid_bytes=$(perl -e 'print "$_;" foreach unpack("C*", $ARGV[0])' $ssid)
-		cat > $cfg << EOF
-[connection]
-name=$name
-id=$iface
-uuid=$uuid
-type=802-11-wireless
-# the string below is: $ssid
-ssid=$ssid_bytes
-autoconnect=true
-timestamp=$timestamp
-# security=802-11-wireless-security
-
-[802-11-wireless]
-mac-address=$macaddr
-
-[802-11-wireless-security]
-key-mgmt=wpa-psk
-psk=secret
-
-[ipv4]
-method=auto
-EOF
-		;;
-	esac
-done