networkmanager: add svn trunk packages, fix up bad packaging, and backport fixes to 0.6

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2772 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 94 insertions, 0 deletions

diff --git a/meta-extras/packages/networkmanager/files/NetworkManager b/meta-extras/packages/networkmanager/files/25NetworkManager
index 0beff63081..0beff63081 100644
--- a/meta-extras/packages/networkmanager/files/NetworkManager
+++ b/meta-extras/packages/networkmanager/files/25NetworkManager
diff --git a/meta-extras/packages/networkmanager/files/build-fixes.diff b/meta-extras/packages/networkmanager/files/build-fixes.diff
new file mode 100644
index 0000000000..d771c30563
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/build-fixes.diff
@@ -0,0 +1,78 @@
+Index: test/nm-tool.c
+===================================================================
+--- test/nm-tool.c      (revision 2853)
++++ test/nm-tool.c      (working copy)
+@@ -148,7 +148,7 @@
+        GString *str;
+        gboolean active = FALSE;
+        guint32 flags, wpa_flags, rsn_flags;
+-       GByteArray * ssid;
++       const GByteArray * ssid;
+        char *tmp;
+ 
+        flags = nm_access_point_get_flags (ap);
+@@ -193,7 +193,6 @@
+        ssid = nm_access_point_get_ssid (ap);
+        tmp = g_strdup_printf ("  %s%s", active ? "*" : "",
+                               ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
+-       g_byte_array_free (ssid, TRUE);
+ 
+        print_string (tmp, str->str);
+ 
+Index: callouts/nm-dhcp-client-action.c
+===================================================================
+--- callouts/nm-dhcp-client-action.c    (revision 2853)
++++ callouts/nm-dhcp-client-action.c    (working copy)
+@@ -176,7 +176,7 @@
+ }
+ 
+ 
+-const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
++static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
+ 
+ dbus_bool_t
+ build_message (DBusMessage * message)
+Index: src/nm-netlink.c
+===================================================================
+--- src/nm-netlink.c    (revision 2853)
++++ src/nm-netlink.c    (working copy)
+@@ -19,6 +19,7 @@
+  * (C) Copyright 2007 Red Hat, Inc.
+  */
+ 
++#include <asm/types.h>
+ #include "nm-netlink.h"
+ #include "nm-utils.h"
+ 
+Index: src/vpn-manager/nm-vpn-connection.c
+===================================================================
+--- src/vpn-manager/nm-vpn-connection.c (revision 2853)
++++ src/vpn-manager/nm-vpn-connection.c (working copy)
+@@ -406,7 +406,7 @@
+        routes = nm_vpn_connection_get_routes (connection);
+        org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy,
+                                                                                                  nm_vpn_connection_get_vpn_data (connection),
+-                                                                                                 routes,
++                                                                                                 (const char**)routes,
+                                                                                                  nm_vpn_connection_connect_cb,
+                                                                                                  connection);
+ 
+Index: libnm-glib/libnm-glib-test.c
+===================================================================
+--- libnm-glib/libnm-glib-test.c        (revision 2853)
++++ libnm-glib/libnm-glib-test.c        (working copy)
+@@ -165,13 +165,12 @@
+ static void
+ dump_access_point (NMAccessPoint *ap)
+ {
+-       GByteArray * ssid;
++       const GByteArray * ssid;
+        char * str;
+ 
+        ssid = nm_access_point_get_ssid (ap);
+        g_print ("\tSsid: %s\n",
+                 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
+-       g_byte_array_free (ssid, TRUE);
+ 
+        str = nm_access_point_get_hw_address (ap);
+        g_print ("\tMAC Address: %s\n", str);
diff --git a/meta-extras/packages/networkmanager/files/install-tools.patch b/meta-extras/packages/networkmanager/files/install-tools.patch
new file mode 100644
index 0000000000..36cb9424f9
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/install-tools.patch
@@ -0,0 +1,16 @@
+Index: test/Makefile.am
+===================================================================
+--- test/Makefile.am    (revision 2853)
++++ test/Makefile.am    (working copy)
+@@ -15,8 +15,9 @@
+        -DNM_RUN_DIR=\"$(rundir)\" \
+        -DDATADIR=\"$(datadir)\"
+ 
+-noinst_PROGRAMS = nm-tool \
+-                  nm-online \
++bin_PROGRAMS = nm-tool \
++                  nm-online
++noinst_PROGRAMS = \
+                   nmtestdevices \
+                   libnm_glib_test
+