Hello community, here is the log from the commit of package NetworkManager checked in at Thu May 25 00:18:18 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-22 17:32:50.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-24 17:24:31.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 24 17:21:21 CEST 2006 - rml@suse.de + +- Do not fallback to link-local IP generation on infrastructure + wireless networks, only Ad-Hoc (Novell bug #178403) +- Set and use the current locale directory (Novell bug #169096) +- Bump version requirement on wpa_supplicant to 0.4.8-14.1 from + 0.4.8-9 (Novell bug #175892) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.IOXXZ9/_old 2006-05-25 00:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.IOXXZ9/_new 2006-05-25 00:13:48.000000000 +0200 @@ -17,7 +17,7 @@ %define dbus_version 0.60-22 %define hal_version 0.5.0 %define wireless_version 28pre13-6 -%define wpa_supplicant_version 0.4.8-9 +%define wpa_supplicant_version 0.4.8-14.1 %define resmgr_version 0.9.8 %define dhcp_version 3.0.3-22 %define gtk_version 2.6.0 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 37 +Release: 38 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -261,6 +261,12 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Wed May 24 2006 - rml@suse.de +- Do not fallback to link-local IP generation on infrastructure + wireless networks, only Ad-Hoc (Novell bug #178403) +- Set and use the current locale directory (Novell bug #169096) +- Bump version requirement on wpa_supplicant to 0.4.8-14.1 from + 0.4.8-9 (Novell bug #175892) * Mon May 22 2006 - rml@suse.de - Fix ypbind/autofs behavior to never automatically start either, but only reload as needed (Novell bug #175935) ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.IOXXZ9/_old 2006-05-25 00:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.IOXXZ9/_new 2006-05-25 00:13:48.000000000 +0200 @@ -1,73 +1,114 @@ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE - ChangeLog | 278 ++++++++++++++++++ + ChangeLog | 314 +++++++++++++++++++ NEWS | 5 configure.in | 11 + gnome/applet/Makefile.am | 2 gnome/applet/applet-compat.c | 2 gnome/applet/applet-dbus-devices.c | 9 gnome/applet/applet-dbus-info.c | 14 gnome/applet/applet.c | 153 +++------ gnome/applet/applet.glade | 60 +-- gnome/applet/applet.h | 4 - gnome/applet/main.c | 22 - + gnome/applet/eggtrayicon.c | 2 + gnome/applet/main.c | 24 - gnome/applet/menu-items.c | 59 ++- gnome/applet/menu-items.h | 2 - gnome/applet/nm-gconf-wso-wpa-eap.c | 105 +++--- - gnome/applet/passphrase-dialog.c | 4 + gnome/applet/nm-gconf-wso-wpa-eap.c | 105 ++---- + gnome/applet/passphrase-dialog.c | 5 + gnome/applet/vpn-password-dialog.c | 3 gnome/applet/wireless-network.c | 21 + gnome/applet/wireless-network.h | 3 gnome/libnm_glib/libnm_glib.c | 25 + - gnome/vpn-properties/Makefile.am | 6 + gnome/vpn-properties/Makefile.am | 8 gnome/vpn-properties/clipboard.c | 74 ++++ gnome/vpn-properties/clipboard.h | 6 - gnome/vpn-properties/nm-vpn-properties.c | 44 ++ + gnome/vpn-properties/nm-vpn-properties.c | 46 +- initscript/Arch/Makefile.am | 4 initscript/Arch/networkmanager-dispatcher.in | 54 +++ initscript/Arch/networkmanager.in | 55 +++ initscript/Makefile.am | 3 initscript/Slackware/Makefile.am | 4 - initscript/Slackware/rc.networkmanager | 66 ---- - initscript/Slackware/rc.networkmanager-dispatcher.in | 99 ++++++ - initscript/Slackware/rc.networkmanager.in | 99 ++++++ + initscript/Slackware/rc.networkmanager | 66 --- + initscript/Slackware/rc.networkmanager-dispatcher.in | 99 +++++ + initscript/Slackware/rc.networkmanager.in | 99 +++++ + libnm-util/Makefile.am | 2 libnm-util/dbus-helpers.c | 4 po/ChangeLog | 4 - po/hu.po | 184 ++++-------- - src/NetworkManager.c | 7 + po/hu.po | 184 +++-------- + src/Makefile.am | 2 + src/NetworkManager.c | 16 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 src/NetworkManagerDbus.c | 74 ++-- src/NetworkManagerDbus.h | 2 src/NetworkManagerMain.h | 1 src/NetworkManagerPolicy.c | 4 - src/NetworkManagerSystem.c | 291 +++++++++---------- + src/NetworkManagerSystem.c | 291 ++++++++--------- src/NetworkManagerSystem.h | 2 src/NetworkManagerUtils.c | 15 src/NetworkManagerUtils.h | 1 src/backends/Makefile.am | 4 - src/backends/NetworkManagerSuSE.c | 72 +++- + src/backends/NetworkManagerSuSE.c | 72 ++-- src/backends/interface_parser.c | 29 + src/dhcp-manager/nm-dhcp-manager.c | 7 src/nm-ap-security-wep.c | 15 src/nm-dbus-net.c | 1 src/nm-dbus-nm.c | 21 - src/nm-dbus-nmi.c | 1 - src/nm-device-802-11-wireless.c | 217 +++++++++----- + src/nm-device-802-11-wireless.c | 227 ++++++++----- src/nm-device-802-11-wireless.h | 2 src/nm-device-802-3-ethernet.c | 3 - src/nm-device.c | 33 -- + src/nm-device.c | 33 - 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/Makefile.am | 5 - test/nm-online.c | 141 +++++++++ + test/nm-online.c | 141 ++++++++ test/nm-tool.c | 4 - 62 files changed, 1705 insertions(+), 801 deletions(-) + 67 files changed, 1766 insertions(+), 813 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-05-22 11:24:12.000000000 -0400 -@@ -1,3 +1,281 @@ ++++ NetworkManager/ChangeLog 2006-05-24 11:52:16.000000000 -0400 +@@ -1,3 +1,317 @@ ++2006-05-24 Robert Love <rml@novell.com> ++ ++ * examples/python/systray/eggtrayicon.c, gnome/applet/eggtrayicon.c, ++ gnome/applet/passphrase-dialog.c, gnome/applet/vpn-password-dialog.c, ++ src/NetworkManager.c: Include <glib/gi18n.h> and not <libintl.h>. ++ ++2006-05-24 Robert Love <rml@novell.com> ++ ++ * gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am, ++ libnm-util/Makefile.am, src/Makefile.am, ++ vpn-daemons/openvpn/auth-dialog/Makefile.am, ++ vpn-daemons/openvpn/properties/Makefile.am, ++ vpn-daemons/pptp/auth-dialog/Makefile.am, ++ vpn-daemons/pptp/properties/Makefile.am, ++ vpn-daemons/vpnc/auth-dialog/Makefile.am, ++ vpn-daemons/vpnc/properties/Makefile.am: Do not override what the ++ user passed for --datadir, if anything, when setting the GNOME locale ++ directory. It should be a function of the specified datadir and not ++ the prefix. ++ ++2006-05-24 Robert Love <rml@novell.com> ++ ++ * gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c, ++ src/NetworkManager.c: Take care to call bindtextdomain with the ++ location of msgid files. ++ * src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo ++ files. ++ ++2006-05-22 Robert Love <rml@novell.com> ++ ++ * src/nm-device-802-11-wireless.c: Don't chain up to the parent's ++ stage4_timeout on failure unless the wireless network is Ad-Hoc. ++ 99% of the time there is a real problem with wireless, and a ++ seemingly successful connection via Zeroconf just confuses the user. ++ And that 1% of the time the network is probably Ad-Hoc, anyhow. ++ +2006-05-22 Robert Love <rml@novell.com> + + * src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and @@ -1006,9 +1047,21 @@ void nma_schedule_warning_dialog (NMApplet *applet, const char *msg); gboolean nma_driver_notify (gpointer user_data); void nma_show_vpn_failure_alert (NMApplet *applet, const char *member, const char *vpn_name, const char *error_msg); +diff -urN NetworkManager-0.6.2/gnome/applet/eggtrayicon.c NetworkManager/gnome/applet/eggtrayicon.c +--- NetworkManager-0.6.2/gnome/applet/eggtrayicon.c 2006-02-24 11:48:35.000000000 -0500 ++++ NetworkManager/gnome/applet/eggtrayicon.c 2006-05-24 11:52:16.000000000 -0400 +@@ -20,7 +20,7 @@ + + #include <config.h> + #include <string.h> +-#include <libintl.h> ++#include <glib/gi18n.h> + + #include "eggtrayicon.h" + diff -urN NetworkManager-0.6.2/gnome/applet/main.c NetworkManager/gnome/applet/main.c --- NetworkManager-0.6.2/gnome/applet/main.c 2006-02-27 01:26:31.000000000 -0500 -+++ NetworkManager/gnome/applet/main.c 2006-05-22 11:14:37.000000000 -0400 ++++ NetworkManager/gnome/applet/main.c 2006-05-24 10:17:20.000000000 -0400 @@ -22,7 +22,7 @@ */ @@ -1043,7 +1096,8 @@ + g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL); g_signal_connect (client, "die", G_CALLBACK (session_die), NULL); - bindtextdomain (GETTEXT_PACKAGE, NULL); +- bindtextdomain (GETTEXT_PACKAGE, NULL); ++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -1061,6 +1115,18 @@ return 0; } +diff -urN NetworkManager-0.6.2/gnome/applet/Makefile.am NetworkManager/gnome/applet/Makefile.am +--- NetworkManager-0.6.2/gnome/applet/Makefile.am 2006-03-09 15:48:32.000000000 -0500 ++++ NetworkManager/gnome/applet/Makefile.am 2006-05-24 11:00:55.000000000 -0400 +@@ -27,7 +27,7 @@ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ +- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + diff -urN NetworkManager-0.6.2/gnome/applet/menu-items.c NetworkManager/gnome/applet/menu-items.c --- NetworkManager-0.6.2/gnome/applet/menu-items.c 2005-12-29 11:54:34.000000000 -0500 +++ NetworkManager/gnome/applet/menu-items.c 2006-05-17 16:04:12.000000000 -0400 @@ -1405,8 +1471,16 @@ g_free (key); diff -urN NetworkManager-0.6.2/gnome/applet/passphrase-dialog.c NetworkManager/gnome/applet/passphrase-dialog.c --- NetworkManager-0.6.2/gnome/applet/passphrase-dialog.c 2006-02-27 01:26:31.000000000 -0500 -+++ NetworkManager/gnome/applet/passphrase-dialog.c 2006-05-04 16:15:31.000000000 -0400 -@@ -53,6 +53,7 @@ ++++ NetworkManager/gnome/applet/passphrase-dialog.c 2006-05-24 11:52:16.000000000 -0400 +@@ -20,7 +20,6 @@ + */ + + #include <config.h> +-#include <libintl.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -53,6 +52,7 @@ GladeXML * xml; WirelessSecurityManager * wsm; GtkComboBox * security_combo; @@ -1414,7 +1488,7 @@ g_return_if_fail (dialog != NULL); xml = get_dialog_xml (GTK_WIDGET (dialog)); -@@ -60,7 +61,8 @@ +@@ -60,7 +60,8 @@ wsm = (WirelessSecurityManager *) g_object_get_data (G_OBJECT (dialog), "wireless-security-manager"); g_return_if_fail (wsm != NULL); @@ -1424,6 +1498,26 @@ { /* Validate the wireless security choices */ security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo")); +diff -urN NetworkManager-0.6.2/gnome/applet/vpn-password-dialog.c NetworkManager/gnome/applet/vpn-password-dialog.c +--- NetworkManager-0.6.2/gnome/applet/vpn-password-dialog.c 2006-02-27 01:26:31.000000000 -0500 ++++ NetworkManager/gnome/applet/vpn-password-dialog.c 2006-05-24 11:52:16.000000000 -0400 +@@ -20,7 +20,6 @@ + */ + + #include <config.h> +-#include <libintl.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -29,7 +28,7 @@ + #include <glib.h> + #include <dbus/dbus.h> + #include <dbus/dbus-glib.h> +-#include <glib/gi18n-lib.h> ++#include <glib/gi18n.h> + #include <unistd.h> + + #include "applet.h" diff -urN NetworkManager-0.6.2/gnome/applet/wireless-network.c NetworkManager/gnome/applet/wireless-network.c --- NetworkManager-0.6.2/gnome/applet/wireless-network.c 2005-12-29 11:54:34.000000000 -0500 +++ NetworkManager/gnome/applet/wireless-network.c 2006-05-17 16:04:12.000000000 -0400 @@ -1633,7 +1727,7 @@ +#endif /* _VPN_PROPERTIES_CLIPBOARD_H */ diff -urN NetworkManager-0.6.2/gnome/vpn-properties/Makefile.am NetworkManager/gnome/vpn-properties/Makefile.am --- NetworkManager-0.6.2/gnome/vpn-properties/Makefile.am 2006-02-15 11:34:20.000000000 -0500 -+++ NetworkManager/gnome/vpn-properties/Makefile.am 2006-04-20 11:12:55.000000000 -0400 ++++ NetworkManager/gnome/vpn-properties/Makefile.am 2006-05-24 11:00:39.000000000 -0400 @@ -7,8 +7,10 @@ nm-vpn-ui-interface.h @@ -1647,13 +1741,22 @@ gladedir = $(datadir)/gnome-vpn-properties glade_DATA = nm-vpn-properties.glade +@@ -25,7 +27,7 @@ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ +- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + 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-05-22 11:14:21.000000000 -0400 ++++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-05-24 10:16:27.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.5 2006/05/21 17:50:25 dcbw Exp $ ++ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.6 2006/05/24 14:16:27 rml Exp $ * * nm-vpn-properties.c : GNOME UI dialogs for manipulating VPN connections * @@ -1762,6 +1865,15 @@ druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection")); /* make the druid window modal wrt. our main window */ +@@ -1066,7 +1086,7 @@ + { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } + }; + +- bindtextdomain (GETTEXT_PACKAGE, NULL); ++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + @@ -1091,7 +1111,7 @@ goto out; } @@ -2214,6 +2326,18 @@ /* Eighth arg: Private key file (STRING) */ dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_file); +diff -urN NetworkManager-0.6.2/libnm-util/Makefile.am NetworkManager/libnm-util/Makefile.am +--- NetworkManager-0.6.2/libnm-util/Makefile.am 2005-12-17 16:10:37.000000000 -0500 ++++ NetworkManager/libnm-util/Makefile.am 2006-05-24 11:00:31.000000000 -0400 +@@ -9,7 +9,7 @@ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ +- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" ++ -DGNOMELOCALEDIR=\"$(datadir)/locale\" + + if WITH_GCRYPT + libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) diff -urN NetworkManager-0.6.2/NEWS NetworkManager/NEWS --- NetworkManager-0.6.2/NEWS 2006-03-27 11:05:17.000000000 -0500 +++ NetworkManager/NEWS 2006-03-28 09:47:17.000000000 -0500 @@ -2915,6 +3039,20 @@ out: return ip4_config; } +diff -urN NetworkManager-0.6.2/src/Makefile.am NetworkManager/src/Makefile.am +--- NetworkManager-0.6.2/src/Makefile.am 2006-02-26 23:31:51.000000000 -0500 ++++ NetworkManager/src/Makefile.am 2006-05-24 10:37:28.000000000 -0400 +@@ -90,9 +90,9 @@ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + -DNM_RUN_DIR=\"$(rundir)\" \ ++ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DARP_DEBUG + +- + NetworkManager_LDADD = \ + $(DBUS_LIBS) \ + $(GTHREAD_LIBS) \ 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 @@ -2978,8 +3116,38 @@ diff -urN NetworkManager-0.6.2/src/NetworkManager.c NetworkManager/src/NetworkManager.c --- NetworkManager-0.6.2/src/NetworkManager.c 2006-02-27 15:06:24.000000000 -0500 -+++ NetworkManager/src/NetworkManager.c 2006-05-05 15:32:36.000000000 -0400 -@@ -786,6 +786,13 @@ ++++ NetworkManager/src/NetworkManager.c 2006-05-24 11:52:16.000000000 -0400 +@@ -19,6 +19,10 @@ + * (C) Copyright 2004 Red Hat, Inc. + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #include <glib.h> + #include <dbus/dbus.h> + #include <dbus/dbus-glib-lowlevel.h> +@@ -32,6 +36,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <glib/gi18n.h> + + #include "NetworkManager.h" + #include "nm-utils.h" +@@ -727,6 +732,10 @@ + return (EXIT_FAILURE); + } + ++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ + /* Parse options */ + while (1) + { +@@ -786,6 +795,13 @@ write_pidfile (pidfile); } @@ -3697,7 +3865,7 @@ * 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-05-17 10:57:46.000000000 -0400 ++++ NetworkManager/src/nm-device-802-11-wireless.c 2006-05-22 17:17:21.000000000 -0400 @@ -134,6 +134,140 @@ const char *key, int auth_method); @@ -3955,7 +4123,32 @@ #endif if (iw_get_ext (nm_dev_sock_get_fd (sk), iface, SIOCGIWAP, &wrq) >= 0) memcpy (bssid, &(wrq.u.ap_addr.sa_data), sizeof (struct ether_addr)); -@@ -3131,7 +3192,7 @@ +@@ -2752,16 +2813,22 @@ + nm_dbus_get_user_key_for_network (data->dbus_connection, req, TRUE); + ret = NM_ACT_STAGE_RETURN_POSTPONE; + } +- else ++ else if (nm_ap_get_mode (ap) == IW_MODE_ADHOC) + { + NMDevice80211WirelessClass * klass; + NMDeviceClass * parent_class; + +- /* Chain up to parent */ ++ /* For Ad-Hoc networks, chain up to parent to get a Zeroconf IP */ + klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (self); + parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); + ret = parent_class->act_stage4_ip_config_timeout (dev, req, &real_config); + } ++ else ++ { ++ /* Non-encrypted network and IP configure failed. Alert the user. */ ++ ret = NM_ACT_STAGE_RETURN_FAILURE; ++ } ++ + *config = real_config; + + return ret; +@@ -3131,7 +3198,7 @@ if (!nm_ap_get_essid (ap)) { nm_ap_set_broadcast (ap, FALSE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de