Hello community,
here is the log from the commit of package NetworkManager
checked in at Tue Mar 28 18:26:48 CEST 2006.
--------
--- /work/SRC/all/NetworkManager/NetworkManager.changes 2006-03-27 18:13:21.000000000 +0200
+++ /work/src/done/STABLE/NetworkManager/NetworkManager.changes 2006-03-28 17:37:59.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 17:35:54 CEST 2006 - rml@suse.de
+
+- Don't let wpa_supplicant scan with the airo driver (bug #161389)
+- Don't let wpa_supplicant scan when creating a new Ad-Hoc network,
+ even if using the madwifi driver
+- nm-applet: minor HIG-related UI tweaks
+
+-------------------------------------------------------------------
New:
----
nm-0.6-branch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:54.000000000 +0200
+++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:54.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 1
+Release: 2
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -41,6 +41,7 @@
Patch3: nm-madwifi-strength-rml.patch
Patch4: nm-wireless-driver-workarounds-rml.patch
Patch5: nm-debug-wpa-less-rml.patch
+Patch6: nm-0.6-branch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: wireless-tools >= %{wireless_version}
Requires: dbus-1 >= %{dbus_version}
@@ -141,6 +142,7 @@
%patch3 -p0
%patch4 -p0
%patch5 -p0
+%patch6 -p1
%build
sed -i s/" --sm-disable"// nm-applet.desktop
@@ -205,10 +207,7 @@
%{gnome_datadir}/nm-applet/applet.glade
%{gnome_datadir}/icons/hicolor/16x16/apps/*.png
%{gnome_datadir}/icons/hicolor/22x22/apps/*.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wired.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless-encrypted.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-no-connection.png
+%{gnome_datadir}/icons/hicolor/48x48/apps/*.png
%dir %{gnome_datadir}/gnome-vpn-properties
%{gnome_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
@@ -243,6 +242,11 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Tue Mar 28 2006 - rml@suse.de
+- Don't let wpa_supplicant scan with the airo driver (bug #161389)
+- Don't let wpa_supplicant scan when creating a new Ad-Hoc network,
+ even if using the madwifi driver
+- nm-applet: minor HIG-related UI tweaks
* Mon Mar 27 2006 - rml@suse.de
- Revert ypbind restart behavior (Novell bug #159070)
- Bump wpa_supplicant requirement to version 0.4.8-9 (Bug #144268)
++++++ nm-0.6-branch.patch ++++++
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
ChangeLog | 31 +++++++++++++++++++++++
NEWS | 5 +++
gnome/applet/applet.glade | 60 +++++++++++++++++++++++-----------------------
src/nm-netlink-monitor.c | 4 +--
test/nm-tool.c | 4 +--
5 files changed, 69 insertions(+), 35 deletions(-)
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/ChangeLog NetworkManager-0.6-branch/ChangeLog
--- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500
+++ NetworkManager-0.6-branch/ChangeLog 2006-03-27 15:33:31.000000000 -0500
@@ -1,3 +1,34 @@
+2006-03-27 Dan Williams
+
+ Patch from Christian Persch
+ * gnome/applet/applet.glade
+ - HIG fixes; mostly for spacing and borders (gnome.org #336220)
+
+2006-03-27 Dan Williams
+
+ Patch from Diffe
+ * src/backends/NetworkManagerSlackware.c
+ - Don't restart howl, since it's been replaced by Avahi
+ in most distributions
+
+2006-03-27 Dan Williams
+
+ Patch from Tor Krill
+ * configure.in
+ initscript/Makefile.am
+ src/backends/Makefile.am
+ src/backends/NetworkManagerArch.c
+ initscript/Arch/Makefile.am
+ initscript/Arch/networkmanager-dispatcher.in
+ initscript/Arch/networkmanager.in
+ - Add Arch Linux support, fixes gnome.org #335147
+
+2006-03-27 Dan Williams
+
+ Patch from Diffe
+ * initscript/Slackware/rc.networkmanager
+ - update, fixed gnome.org #333368
+
2006-03-27 Robert Love
* configure.in: Bump version to 0.6.2.
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/gnome/applet/applet.glade NetworkManager-0.6-branch/gnome/applet/applet.glade
--- NetworkManager-0.6.2/gnome/applet/applet.glade 2006-03-23 10:14:45.000000000 -0500
+++ NetworkManager-0.6-branch/gnome/applet/applet.glade 2006-03-27 15:31:57.000000000 -0500
@@ -4,12 +4,12 @@
<glade-interface>
<widget class="GtkDialog" id="trust_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes"> </property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
<property name="modal">True</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -24,7 +24,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">14</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -68,7 +68,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -160,12 +160,12 @@
</widget>
<widget class="GtkDialog" id="driver_sucks_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes"> </property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
<property name="modal">True</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -180,7 +180,7 @@
<widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">14</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox1">
@@ -211,7 +211,7 @@
<child>
<widget class="GtkHBox" id="hbox2">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -303,7 +303,7 @@
</widget>
<widget class="GtkDialog" id="other_network_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Other Wireless Network...</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
@@ -324,7 +324,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -368,7 +368,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -427,8 +427,8 @@
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wireless_adapter_label">
@@ -485,7 +485,7 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
@@ -534,7 +534,7 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
@@ -618,7 +618,7 @@
</widget>
<widget class="GtkDialog" id="passphrase_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="has_focus">True</property>
<property name="title" translatable="yes">Wireless Network Key Required</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -639,7 +639,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -683,7 +683,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -741,7 +741,7 @@
<widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="security_combo_label">
@@ -828,7 +828,7 @@
</widget>
<widget class="GtkDialog" id="info_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Connection Information</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -900,7 +900,7 @@
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkImage" id="image1">
@@ -926,8 +926,8 @@
<property name="n_rows">14</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="label-interface">
@@ -1752,7 +1752,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wep_key_label">
@@ -1990,7 +1990,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkEntry" id="leap_username_entry">
@@ -2179,8 +2179,8 @@
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">4</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wpa_psk_label">
@@ -2416,8 +2416,8 @@
<property name="n_rows">10</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">4</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wpa-eap-ca-cert-file-label">
@@ -2985,7 +2985,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wep_passphrase_label">
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/NEWS NetworkManager-0.6-branch/NEWS
--- NetworkManager-0.6.2/NEWS 2006-03-27 11:05:17.000000000 -0500
+++ NetworkManager-0.6-branch/NEWS 2006-03-28 09:47:21.000000000 -0500
@@ -3,7 +3,10 @@
Overview of changes since NetworkManager-0.6.2
==============================================
-0.6.2 is a bug fix release.
+0.6.2 is a bug fix release. Note that NetworkManager no longer automatically
+runs dhcdbd if it is not running. This means that it is now the system's
+responsibility to start dhcdbd prior to NetworkManager, e.g. in the
+distribution's NetworkManager initscript.
* NetworkManager
* Many, many bug fixes (Everyone)
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/src/nm-netlink-monitor.c NetworkManager-0.6-branch/src/nm-netlink-monitor.c
--- NetworkManager-0.6.2/src/nm-netlink-monitor.c 2006-03-27 10:20:28.000000000 -0500
+++ NetworkManager-0.6-branch/src/nm-netlink-monitor.c 2006-03-27 15:35:20.000000000 -0500
@@ -133,8 +133,8 @@
}
gboolean
-nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
- GError **error)
+nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
+ GError **error)
{
struct sockaddr_nl monitor_address = { .nl_family = 0 };
int fd, saved_errno;
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/test/nm-tool.c NetworkManager-0.6-branch/test/nm-tool.c
--- NetworkManager-0.6.2/test/nm-tool.c 2006-03-02 18:01:33.000000000 -0500
+++ NetworkManager-0.6-branch/test/nm-tool.c 2006-03-27 12:58:53.000000000 -0500
@@ -84,7 +84,7 @@
success = FALSE;
break;
}
- fprintf (stderr, "State: %s\n\n", state_string);
+ printf ("State: %s\n\n", state_string);
return success;
}
@@ -327,7 +327,7 @@
print_string ("HW Address", hw_addr);
/* Capabilities */
- fprintf (stderr, "\n Capabilities:\n");
+ printf ("\n Capabilities:\n");
if (caps & NM_DEVICE_CAP_NM_SUPPORTED)
print_string (" Supported", "yes");
else
++++++ nm-wireless-driver-workarounds-rml.patch ++++++
--- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:55.000000000 +0200
+++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:55.000000000 +0200
@@ -1,10 +1,10 @@
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.3
-diff -u -r1.60.2.3 nm-device-802-11-wireless.c
---- src/nm-device-802-11-wireless.c 9 Mar 2006 21:51:24 -0000 1.60.2.3
-+++ src/nm-device-802-11-wireless.c 27 Mar 2006 15:46:30 -0000
+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 @@
if ((data_len >= minlen) && range->we_version_compiled >= 18)
@@ -116,14 +116,14 @@
guint32 caps;
gboolean supports_wpa;
-@@ -2489,12 +2494,23 @@
+@@ -2489,12 +2494,25 @@
|| (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 or prism54
-+ * - The wireless network is user created, but not madwifi
++ * - The wireless driver is orinoco, prism54, or airo
++ * - The wireless network is user created
+ * - The wireless driver does not support WPA
+ * Otherwise, we prefer "AP_SCAN 1".
*/
@@ -133,8 +133,10 @@
+ if (!strcmp (kernel_driver, "orinoco_cs"))
+ ap_scan = "AP_SCAN 2";
+ else if (!strcmp (kernel_driver, "prism54"))
++ ap_scan = "AP_SCAN 2";
++ else if (!strcmp (kernel_driver, "airo"))
ap_scan = "AP_SCAN 2";
-+ else if (user_created && strcmp (kernel_driver, "ath_pci"))
++ else if (user_created)
+ ap_scan = "AP_SCAN 2";
+ else if (!supports_wpa)
+ ap_scan = "AP_SCAN 2";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...