Hello community,
here is the log from the commit of package NetworkManager
checked in at Wed Apr 12 10:11:27 CEST 2006.
--------
--- NetworkManager/NetworkManager.changes 2006-04-10 18:24:11.000000000 +0200
+++ STABLE/NetworkManager/NetworkManager.changes 2006-04-12 09:45:08.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 12 09:36:16 CEST 2006 - jg@suse.de
+
+- Use wpa_supplicant 'wext' backend for ndiswrapper (Novell bug
+ #158892)
+
+-------------------------------------------------------------------
+Tue Apr 11 20:40:58 CEST 2006 - rml@suse.de
+
+- Use "AP_SCAN 2" for ndiswrapper (Novell bug #165315)
+- VPN Configure: Don't crash when re-Adding a connection after
+ closing window (Novell bug #153085)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.eNRwWa/_old 2006-04-12 10:11:06.000000000 +0200
+++ /var/tmp/diff_new_pack.eNRwWa/_new 2006-04-12 10:11:06.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 7
+Release: 9
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -244,6 +244,13 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Wed Apr 12 2006 - jg@suse.de
+- Use wpa_supplicant 'wext' backend for ndiswrapper (Novell bug
+ [#158892])
+* Tue Apr 11 2006 - rml@suse.de
+- Use "AP_SCAN 2" for ndiswrapper (Novell bug #165315)
+- VPN Configure: Don't crash when re-Adding a connection after
+ closing window (Novell bug #153085)
* Mon Apr 10 2006 - rml@suse.de
- VPN Configure: Don't disable 'Forward' button when entering
dialog via 'Back' (Novell bug #164895)
++++++ nm-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.eNRwWa/_old 2006-04-12 10:11:06.000000000 +0200
+++ /var/tmp/diff_new_pack.eNRwWa/_new 2006-04-12 10:11:06.000000000 +0200
@@ -1,10 +1,10 @@
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
- ChangeLog | 80 +
+ ChangeLog | 87 ++
NEWS | 5
gnome/applet/applet.c | 87 --
gnome/applet/applet.glade | 60 -
- gnome/vpn-properties/nm-vpn-properties.c | 18
+ gnome/vpn-properties/nm-vpn-properties.c | 38
gnome/vpn-properties/nm-vpn-properties.c.orig | 1113 ++++++++++++++++++++++++++
src/NetworkManagerDbus.c | 8
src/NetworkManagerMain.h | 1
@@ -19,12 +19,19 @@
src/nm-netlink-monitor.c | 4
src/vpn-manager/nm-vpn-service.c | 13
test/nm-tool.c | 4
- 19 files changed, 1462 insertions(+), 284 deletions(-)
+ 19 files changed, 1482 insertions(+), 291 deletions(-)
diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog
--- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500
-+++ NetworkManager/ChangeLog 2006-04-10 12:22:10.000000000 -0400
-@@ -1,3 +1,83 @@
++++ NetworkManager/ChangeLog 2006-04-10 14:46:41.000000000 -0400
+@@ -1,3 +1,90 @@
++2006-04-10 Robert Love
++
++ * gnome/vpn-properties/nm-vpn-properties.c: Intercept and short-circuit
++ the "delete_event" signal on the druid's parent window and handle it
++ our way, lest using the WM to close the druid results in a series of
++ bloody and ultimately lethal errors.
++
+2006-04-10 Robert Love
+
+ * gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on
@@ -453,11 +460,11 @@
<widget class="GtkLabel" id="wep_passphrase_label">
diff -urN NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c NetworkManager/gnome/vpn-properties/nm-vpn-properties.c
--- NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c 2006-03-13 14:41:38.000000000 -0500
-+++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-04-10 12:21:37.000000000 -0400
++++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-04-10 14:45:46.000000000 -0400
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.1 2006/03/13 19:41:38 rml Exp $
-+ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.2 2006/04/10 16:21:37 rml Exp $
++ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.3 2006/04/10 18:45:46 rml Exp $
*
* nm-vpn-properties.c : GNOME UI dialogs for manipulating VPN connections
*
@@ -482,7 +489,38 @@
}
static gboolean vpn_druid_vpn_details_page_next (GnomeDruidPage *druidpage,
-@@ -818,7 +830,7 @@
+@@ -341,7 +353,11 @@
+ return FALSE;
+ }
+
+-
++static gboolean vpn_window_close (GtkWidget *ignored, gpointer user_data)
++{
++ gtk_widget_hide_all (GTK_WIDGET (druid_window));
++ return TRUE;
++}
+
+ static void
+ add_cb (GtkButton *button, gpointer user_data)
+@@ -611,7 +627,7 @@
+ char *conn_gconf_path;
+ GtkTreeIter iter;
+
+- /*printf ("edit\n");*/
++ printf ("edit_cb\n");
+
+ if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
+ goto out;
+@@ -773,7 +789,7 @@
+ const char *conn_name;
+ char *conn_gconf_path;
+
+- /*printf ("edit\n");*/
++ /*printf ("export_cb\n");*/
+
+ if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
+ goto out;
+@@ -818,7 +834,7 @@
gconf_value_get_list_type (value) != GCONF_VALUE_STRING ||
(conn_vpn_data = gconf_value_get_list (value)) == NULL)
goto error;
@@ -491,6 +529,37 @@
//conn_user_can_edit = (strcmp (conn_name, "RH VPN Boston") != 0);
gtk_list_store_append (vpn_conn_list, &iter);
+@@ -907,6 +923,7 @@
+ GtkCellRenderer *renderer;
+ GSList *i;
+ GtkHBox *vpn_type_hbox1;
++ GtkWidget *toplevel;
+ GDir *dir;
+
+ /* TODO: ensure only one copy of this program is running at any time */
+@@ -978,10 +995,8 @@
+ vpn_delete = glade_xml_get_widget (xml, "delete");
+ gtk_signal_connect (GTK_OBJECT (vpn_delete), "clicked", GTK_SIGNAL_FUNC (delete_cb), NULL);
+ w = glade_xml_get_widget (xml, "close");
+- gtk_signal_connect (GTK_OBJECT (w), "clicked",
+- GTK_SIGNAL_FUNC (close_cb), NULL);
+- gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
+- GTK_SIGNAL_FUNC (close_cb), NULL);
++ gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (close_cb), NULL);
++ gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", GTK_SIGNAL_FUNC (close_cb), NULL);
+
+ vpn_conn_view = GTK_TREE_VIEW (glade_xml_get_widget (xml, "vpnlist"));
+ vpn_conn_list = gtk_list_store_new (VPNCONN_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+@@ -1028,6 +1043,9 @@
+ gtk_signal_connect_after (GTK_OBJECT (w), "prepare", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_prepare), NULL);
+ gtk_signal_connect_after (GTK_OBJECT (w), "finish", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_finish), NULL);
+
++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
++ gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
++
+ druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection"));
+
+ /* make the druid window modal wrt. our main window */
diff -urN NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c.orig NetworkManager/gnome/vpn-properties/nm-vpn-properties.c.orig
--- NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c.orig 1969-12-31 19:00:00.000000000 -0500
+++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c.orig 2006-04-10 11:48:00.000000000 -0400
++++++ nm-wireless-driver-workarounds-rml.patch ++++++
--- /var/tmp/diff_new_pack.eNRwWa/_old 2006-04-12 10:11:06.000000000 +0200
+++ /var/tmp/diff_new_pack.eNRwWa/_new 2006-04-12 10:11:06.000000000 +0200
@@ -1,11 +1,8 @@
Index: src/nm-device-802-11-wireless.c
===================================================================
-RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
-retrieving revision 1.60.2.5
-diff -u -r1.60.2.5 nm-device-802-11-wireless.c
---- src/nm-device-802-11-wireless.c 27 Mar 2006 16:11:53 -0000 1.60.2.5
-+++ src/nm-device-802-11-wireless.c 28 Mar 2006 15:19:01 -0000
-@@ -214,22 +214,13 @@
+--- src/nm-device-802-11-wireless.c.orig
++++ src/nm-device-802-11-wireless.c
+@@ -215,22 +215,13 @@ get_wireless_capabilities (NMDevice80211
if ((data_len >= minlen) && range->we_version_compiled >= 18)
{
@@ -28,7 +25,7 @@
caps |= NM_802_11_CAP_CIPHER_CCMP;
}
-@@ -1829,23 +1820,21 @@
+@@ -1831,23 +1822,21 @@ nm_device_802_11_wireless_scan (gpointer
int orig_rate = 0;
struct iwreq wrq;
@@ -61,7 +58,7 @@
wrq.u.data.pointer = NULL;
wrq.u.data.flags = 0;
-@@ -2253,13 +2242,11 @@
+@@ -2255,13 +2244,11 @@ supplicant_status_cb (GIOChannel *source
}
@@ -76,7 +73,7 @@
return NM_SUPPLICANT_TIMEOUT;
}
-@@ -2425,13 +2412,30 @@
+@@ -2427,13 +2414,28 @@ supplicant_interface_init (NMDevice80211
const char * iface = nm_device_get_iface (NM_DEVICE (self));
gboolean success = FALSE;
int tries = 0;
@@ -94,8 +91,6 @@
+ */
+ if (!strcmp (kernel_driver, "ath_pci"))
+ wpa_driver = "madwifi";
-+ else if (!strcmp (kernel_driver, "ndiswrapper"))
-+ wpa_driver = "ndiswrapper";
+ else if (!strcmp (kernel_driver, "prism54"))
+ wpa_driver = "prism54";
+ else
@@ -108,7 +103,7 @@
goto exit;
wpa_ctrl_close (ctrl);
-@@ -2468,6 +2472,7 @@
+@@ -2470,6 +2472,7 @@ supplicant_send_network_config (NMDevice
gboolean user_created;
const char * hex_essid;
const char * ap_scan = "AP_SCAN 1";
@@ -116,13 +111,13 @@
guint32 caps;
gboolean supports_wpa;
-@@ -2489,12 +2494,25 @@
+@@ -2491,12 +2494,27 @@ supplicant_send_network_config (NMDevice
|| (caps & NM_802_11_CAP_PROTO_WPA2);
/* Use "AP_SCAN 2" if:
- * - The wireless network is non-broadcast or user created
- * - The wireless driver does not support WPA
-+ * - The wireless driver is orinoco, prism54, or airo
++ * - The wireless driver is orinoco, prism54, airo, or ndiswrapper
+ * - The wireless network is user created
+ * - The wireless driver does not support WPA
+ * Otherwise, we prefer "AP_SCAN 1".
@@ -135,6 +130,8 @@
+ else if (!strcmp (kernel_driver, "prism54"))
+ ap_scan = "AP_SCAN 2";
+ else if (!strcmp (kernel_driver, "airo"))
++ ap_scan = "AP_SCAN 2";
++ else if (!strcmp (kernel_driver, "ndiswrapper"))
ap_scan = "AP_SCAN 2";
+ else if (user_created)
+ ap_scan = "AP_SCAN 2";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...