network-manager svn: sync with poky

diff --git a/packages/networkmanager/files/25NetworkManager b/packages/networkmanager/files/25NetworkManager
new file mode 100644 (file)
index 0000000..8e4dec1
--- /dev/null
+++ b/packages/networkmanager/files/25NetworkManager
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# NetworkManager startup script
+
+. /etc/profile
+
+case $1 in
+  'start')
+    echo -n "Starting NetworkManager daemon: NetworkManager"
+    /usr/sbin/NetworkManager 
+    /usr/sbin/NetworkManagerDispatcher
+    echo "."
+  ;;
+
+  'stop')
+    echo -n "Stopping NetworkManager daemon: NetworkManager"
+    kill `ps |grep  /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
+    kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
+    echo "."
+  ;;
+
+  'restart')
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 { start | stop | restart }"
+  ;;
+esac

diff --git a/packages/networkmanager/files/applet-no-gnome.diff b/packages/networkmanager/files/applet-no-gnome.diff
new file mode 100644 (file)
index 0000000..e098e8c
--- /dev/null
+++ b/packages/networkmanager/files/applet-no-gnome.diff
@@ -0,0 +1,59 @@
+---
+ configure.ac |    3 +--
+ src/main.c   |    8 ++++++++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+Index: src/main.c
+===================================================================
+--- src/main.c.orig    2007-09-26 10:39:16.000000000 +0100
++++ src/main.c 2007-09-26 10:39:37.000000000 +0100
+@@ -27,7 +27,9 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
++#if 0
+ #include <libgnomeui/libgnomeui.h>
++#endif
+ #include <glib/gi18n-lib.h>
+ 
+ #include "applet.h"
+@@ -36,11 +38,15 @@
+ int main (int argc, char *argv[])
+ {
+       NMApplet * applet;
++#if 0
+       GnomeProgram * program;
+ 
+       program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
+                                     argc, argv, 
+                                     GNOME_PARAM_NONE, GNOME_PARAM_NONE);
++#else
++      gtk_init (&argc, &argv);
++#endif
+ 
+       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
+       gtk_main ();
+ 
+       g_object_unref (applet);
++#if 0
+       g_object_unref (program);
++#endif
+ 
+       exit (0);
+ }
+Index: configure.ac
+===================================================================
+--- configure.ac.orig  2007-09-26 10:39:30.000000000 +0100
++++ configure.ac       2007-09-26 10:39:37.000000000 +0100
+@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
+                gtk+-2.0 >= 2.6
+                libglade-2.0
+                gconf-2.0
+-               gnome-keyring-1
+-               libgnomeui-2.0])
++               gnome-keyring-1])
+ 
+ ##### Find out the version of DBUS we're using
+ dbus_version=`pkg-config --modversion dbus-1`

diff --git a/packages/networkmanager/files/no-restarts.diff b/packages/networkmanager/files/no-restarts.diff
new file mode 100644 (file)
index 0000000..20bdf82
--- /dev/null
+++ b/packages/networkmanager/files/no-restarts.diff
@@ -0,0 +1,21 @@
+Index: src/backends/NetworkManagerDebian.c
+===================================================================
+--- src/backends/NetworkManagerDebian.c        (revision 2881)
++++ src/backends/NetworkManagerDebian.c        (working copy)
+@@ -204,8 +204,6 @@
+  */
+ void nm_system_update_dns (void)
+ {
+-      nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
+-
+ }
+ 
+ 
+@@ -218,7 +216,6 @@
+  */
+ void nm_system_restart_mdns_responder (void)
+ {
+-      nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
+ }
+ 
+ 

diff --git a/packages/networkmanager/networkmanager-applet_svn.bb b/packages/networkmanager/networkmanager-applet_svn.bb
new file mode 100644 (file)
index 0000000..d61e134
--- /dev/null
+++ b/packages/networkmanager/networkmanager-applet_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GTK+ applet for NetworkManager" 
+LICENSE = "GPL"
+DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
+#TODO DEPENDS libnotify
+RDEPENDS = "networkmanager"
+
+inherit gnome gtk-icon-cache
+
+SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
+           file://applet-no-gnome.diff;patch=1;pnum=0"
+
+PV = "0.0+svnr${SRCREV}"
+
+S = "${WORKDIR}/trunk"
+
+FILES_${PN} += "${datadir}/nm-applet/ \
+        ${datadir}/gnome-vpn-properties/ \
+        ${datadir}/gnome/autostart/ \
+        "

diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index d879381..610bd01 100644 (file)
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -1,14 +1,55 @@
-require networkmanager.inc
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
+RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
-PV = "0.6.5+svn${SRCDATE}"
-PR = "r0"
+PV = "0.7+svnr${SRCREV}"
+PR = "r2"
 
-SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
-       file://NetworkManager \
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
+       file://no-restarts.diff;patch=1;pnum=0 \
+       file://25NetworkManager \
        file://99_networkmanager"
 
-DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF = " \
+               --with-distro=debian \
+               --with-ip=/sbin/ip"
+# TODO: will /bin/ip from busybox do?
 
-S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+S = "${WORKDIR}/trunk"
 
+inherit autotools pkgconfig
 
+do_install_append () {
+       install -d ${D}/etc/default/volatiles
+       install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+       install -d ${D}/etc/dbus-1/event.d
+       install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
+}
+
+do_stage () {
+       autotools_stage_all
+}
+
+pkg_postinst () {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+        /etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN}-dev = "${includedir}/* \
+        ${libdir}/*.so \
+        ${libdir}/*.a \
+        ${libdir}/pkgconfig/*.pc \
+        ${datadir}/NetworkManager/gdb-cmd \
+        "