Hello community,
here is the log from the commit of package NetworkManager
checked in at Sat Apr 22 01:21:51 CEST 2006.
--------
--- NetworkManager/NetworkManager.changes 2006-04-20 18:14:18.000000000 +0200
+++ STABLE/NetworkManager/NetworkManager.changes 2006-04-21 16:36:48.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 21 16:36:21 CEST 2006 - rml@suse.de
+
+- Use "AP_SCAN 2" for airo_cs, too (Novell bug #168308)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.KUjWX1/_old 2006-04-22 01:21:43.000000000 +0200
+++ /var/tmp/diff_new_pack.KUjWX1/_new 2006-04-22 01:21:43.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 14
+Release: 18
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -248,6 +248,8 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Fri Apr 21 2006 - rml@suse.de
+- Use "AP_SCAN 2" for airo_cs, too (Novell bug #168308)
* Thu Apr 20 2006 - rml@suse.de
- For ipw2200, use "AP_SCAN 2" if the AP is hidden (166219)
- nm-vpn-properties: Don't let the user open more than one 'Configure
++++++ nm-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.KUjWX1/_old 2006-04-22 01:21:44.000000000 +0200
+++ /var/tmp/diff_new_pack.KUjWX1/_new 2006-04-22 01:21:44.000000000 +0200
@@ -1,16 +1,16 @@
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
- ChangeLog | 112 +++++++
+ ChangeLog | 127 ++++++++
NEWS | 5
configure.in | 11
- gnome/applet/applet-dbus-info.c | 10
+ gnome/applet/applet-dbus-devices.c | 2
+ gnome/applet/applet-dbus-info.c | 12
gnome/applet/applet.c | 87 -----
gnome/applet/applet.glade | 60 +--
gnome/vpn-properties/Makefile.am | 6
gnome/vpn-properties/clipboard.c | 74 ++++
gnome/vpn-properties/clipboard.h | 6
gnome/vpn-properties/nm-vpn-properties.c | 42 ++
- initscript/Arch/.cvsignore | 4
initscript/Arch/Makefile.am | 4
initscript/Arch/networkmanager-dispatcher.in | 54 +++
initscript/Arch/networkmanager.in | 55 +++
@@ -19,26 +19,44 @@
initscript/Slackware/rc.networkmanager | 66 ----
initscript/Slackware/rc.networkmanager-dispatcher.in | 99 ++++++
initscript/Slackware/rc.networkmanager.in | 99 ++++++
+ src/NetworkManagerAPList.c | 15
+ src/NetworkManagerAPList.h | 4
src/NetworkManagerDbus.c | 8
src/NetworkManagerMain.h | 1
- src/NetworkManagerPolicy.c | 2
+ src/NetworkManagerPolicy.c | 4
src/NetworkManagerSystem.c | 291 +++++++++----------
src/NetworkManagerSystem.h | 2
src/backends/Makefile.am | 4
src/backends/NetworkManagerSuSE.c | 11
src/dhcp-manager/nm-dhcp-manager.c | 7
src/nm-dbus-nm.c | 5
+ src/nm-device-802-11-wireless.c | 4
src/nm-ip4-config.c | 30 +
src/nm-ip4-config.h | 5
src/nm-netlink-monitor.c | 4
src/vpn-manager/nm-vpn-service.c | 13
test/nm-tool.c | 4
- 33 files changed, 817 insertions(+), 371 deletions(-)
+ 36 files changed, 847 insertions(+), 381 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-20 12:05:48.000000000 -0400
-@@ -1,3 +1,115 @@
++++ NetworkManager/ChangeLog 2006-04-20 16:40:41.000000000 -0400
+@@ -1,3 +1,130 @@
++2006-04-20 Robert Love
++
++ Fix bug where hidden ESSID's would not show up in the applet, even
++ if NMI provided a BSSID -> ESSID mapping from Gconf. This occurred
++ because nm_policy_device_list_update_from_allowed_list() would merge
++ the data, putting a name to the hidden networks, but never notify NMI
++ of the changes. Simple fix is to invoke the function
++ nm_dbus_signal_wireless_network_change() if we make a mapping.
++ * src/NetworkManagerAPList.c: Call the function
++ nm_dbus_signal_wireless_network_change() if we made a successful
++ BSSID to ESSID mapping, notifying the applet of the "new" network.
++ * src/NetworkManagerAPList.h: Update the prototypes for both
++ nm_ap_list_copy_essids_by_address() and
++ nm_ap_list_copy_one_essid_by_address().
++
+2006-04-20 Robert Love
+
+ * gnome/applet/applet-dbus-info.c: Don't bail out if the timestamp is
@@ -309,9 +327,21 @@
gtk_widget_show_all (menu);
return menu;
+diff -urN NetworkManager-0.6.2/gnome/applet/applet-dbus-devices.c NetworkManager/gnome/applet/applet-dbus-devices.c
+--- NetworkManager-0.6.2/gnome/applet/applet-dbus-devices.c 2006-03-10 12:11:13.000000000 -0500
++++ NetworkManager/gnome/applet/applet-dbus-devices.c 2006-04-20 16:40:41.000000000 -0400
+@@ -515,7 +515,7 @@
+ {
+ DBusMessage * reply;
+ NetPropCBData * cb_data = (NetPropCBData *) user_data;
+- NMApplet * applet;
++ NMApplet * applet;
+ const char * op = NULL;
+ const char * essid = NULL;
+ const char * hw_addr = NULL;
diff -urN NetworkManager-0.6.2/gnome/applet/applet-dbus-info.c NetworkManager/gnome/applet/applet-dbus-info.c
--- NetworkManager-0.6.2/gnome/applet/applet-dbus-info.c 2006-02-27 01:26:31.000000000 -0500
-+++ NetworkManager/gnome/applet/applet-dbus-info.c 2006-04-20 12:05:20.000000000 -0400
++++ NetworkManager/gnome/applet/applet-dbus-info.c 2006-04-20 16:40:41.000000000 -0400
@@ -386,7 +386,7 @@
DBusMessage *message,
void *user_data)
@@ -337,6 +367,15 @@
/* Trusted status */
if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted))
+@@ -474,7 +470,7 @@
+
+ /* Third arg: Trusted (BOOLEAN) */
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted);
+-
++
+ /* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter);
+ if (bssids_value && (g_slist_length (gconf_value_get_list (bssids_value)) > 0))
diff -urN NetworkManager-0.6.2/gnome/applet/applet.glade NetworkManager/gnome/applet/applet.glade
--- NetworkManager-0.6.2/gnome/applet/applet.glade 2006-03-23 10:14:45.000000000 -0500
+++ NetworkManager/gnome/applet/applet.glade 2006-03-27 13:55:09.000000000 -0500
@@ -795,14 +834,6 @@
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/initscript/Arch/.cvsignore NetworkManager/initscript/Arch/.cvsignore
---- NetworkManager-0.6.2/initscript/Arch/.cvsignore 1969-12-31 19:00:00.000000000 -0500
-+++ NetworkManager/initscript/Arch/.cvsignore 2006-03-29 13:31:02.000000000 -0500
-@@ -0,0 +1,4 @@
-+Makefile
-+Makefile.in
-+networkmanager
-+networkmanager-dispatcher
diff -urN NetworkManager-0.6.2/initscript/Arch/Makefile.am NetworkManager/initscript/Arch/Makefile.am
--- NetworkManager-0.6.2/initscript/Arch/Makefile.am 1969-12-31 19:00:00.000000000 -0500
+++ NetworkManager/initscript/Arch/Makefile.am 2006-03-27 13:30:57.000000000 -0500
@@ -1331,6 +1362,67 @@
out:
return ip4_config;
}
+diff -urN NetworkManager-0.6.2/src/NetworkManagerAPList.c NetworkManager/src/NetworkManagerAPList.c
+--- NetworkManager-0.6.2/src/NetworkManagerAPList.c 2006-03-09 15:55:46.000000000 -0500
++++ NetworkManager/src/NetworkManagerAPList.c 2006-04-20 16:40:41.000000000 -0400
+@@ -589,7 +589,10 @@
+ * If one is found, copy the essid over to the original access point.
+ *
+ */
+-void nm_ap_list_copy_one_essid_by_address (NMAccessPoint *ap, NMAccessPointList *search_list)
++void nm_ap_list_copy_one_essid_by_address (NMData *app_data,
++ NMDevice80211Wireless *dev,
++ NMAccessPoint *ap,
++ NMAccessPointList *search_list)
+ {
+ NMAccessPoint *found_ap;
+
+@@ -599,7 +602,10 @@
+ if (!nm_ap_get_essid (ap) && (found_ap = nm_ap_list_get_ap_by_address (search_list, nm_ap_get_address (ap))))
+ {
+ if (nm_ap_get_essid (found_ap))
++ {
+ nm_ap_set_essid (ap, nm_ap_get_essid (found_ap));
++ nm_dbus_signal_wireless_network_change (app_data->dbus_connection, dev, ap, NETWORK_STATUS_APPEARED, 0);
++ }
+ }
+ }
+
+@@ -612,7 +618,10 @@
+ * its found, copy the source access point's essid to the dest access point.
+ *
+ */
+-void nm_ap_list_copy_essids_by_address (NMAccessPointList *dest, NMAccessPointList *source)
++void nm_ap_list_copy_essids_by_address (NMData *app_data,
++ NMDevice80211Wireless *dev,
++ NMAccessPointList *dest,
++ NMAccessPointList *source)
+ {
+ NMAPListIter *iter;
+ NMAccessPoint *dest_ap;
+@@ -623,7 +632,7 @@
+ if ((iter = nm_ap_list_iter_new (dest)))
+ {
+ while ((dest_ap = nm_ap_list_iter_next (iter)))
+- nm_ap_list_copy_one_essid_by_address (dest_ap, source);
++ nm_ap_list_copy_one_essid_by_address (app_data, dev, dest_ap, source);
+
+ nm_ap_list_iter_free (iter);
+ }
+diff -urN NetworkManager-0.6.2/src/NetworkManagerAPList.h NetworkManager/src/NetworkManagerAPList.h
+--- NetworkManager-0.6.2/src/NetworkManagerAPList.h 2006-01-22 17:40:14.000000000 -0500
++++ NetworkManager/src/NetworkManagerAPList.h 2006-04-20 16:40:41.000000000 -0400
+@@ -48,8 +48,8 @@
+ NMAccessPoint * nm_ap_list_get_ap_by_address (NMAccessPointList *list, const struct ether_addr *addr);
+
+ void nm_ap_list_copy_properties (NMAccessPointList *dest, NMAccessPointList *source);
+-void nm_ap_list_copy_essids_by_address (NMAccessPointList *dest, NMAccessPointList *source);
+-void nm_ap_list_copy_one_essid_by_address (NMAccessPoint *ap, NMAccessPointList *search_list);
++void nm_ap_list_copy_essids_by_address (NMData *app_data, NMDevice80211Wireless *dev, NMAccessPointList *dest, NMAccessPointList *source);
++void nm_ap_list_copy_one_essid_by_address (NMData *app_data, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMAccessPointList *search_list);
+
+ gboolean nm_ap_list_merge_scanned_ap (NMDevice80211Wireless *dev, NMAccessPointList *list, NMAccessPoint *merge_ap);
+
diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.c NetworkManager/src/NetworkManagerDbus.c
--- NetworkManager-0.6.2/src/NetworkManagerDbus.c 2006-02-24 13:59:03.000000000 -0500
+++ NetworkManager/src/NetworkManagerDbus.c 2006-04-06 10:13:19.000000000 -0400
@@ -1370,7 +1462,7 @@
GSList * dialup_list;
diff -urN NetworkManager-0.6.2/src/NetworkManagerPolicy.c NetworkManager/src/NetworkManagerPolicy.c
--- NetworkManager-0.6.2/src/NetworkManagerPolicy.c 2006-03-03 12:46:35.000000000 -0500
-+++ NetworkManager/src/NetworkManagerPolicy.c 2006-03-30 09:38:27.000000000 -0500
++++ NetworkManager/src/NetworkManagerPolicy.c 2006-04-20 16:40:41.000000000 -0400
@@ -390,7 +390,7 @@
* link to the old access point. We don't switch away
* from Ad-Hoc APs either.
@@ -1380,6 +1472,15 @@
if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
{
nm_info ("SWITCH: found better connection '%s/%s'"
+@@ -608,7 +608,7 @@
+ * in the ESSID of base stations that aren't broadcasting their ESSID, if we have their
+ * MAC address in our allowed list.
+ */
+- nm_ap_list_copy_essids_by_address (nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
++ nm_ap_list_copy_essids_by_address (data, wdev, nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
+ nm_ap_list_copy_properties (nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
+ }
+ else
diff -urN NetworkManager-0.6.2/src/NetworkManagerSystem.c NetworkManager/src/NetworkManagerSystem.c
--- NetworkManager-0.6.2/src/NetworkManagerSystem.c 2006-03-21 12:56:34.000000000 -0500
+++ NetworkManager/src/NetworkManagerSystem.c 2006-03-29 14:03:01.000000000 -0500
@@ -1764,6 +1865,27 @@
nm_unlock_mutex (app_data->dialup_list_mutex, __FUNCTION__);
}
+diff -urN NetworkManager-0.6.2/src/nm-device-802-11-wireless.c NetworkManager/src/nm-device-802-11-wireless.c
+--- NetworkManager-0.6.2/src/nm-device-802-11-wireless.c 2006-03-27 11:11:53.000000000 -0500
++++ NetworkManager/src/nm-device-802-11-wireless.c 2006-04-20 16:40:41.000000000 -0400
+@@ -1270,7 +1270,7 @@
+ wreq.u.essid.pointer = (caddr_t) safe_essid;
+ wreq.u.essid.length = strlen ((char *) safe_essid) + 1;
+ wreq.u.essid.flags = 1; /* Enable essid on card */
+-
++
+ #ifdef IOCTL_DEBUG
+ nm_info ("%s: About to SET IWESSID.", iface);
+ #endif
+@@ -3131,7 +3131,7 @@
+ if (!nm_ap_get_essid (ap))
+ {
+ nm_ap_set_broadcast (ap, FALSE);
+- nm_ap_list_copy_one_essid_by_address (ap, app_data->allowed_ap_list);
++ nm_ap_list_copy_one_essid_by_address (app_data, dev, ap, app_data->allowed_ap_list);
+ }
+
+ /* Add the AP to the device's AP list */
diff -urN NetworkManager-0.6.2/src/nm-ip4-config.c NetworkManager/src/nm-ip4-config.c
--- NetworkManager-0.6.2/src/nm-ip4-config.c 2006-03-17 13:39:29.000000000 -0500
+++ NetworkManager/src/nm-ip4-config.c 2006-03-29 14:03:01.000000000 -0500
++++++ nm-wireless-driver-workarounds-rml.patch ++++++
--- /var/tmp/diff_new_pack.KUjWX1/_old 2006-04-22 01:21:44.000000000 +0200
+++ /var/tmp/diff_new_pack.KUjWX1/_new 2006-04-22 01:21:44.000000000 +0200
@@ -135,7 +135,7 @@
+ ap_scan = "AP_SCAN 2";
+ else if (!strcmp (kernel_driver, "prism54"))
ap_scan = "AP_SCAN 2";
-+ else if (!strcmp (kernel_driver, "airo"))
++ else if (!strncmp (kernel_driver, "airo", 4))
+ ap_scan = "AP_SCAN 2";
+ else if (!strcmp (kernel_driver, "ndiswrapper"))
+ ap_scan = "AP_SCAN 2";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...