From dc77eb8254dfb536c3d964dc5a478766d891b024 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 9 Feb 2011 12:21:52 +0100
Subject: [PATCH] networkmanager git: update to 0.8.3

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 recipes/networkmanager/networkmanager_git.bb | 36 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb
index 39b0bf3ca5..83128dfd29 100644
--- a/recipes/networkmanager/networkmanager_git.bb
+++ b/recipes/networkmanager/networkmanager_git.bb
@@ -2,32 +2,44 @@ require networkmanager-0.7.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-SRCREV = "b9c125fa0a2a9878d9ac0f6140f14f436ddb1723"
-PV = "0.7.1+git"
+SRCREV = "9b61ec7c58e8106c28d01b33ad0b263aefb1f347"
+PV = "0.8.2+git"
 PR_append = ".gitr${SRCREV}"
 
 inherit gnome
 
-SRC_URI = "git://anongit.freedesktop.org/NetworkManager/NetworkManager;protocol=git;branch=NETWORKMANAGER_0_7 \
-	file://remove-gtk-doc-make.patch \
-	file://nm-system-settings.conf \
-	file://NetworkManager \
-           file://gtk-doc.make \
+SRC_URI = "git://anongit.freedesktop.org/NetworkManager/NetworkManager;protocol=git;branch=NM_0_8"
+
+S = "${WORKDIR}/git"
+
+SRC_URI += " \
+    file://remove-gtk-doc-make.patch \
+    file://nm-system-settings.conf \
+    file://NetworkManager \
+    file://gtk-doc.make \
 "
 
+EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \
+                  --with-iptables=${sbindir}/iptables \
+"
 
 do_configure_prepend() {
     cp ${WORKDIR}/gtk-doc.make ${S}/
     echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
-	sed -i -e 's:man \\:man:' -e s:docs::g ${S}/Makefile.am
-	sed -i -e /^docs/d ${S}/configure.ac
+    sed -i -e 's:man \\:man:' -e s:docs::g ${S}/Makefile.am
+    sed -i -e /^docs/d ${S}/configure.ac
 }
 
-S = "${WORKDIR}/git"
-
 do_install_append () {
 	install -d ${D}/etc/NetworkManager/
-	install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/
+	install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/NetworkManager.conf
 	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d
+	
+	# Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
+	# With or without VPN support built in ;).
+	install -d ${D}/etc/NetworkManager/VPN
 }
 
+FILES_${PN} += " ${datadir}/polkit-1/"
+RRECOMMENDS_${PN} += "iptables"
+
-- 
2.11.4.GIT