Hello community, here is the log from the commit of package NetworkManager checked in at Thu Apr 20 18:39:44 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-04-13 22:53:15.000000000 +0200 +++ STABLE/NetworkManager/NetworkManager.changes 2006-04-20 18:14:18.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 20 18:09:33 CEST 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 + VPN' window at a time, lest chaos ensue (Novell bug #165011) +- nm-applet: Don't bail out if the timestamp is not set + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.tB2ygi/_old 2006-04-20 18:39:21.000000000 +0200 +++ /var/tmp/diff_new_pack.tB2ygi/_new 2006-04-20 18:39:21.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 11 +Release: 14 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -149,6 +149,7 @@ %build sed -i s/" --sm-disable"// nm-applet.desktop +autoreconf CFLAGS="$RPM_OPT_FLAGS -fPIC" \ ./configure --prefix=/usr \ --datadir=%{gnome_datadir} \ @@ -247,6 +248,11 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* 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 + VPN' window at a time, lest chaos ensue (Novell bug #165011) +- nm-applet: Don't bail out if the timestamp is not set * Thu Apr 13 2006 - rml@suse.de - Install "nfs" dispatcher.d script to automatically restart NFS on interface up (Novell bug #156947) ++++++ nm-0.6-branch.patch ++++++ ++++ 1957 lines (skipped) ++++ between NetworkManager/nm-0.6-branch.patch ++++ and STABLE/NetworkManager/nm-0.6-branch.patch ++++++ nm-wireless-driver-workarounds-rml.patch ++++++ --- /var/tmp/diff_new_pack.tB2ygi/_old 2006-04-20 18:39:21.000000000 +0200 +++ /var/tmp/diff_new_pack.tB2ygi/_new 2006-04-20 18:39:21.000000000 +0200 @@ -1,8 +1,11 @@ Index: src/nm-device-802-11-wireless.c =================================================================== ---- src/nm-device-802-11-wireless.c.orig -+++ src/nm-device-802-11-wireless.c -@@ -215,22 +215,13 @@ get_wireless_capabilities (NMDevice80211 +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 20 Apr 2006 16:06:48 -0000 +@@ -214,22 +214,13 @@ if ((data_len >= minlen) && range->we_version_compiled >= 18) { @@ -25,7 +28,7 @@ caps |= NM_802_11_CAP_CIPHER_CCMP; } -@@ -1831,23 +1822,21 @@ nm_device_802_11_wireless_scan (gpointer +@@ -1829,23 +1820,21 @@ int orig_rate = 0; struct iwreq wrq; @@ -58,7 +61,7 @@ wrq.u.data.pointer = NULL; wrq.u.data.flags = 0; -@@ -2255,13 +2244,11 @@ supplicant_status_cb (GIOChannel *source +@@ -2253,13 +2242,11 @@ } @@ -73,7 +76,7 @@ return NM_SUPPLICANT_TIMEOUT; } -@@ -2427,13 +2414,28 @@ supplicant_interface_init (NMDevice80211 +@@ -2425,13 +2412,28 @@ const char * iface = nm_device_get_iface (NM_DEVICE (self)); gboolean success = FALSE; int tries = 0; @@ -103,7 +106,7 @@ goto exit; wpa_ctrl_close (ctrl); -@@ -2470,6 +2472,7 @@ supplicant_send_network_config (NMDevice +@@ -2468,6 +2470,7 @@ gboolean user_created; const char * hex_essid; const char * ap_scan = "AP_SCAN 1"; @@ -111,13 +114,16 @@ guint32 caps; gboolean supports_wpa; -@@ -2491,12 +2494,27 @@ supplicant_send_network_config (NMDevice +@@ -2489,12 +2492,39 @@ || (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, airo, or ndiswrapper ++ * - The wireless driver does not support "AP_SCAN 1" ++ * (orinoco, prism54, airo, and ndiswrapper) ++ * - The wireless network is hidden and the driver ++ * does not support "AP_SCAN 1" with hidden SSIDs (ipw2100) + * - The wireless network is user created + * - The wireless driver does not support WPA + * Otherwise, we prefer "AP_SCAN 1". @@ -128,12 +134,21 @@ + if (!strcmp (kernel_driver, "orinoco_cs")) + ap_scan = "AP_SCAN 2"; + else if (!strcmp (kernel_driver, "prism54")) -+ ap_scan = "AP_SCAN 2"; + 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"; ++ else if (!strcmp (kernel_driver, "ipw2100")) ++ { ++ if (nm_ap_get_broadcast (ap)) ++ ap_scan = "AP_SCAN 1"; ++ else ++ ap_scan = "AP_SCAN 2"; ++ } ++ else if (!strcmp (kernel_driver, "ath_pci")) ++ ap_scan = "AP_SCAN 1"; ++ else if ( user_created ) + ap_scan = "AP_SCAN 2"; + else if (!supports_wpa) + ap_scan = "AP_SCAN 2"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...