================================
NetworkManager:source=0.7.0.cvs20060529-1 (previous: 0.6.4-2)
cvc rdiff NetworkManager -1 /[EMAIL PROTECTED]:1-devel/0.7.0.cvs20060529-1
================================
0.7.0.cvs20060529-1 Ken VanDine ([EMAIL PROTECTED]) Fri Aug 18 12:15:47 2006
Updated to a cvs snapshot
NetworkManager-0.7.0.cvs20060529.tar.gz: new
NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch: new
--- /dev/null
+++ NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
@@ -0,0 +15 @@
+---
NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-choose-inactive-wired-device
2006-05-28 16:02:48.000000000 -0400
++++ NetworkManager-0.7.0/src/NetworkManagerPolicy.c 2006-08-09
12:13:07.000000000 -0400
+@@ -212,8 +212,10 @@
+ if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT))
+ continue;
+
+- if (link_active)
+- prio += 1;
++ if (!link_active)
++ continue;
++
++ prio += 1;
+
+ if (nm_device_get_act_request (dev) && link_active)
+ prio += 1;
NetworkManager-0.7.0-dbus-deprecated.patch: new
--- /dev/null
+++ NetworkManager-0.7.0-dbus-deprecated.patch
@@ -0,0 +20 @@
+--- NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c.dbus-deprecated
2006-07-19 14:22:42.000000000 -0400
++++ NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c 2006-07-19
14:23:30.000000000 -0400
+@@ -230,7 +230,7 @@
+ {
+ /* Try to reactivate our connection to dbus on the next pass
through the event loop */
+ ctx->nm_state = LIBNM_NO_DBUS;
+- dbus_connection_disconnect (ctx->dbus_con);
++ dbus_connection_close (ctx->dbus_con);
+ libnm_glib_schedule_dbus_watcher (ctx);
+ }
+ else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
+@@ -444,7 +444,7 @@
+ g_main_loop_unref (ctx->g_main_loop);
+
+ if (ctx->dbus_con)
+- dbus_connection_disconnect (ctx->dbus_con);
++ dbus_connection_close (ctx->dbus_con);
+
+ if (ctx->callbacks_lock)
+ g_mutex_free (ctx->callbacks_lock);
NetworkManager.recipe: changed
Index: NetworkManager.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- NetworkManager.recipe /[EMAIL PROTECTED]:1-devel/0.6.4-2
+++ NetworkManager.recipe /[EMAIL PROTECTED]:1-devel/0.7.0.cvs20060529-1
@@ -15,13 +15,16 @@
'chkconfig:runtime', 'gettext:runtime', 'gtk:runtime', 'perl:runtime' ]
name = "NetworkManager"
- version = "0.6.4"
+ version = "0.7.0.cvs20060529"
extraConfig = ' --with-distro=redhat --enable-notification-icon
--with-named=/usr/sbin/named --with-named-user=named
--with-named-dir=%(localstatedir)s/named
--with-wpa_supplicant=/usr/sbin/wpa_supplicant localstatedir=%(localstatedir)s'
def unpack(r):
- GnomePackageRecipe.unpack(r)
- #r.addPatch('special-case-madwifi.patch', level=0)
+ #GnomePackageRecipe.unpack(r)
+ r.addArchive('%(name)s-%(version)s.tar.gz')
+ r.addPatch('NetworkManager-0.7.0-dbus-deprecated.patch')
+
r.addPatch('NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch')
+ r.addPatch('NetworkManager-0.7.0-shhh.patch')
r.macros.foodir='initscript/RedHat'
r.Replace('chkconfig: - 98 02','chkconfig: 5 98
02','%(foodir)s/NetworkManager',
'%(foodir)s/NetworkManager.in','%(foodir)s/NetworkManagerDispatcher.in','%(foodir)s/NetworkManagerDispatcher')
r.Replace(' -p
\$pidfile','','%(foodir)s/NetworkManager','%(foodir)s/NetworkManager.in')
NetworkManager-0.7.0-shhh.patch: new
--- /dev/null
+++ NetworkManager-0.7.0-shhh.patch
@@ -0,0 +22 @@
+--- NetworkManager-0.6.3-orig/src/nm-device-802-11-wireless.c 2006-06-07
23:30:25.000000000 +0600
++++ NetworkManager-0.6.3/src/nm-device-802-11-wireless.c 2006-06-09
20:05:21.000000000 +0600
+@@ -2424,16 +2424,15 @@
+ supplicant_exec (NMDevice80211Wireless *self)
+ {
+ gboolean success = FALSE;
+- char * argv[5];
++ char * argv[4];
+ GError * error = NULL;
+ GPid pid = -1;
+ int sup_stdout;
+
+ argv[0] = WPA_SUPPLICANT_BIN;
+- argv[1] = "-dd";
+- argv[2] = "-g";
+- argv[3] = WPA_SUPPLICANT_GLOBAL_SOCKET;
+- argv[4] = NULL;
++ argv[1] = "-g";
++ argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
++ argv[3] = NULL;
+
+ success = g_spawn_async_with_pipes ("/", argv, NULL, 0, NULL, NULL,
&pid, NULL, &sup_stdout, NULL, &error);
special-case-madwifi.patch: removed
NetworkManager-0.6.4.tar.bz2: removed
dbus_0_34.patch: removed
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
