Hello community,
here is the log from the commit of package NetworkManager
checked in at Tue May 9 22:55:58 CEST 2006.
--------
--- NetworkManager/NetworkManager.changes 2006-05-07 21:29:45.000000000 +0200
+++ STABLE/NetworkManager/NetworkManager.changes 2006-05-09 17:24:37.000000000 +0200
@@ -1,0 +2,8 @@
+Tue May 9 17:23:29 CEST 2006 - rml@suse.de
+
+- nm-applet: Save WPA EPA private key passhrase, if any, in the
+ GNOME keyring and not in gconf (Novell bug #173823)
+- Merge nm-online-header.patch into nm-0.6-branch.patch (fix is now
+ upstream)
+
+-------------------------------------------------------------------
Old:
----
nm-online-header.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.c30CHd/_old 2006-05-09 22:55:50.000000000 +0200
+++ /var/tmp/diff_new_pack.c30CHd/_new 2006-05-09 22:55:50.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 27
+Release: 29
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -44,7 +44,6 @@
Patch5: nm-wireless-driver-workarounds-rml.patch
Patch6: nm-debug-wpa-less-rml.patch
Patch7: nm-resolv-conf-header-rml.patch
-Patch8: nm-online-header.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-client
Requires: wireless-tools >= %{wireless_version}
@@ -149,7 +148,6 @@
%patch5 -p0
%patch6 -p0
%patch7 -p0
-%patch8 -p0
%build
sed -i s/" --sm-disable"// nm-applet.desktop
@@ -260,6 +258,11 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Tue May 09 2006 - rml@suse.de
+- nm-applet: Save WPA EPA private key passhrase, if any, in the
+ GNOME keyring and not in gconf (Novell bug #173823)
+- Merge nm-online-header.patch into nm-0.6-branch.patch (fix is now
+ upstream)
* Sun May 07 2006 - jpr@suse.de
- Fix header include to fix build
* Tue May 02 2006 - rml@suse.de
++++++ nm-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.c30CHd/_old 2006-05-09 22:55:50.000000000 +0200
+++ /var/tmp/diff_new_pack.c30CHd/_new 2006-05-09 22:55:50.000000000 +0200
@@ -1,6 +1,6 @@
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
- ChangeLog | 190 ++++++++++++
+ ChangeLog | 196 ++++++++++++
NEWS | 5
configure.in | 11
gnome/applet/applet-compat.c | 2
@@ -8,6 +8,7 @@
gnome/applet/applet-dbus-info.c | 12
gnome/applet/applet.c | 87 -----
gnome/applet/applet.glade | 60 +--
+ gnome/applet/nm-gconf-wso-wpa-eap.c | 105 +++---
gnome/applet/passphrase-dialog.c | 4
gnome/libnm_glib/libnm_glib.c | 25 +
gnome/vpn-properties/Makefile.am | 6
@@ -22,6 +23,7 @@
initscript/Slackware/rc.networkmanager | 66 ----
initscript/Slackware/rc.networkmanager-dispatcher.in | 99 ++++++
initscript/Slackware/rc.networkmanager.in | 99 ++++++
+ libnm-util/dbus-helpers.c | 4
src/NetworkManager.c | 7
src/NetworkManagerAPList.c | 15
src/NetworkManagerAPList.h | 4
@@ -42,23 +44,29 @@
src/nm-netlink-monitor.c | 4
src/vpn-manager/nm-vpn-service.c | 13
test/Makefile.am | 5
- test/nm-online.c | 140 +++++++++
+ test/nm-online.c | 141 +++++++++
test/nm-tool.c | 4
- 44 files changed, 1112 insertions(+), 412 deletions(-)
+ 46 files changed, 1168 insertions(+), 472 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-05 15:32:36.000000000 -0400
-@@ -1,3 +1,193 @@
++++ NetworkManager/ChangeLog 2006-05-09 11:05:42.000000000 -0400
+@@ -1,3 +1,199 @@
++2006-05-09 Robert Love
++
++ * gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXME: Save the WPA EAP
++ private certificate passphrase, if any, in the GNOME Keyring.
++ * libnm-utils/dbus-helpers.c: Update.
++
+2006-05-05 Robert Love
+
+ * src/NetworkManager.c: Set the umask to 0022 when daemonizing, in case
+ root has a wacky default of its own (or, more common, a user has a
-+ bad umask and uses su/sudo to restart NetworkManager). Anything other
-+ than 0022 does not do what we want with, for example, resolv.conf. This
-+ problem is amplified by our judicious use of fopen(), which uses mode
-+ 0666 -- implying that the only way to get the permissions we want is
-+ with a umask of 0022.
++ bad umask and uses su/sudo to restart NetworkManager). Anything
++ other than 0022 does not do what we want with, for example,
++ resolv.conf. This problem is amplified by our judicious use of
++ fopen(), which uses mode 0666 -- implying that the only way to get
++ the permissions we want is with a umask of 0022.
+
+2006-05-05 Dan Williams
+
@@ -698,6 +706,200 @@
<child>
<widget class="GtkLabel" id="wep_passphrase_label">
+diff -urN NetworkManager-0.6.2/gnome/applet/nm-gconf-wso-wpa-eap.c NetworkManager/gnome/applet/nm-gconf-wso-wpa-eap.c
+--- NetworkManager-0.6.2/gnome/applet/nm-gconf-wso-wpa-eap.c 2006-03-27 10:14:05.000000000 -0500
++++ NetworkManager/gnome/applet/nm-gconf-wso-wpa-eap.c 2006-05-09 10:50:06.000000000 -0400
+@@ -45,7 +45,6 @@
+ const char * identity;
+ const char * passwd;
+ const char * anon_identity;
+- const char * private_key_passwd;
+ const char * private_key_file;
+ const char * client_cert_file;
+ const char * ca_cert_file;
+@@ -70,14 +69,16 @@
+ g_return_val_if_fail (we_cipher == NM_AUTH_TYPE_WPA_EAP, NULL);
+ g_return_val_if_fail (iter != NULL, NULL);
+
+- if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &key_type, &identity, &passwd, &anon_identity, &private_key_passwd,
+- &private_key_file, &client_cert_file, &ca_cert_file, &wpa_version))
++ if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &key_type, &identity, &passwd,
++ &anon_identity, &private_key_passwd, &private_key_file,
++ &client_cert_file, &ca_cert_file, &wpa_version))
+ goto out;
+
+ /* Success, build up our security object */
+ security = g_object_new (NM_TYPE_GCONF_WSO_WPA_EAP, NULL);
+ nm_gconf_wso_set_we_cipher (NM_GCONF_WSO (security), we_cipher);
+- nm_gconf_wso_set_key (NM_GCONF_WSO (security), "FIXME", 5); /* FIXME: What to do about Enterprise keys? */
++ if (private_key_passwd)
++ nm_gconf_wso_set_key (NM_GCONF_WSO (security), private_key_passwd, strlen (private_key_passwd));
+ security->priv->wpa_version = wpa_version;
+ security->priv->eap_method = eap_method;
+ security->priv->key_type = key_type;
+@@ -85,7 +86,6 @@
+ security->priv->identity = g_strdup (identity);
+ security->priv->passwd = g_strdup (passwd);
+ security->priv->anon_identity = g_strdup (anon_identity);
+- security->priv->private_key_passwd = g_strdup (private_key_passwd);
+ security->priv->private_key_file = g_strdup (private_key_file);
+ security->priv->client_cert_file = g_strdup (client_cert_file);
+ security->priv->ca_cert_file = g_strdup (ca_cert_file);
+@@ -102,7 +102,6 @@
+ char * identity = NULL;
+ char * passwd = NULL;
+ char * anon_identity = NULL;
+- char * private_key_passwd = NULL;
+ char * private_key_file = NULL;
+ char * client_cert_file = NULL;
+ char * ca_cert_file = NULL;
+@@ -116,70 +115,64 @@
+ g_return_val_if_fail ((we_cipher == NM_AUTH_TYPE_WPA_EAP), NULL);
+
+ nm_gconf_get_int_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"eap_method",
+- network,
+- &eap_method);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"eap_method",
++ network,
++ &eap_method);
+
+ nm_gconf_get_int_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"key_type",
+- network,
+- &key_type);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"key_type",
++ network,
++ &key_type);
+
+ nm_gconf_get_int_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"wpa_version",
+- network,
+- &wpa_version);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"wpa_version",
++ network,
++ &wpa_version);
+
+ nm_gconf_get_int_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"key_mgt",
+- network,
+- &key_mgmt);
+-
+- nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"identity",
+- network,
+- &identity);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"key_mgt",
++ network,
++ &key_mgmt);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"passwd",
+- network,
+- &passwd);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"identity",
++ network,
++ &identity);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"anon_identity",
+- network,
+- &anon_identity);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"passwd",
++ network,
++ &passwd);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"private_key_passwd",
+- network,
+- &private_key_passwd);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"anon_identity",
++ network,
++ &anon_identity);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"private_key_file",
+- network,
+- &private_key_file);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"private_key_file",
++ network,
++ &private_key_file);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"client_cert_file",
+- network,
+- &client_cert_file);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"client_cert_file",
++ network,
++ &client_cert_file);
+
+ nm_gconf_get_string_helper (client,
+- GCONF_PATH_WIRELESS_NETWORKS,
+- WPA_EAP_PREFIX"ca_cert_file",
+- network,
+- &ca_cert_file);
++ GCONF_PATH_WIRELESS_NETWORKS,
++ WPA_EAP_PREFIX"ca_cert_file",
++ network,
++ &ca_cert_file);
+
+ /* Success, build up our security object */
+ security = g_object_new (NM_TYPE_GCONF_WSO_WPA_EAP, NULL);
+@@ -191,7 +184,6 @@
+ security->priv->identity = g_strdup (identity);
+ security->priv->passwd = g_strdup (passwd);
+ security->priv->anon_identity = g_strdup (anon_identity);
+- security->priv->private_key_passwd = g_strdup (private_key_passwd);
+ security->priv->private_key_file = g_strdup (private_key_file);
+ security->priv->client_cert_file = g_strdup (client_cert_file);
+ security->priv->ca_cert_file = g_strdup (ca_cert_file);
+@@ -199,7 +191,6 @@
+ g_free (identity);
+ g_free (passwd);
+ g_free (anon_identity);
+- g_free (private_key_passwd);
+ g_free (private_key_file);
+ g_free (client_cert_file);
+ g_free (ca_cert_file);
+@@ -219,7 +210,7 @@
+ self->priv->identity ? : "",
+ self->priv->passwd ? : "",
+ self->priv->anon_identity ? : "",
+- self->priv->private_key_passwd ? : "",
++ nm_gconf_wso_get_key (instance),
+ self->priv->private_key_file ? : "",
+ self->priv->client_cert_file ? : "",
+ self->priv->ca_cert_file ? : "",
+@@ -262,10 +253,6 @@
+ gconf_client_set_string (client, key, self->priv->anon_identity, NULL);
+ g_free (key);
+
+- key = g_strdup_printf ("%s/%s/%sprivate_key_passwd", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
+- gconf_client_set_string (client, key, self->priv->private_key_passwd, NULL);
+- g_free (key);
+-
+ key = g_strdup_printf ("%s/%s/%sprivate_key_file", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
+ gconf_client_set_string (client, key, self->priv->private_key_file, NULL);
+ 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
@@ -1421,6 +1623,27 @@
+*)
+ echo "usage $0 start|stop|status|restart"
+esac
+diff -urN NetworkManager-0.6.2/libnm-util/dbus-helpers.c NetworkManager/libnm-util/dbus-helpers.c
+--- NetworkManager-0.6.2/libnm-util/dbus-helpers.c 2006-03-22 16:26:58.000000000 -0500
++++ NetworkManager/libnm-util/dbus-helpers.c 2006-05-09 10:24:04.000000000 -0400
+@@ -259,6 +259,8 @@
+ const char *ca_cert_file,
+ int wpa_version)
+ {
++ const char *fake_private_key_passwd = "";
++
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail ((wpa_version == IW_AUTH_WPA_VERSION_WPA) || (wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
+ g_return_val_if_fail ((eap_method == NM_EAP_METHOD_MD5)
+@@ -289,7 +291,7 @@
+ dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &anon_identity);
+
+ /* Seventh arg: Private key password (STRING) */
+- dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_passwd);
++ dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, private_key_passwd ? &private_key_passwd : &fake_private_key_passwd);
+
+ /* Eighth arg: Private key file (STRING) */
+ dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_file);
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
@@ -2315,8 +2538,8 @@
nminfotest_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
diff -urN NetworkManager-0.6.2/test/nm-online.c NetworkManager/test/nm-online.c
--- NetworkManager-0.6.2/test/nm-online.c 1969-12-31 19:00:00.000000000 -0500
-+++ NetworkManager/test/nm-online.c 2006-05-02 10:48:26.000000000 -0400
-@@ -0,0 +1,140 @@
++++ NetworkManager/test/nm-online.c 2006-05-09 11:22:51.000000000 -0400
+@@ -0,0 +1,141 @@
+/*
+ * nm-online.c - Are we online?
+ *
@@ -2339,7 +2562,8 @@
+#include
+#include
+#include
-+#include
++
++#include "NetworkManager.h"
+
+typedef struct
+{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...