testing/networkmanager: new upstream version

* bump version to 1.0.6
* removed unnecessary dependencies
* disable generation of introspection data as it causes build to fail (can't generate gir for NM-Client). Because of grsec headers?

1 files changed, 40 insertions, 19 deletions

diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD
index 565c860bb9..18397dd92d 100644
--- a/testing/networkmanager/APKBUILD
+++ b/testing/networkmanager/APKBUILD
@@ -1,21 +1,36 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=networkmanager
-pkgver=1.0.0
-_ver=1.0
-pkgrel=2
+pkgver=1.0.6
+pkgrel=0
 pkgdesc="network management tool"
 url="http://projects.gnome.org/NetworkManager/"
 arch="x86 x86_64"
 license="GPL"
 depends="dhcpcd iptables dbus"
-depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev linux-headers polkit-dev ppp-dev zlib-dev
-		wireless-tools-dev nss-dev nspr-dev gobject-introspection-dev libndp-dev libmm-glib-dev
-                modemmanager-dev newt-dev bluez-dev libsoup-dev libteam-dev rp-pppoe valgrind dnsmasq
-                openresolv dhclient vala gtk-doc readline-dev"
-makedepends="$depends_dev intltool ncurses-terminfo"
+depends_dev=
+makedepends="$depends_dev
+	dbus-glib-dev
+	eudev-dev
+	gobject-introspection-dev
+	intltool
+	libmm-glib-dev
+	libndp-dev
+	libnl3-dev
+	libsoup-dev
+	libteam-dev
+	linux-headers
+	modemmanager-dev
+	newt-dev
+	nss-dev
+	polkit-dev
+	ppp-dev
+	readline-dev
+	util-linux-dev
+	vala
+	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.xz
+source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
 	$pkgname.conf
 	$pkgname.initd
 	$pkgname.rules
@@ -33,33 +48,41 @@ prepare() {
 		esac
 	done
 	# Build fails without IPTOS_CLASS_CS6 defined (required by systemd) ###
-        # http://cgit.openembedded.org/openembedded-core/commit/?id=7562021eef5b7585122c92db8b686808ebe7d85e
+	# http://cgit.openembedded.org/openembedded-core/commit/?id=7562021eef5b7585122c92db8b686808ebe7d85e
 	# Remove systemd functionality. This also removes many: "error: redefinition of 'struct ethhdr'"
 	local f= files=$(find src/dhcp-manager/systemd-dhcp -type f) # --without-systemd has no effect
 	files="$files $(find src/dhcp-manager -maxdepth 1 -type f -name "*-systemd.*")"
 	for f in $files; do # do NOT build --with-dbus-sys-dir=/etc/dbus-1 (nm service will crash)
 		printf "" > $f
 	done
+
 }
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-systemdsystemunitdir=no \
-		--enable-more-warnings=yes \
+		--disable-more-warnings \
+		--disable-config-plugin-ibft \
+		--disable-tests \
+		--disable-wimax \
+		--disable-introspection \
  		--enable-ifupdown \
 		--enable-concheck \
  		--with-dhcpcd=yes \
+		--with-systemdsystemunitdir=no \
 		--with-crypto=nss \
 		--with-modem-manager-1 \
 		--with-nmtui=yes \
 		--with-wext=yes \
 		--with-resolvconf=yes \
-		--disable-wimax \
+		--with-session-tracking=no \
+		--with-suspend-resume=upower \
+		--without-valgrind \
 		|| return 1
 	# ourLDFLAGS confuses the gir-scanner
 	unset LDFLAGS
@@ -73,8 +96,6 @@ package() {
 	install -m755 -D "$srcdir"/networkmanager.initd \
 		"$pkgdir"/etc/init.d/networkmanager || return 1
 
-	mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ || return 1
-
 	install -m644 -D "$srcdir/$pkgname.conf" \
                 "$pkgdir/etc/NetworkManager/NetworkManager.conf" || return 1
 	# allow plugdev users to modify connections
@@ -88,19 +109,19 @@ To modify system network connections without the root password: add your user ac
 EOF
 }
 
-md5sums="71cae8707a90fa92e28cafbc9262b548  NetworkManager-1.0.0.tar.xz
+md5sums="00f5f9ec69725a9f9b99366853c6f73e  NetworkManager-1.0.6.tar.xz
 b722fa02f904a9c8ed0d2ec21cbfc588  networkmanager.conf
 34f8909bb776840e7ec0579aeea14d30  networkmanager.initd
 a39b4feaf1edecc057596be6d82ba634  networkmanager.rules
 eb52238b018c2ca9cd969facbf3e4a39  new-fix-musl-headers.patch
 4f2c03bce7febd1eede0dc2c5f8b30d9  disable_set_hostname.patch"
-sha256sums="3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947  NetworkManager-1.0.0.tar.xz
+sha256sums="38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd  NetworkManager-1.0.6.tar.xz
 cd2a4b0079c0726973c1cf226c4e1cb4f2d27d02c16e0e08af7e4d6b8770423c  networkmanager.conf
 05225f1f658f9287d95b4564beb1089245ab83ccae28ba5d2d4c8fc5aefde207  networkmanager.initd
 01f4b833c515e88c1963a0ee56ffbf70c59c5efc4dd59a5174498d2fabfc9362  networkmanager.rules
 ea205946b52fca22b9ef8b1f3a4e89a69dca430201b5b0f441564d1659d9f295  new-fix-musl-headers.patch
 6fc7bc258ac01c2d2578f5a29e7eee55b98bbf8f32dae6d28dede7d7ee5e5c4e  disable_set_hostname.patch"
-sha512sums="7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e  NetworkManager-1.0.0.tar.xz
+sha512sums="74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb  NetworkManager-1.0.6.tar.xz
 a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faeacefbe3c6c0c748e4ef499a55bb5ee40f0f04bbf766fbbc82  networkmanager.conf
 80ef470956bc5319f02e8387bff17c5452d4147321f9f997ca86017494d5134d8579bf59566fc796f3e84ee5788a2d49743d3b93e795f4976661866d1f1b1442  networkmanager.initd
 9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6  networkmanager.rules