rpms/NetworkManager/F-10 revert-onboot-no-for-minimal.patch, NONE, 1.1 NetworkManager.spec, 1.261, 1.262 sources, 1.134, 1.135 NetworkManager-0.7.0.99-fix-hal-resync.patch, 1.1, NONE NetworkManager-0.7.1-localhost-localdomain.patch, 1.2, NONE missing-onboot-equals-yes.patch, 1.1, NONE

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17835

Modified Files:
	NetworkManager.spec sources 
Added Files:
	revert-onboot-no-for-minimal.patch 
Removed Files:
	NetworkManager-0.7.0.99-fix-hal-resync.patch 
	NetworkManager-0.7.1-localhost-localdomain.patch 
	missing-onboot-equals-yes.patch 
Log Message:
* Tue Mar 24 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-4
- nm: fix communication with Option GT Max 3.6 mobile broadband cards
- nm: fix communication with Huawei mobile broadband cards (rh #487663)
- nm: don't look up hostname when HOSTNAME=localhost unless asked (rh #490184)
- nm: fix crash during IP4 configuration (rh #491620)
- nm: ignore ONBOOT=no for minimal ifcfg files (f9 & f10 only) (rh #489398)
- applet: updated translations

* Wed Mar 18 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-3.5
- nm: work around unhandled device removals due to missing HAL events (rh #484530)
- nm: improve handling of multiple modem ports
- nm: support for Sony Ericsson F3507g / MD300 and Dell 5530
- applet: updated translations



revert-onboot-no-for-minimal.patch:

--- NEW FILE revert-onboot-no-for-minimal.patch ---
diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.foo NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c
--- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.foo	2009-03-18 13:43:30.000000000 -0400
+++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c	2009-03-18 13:49:34.000000000 -0400
@@ -197,7 +197,7 @@ get_one_ip4_addr (shvarFile *ifcfg,
 		
 
 static NMSetting *
-make_ip4_setting (shvarFile *ifcfg, const char *network_file, GError **error)
+make_ip4_setting (shvarFile *ifcfg, const char *network_file, gboolean *minimal, GError **error)
 {
 	NMSettingIP4Config *s_ip4 = NULL;
 	char *value = NULL;
@@ -253,8 +253,13 @@ make_ip4_setting (shvarFile *ifcfg, cons
 		tmp_ip4 = svGetValue (ifcfg, "IPADDR", FALSE);
 		tmp_prefix = svGetValue (ifcfg, "PREFIX", FALSE);
 		tmp_netmask = svGetValue (ifcfg, "NETMASK", FALSE);
-		if (!tmp_ip4 && !tmp_prefix && !tmp_netmask)
+		if (!tmp_ip4 && !tmp_prefix && !tmp_netmask) {
 			method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
+			value = svGetValue (ifcfg, "ONBOOT", FALSE);
+			if (value && !svTrueValue (ifcfg, "ONBOOT", TRUE))
+				*minimal = TRUE;
+			g_free (value);
+		}
 		g_free (tmp_ip4);
 		g_free (tmp_prefix);
 		g_free (tmp_netmask);
@@ -1247,6 +1252,7 @@ connection_from_file (const char *filena
 	char *nmc = NULL;
 	NMSetting *s_ip4;
 	char *ifcfg_name = NULL;
+	gboolean minimal = FALSE;
 
 	g_return_val_if_fail (filename != NULL, NULL);
 	g_return_val_if_fail (ignored != NULL, NULL);
@@ -1345,7 +1351,7 @@ connection_from_file (const char *filena
 	if (!connection || *ignored)
 		goto done;
 
-	s_ip4 = make_ip4_setting (parsed, network_file, error);
+	s_ip4 = make_ip4_setting (parsed, network_file, &minimal, error);
 	if (*error) {
 		g_object_unref (connection);
 		connection = NULL;
@@ -1354,6 +1360,10 @@ connection_from_file (const char *filena
 		nm_connection_add_setting (connection, s_ip4);
 	}
 
+	s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+	if (s_con && minimal)
+		g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NULL);
+
 	if (!nm_connection_verify (connection, error)) {
 		g_object_unref (connection);
 		connection = NULL;


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- NetworkManager.spec	10 Mar 2009 03:31:11 -0000	1.261
+++ NetworkManager.spec	24 Mar 2009 13:54:12 -0000	1.262
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20090324
+%define applet_snapshot .svn1233
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0.99
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,9 +28,7 @@
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
-Patch3: NetworkManager-0.7.1-localhost-localdomain.patch
-Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch
-Patch5: missing-onboot-equals-yes.patch
+Patch10: revert-onboot-no-for-minimal.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -148,9 +146,7 @@
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
-%patch3 -p1 -b .keep-localhost-localdomain
-%patch4 -p1 -b .fix-hal-resync
-%patch5 -p1 -b .missing-onboot
+%patch10 -p1 -b .ignore-onboot-for-minimal
 
 %build
 
@@ -331,6 +327,20 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Mar 24 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-4
+- nm: fix communication with Option GT Max 3.6 mobile broadband cards
+- nm: fix communication with Huawei mobile broadband cards (rh #487663)
+- nm: don't look up hostname when HOSTNAME=localhost unless asked (rh #490184)
+- nm: fix crash during IP4 configuration (rh #491620)
+- nm: ignore ONBOOT=no for minimal ifcfg files (f9 & f10 only) (rh #489398)
+- applet: updated translations
+
+* Wed Mar 18 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-3.5
+- nm: work around unhandled device removals due to missing HAL events (rh #484530)
+- nm: improve handling of multiple modem ports
+- nm: support for Sony Ericsson F3507g / MD300 and Dell 5530
+- applet: updated translations
+
 * Mon Mar  9 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-3
 - Missing ONBOOT should actually mean ONBOOT=yes (rh #489422)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	5 Mar 2009 10:53:40 -0000	1.134
+++ sources	24 Mar 2009 13:54:12 -0000	1.135
@@ -1,2 +1,2 @@
-2f3aef00a0cd1a2d32acba880bcca27c  NetworkManager-0.7.0.99.tar.bz2
-8670d75dffe0d4fe5a497f0857a5ff00  network-manager-applet-0.7.0.99.tar.bz2
+d056611fcbe1520fa520f9057d810be8  NetworkManager-0.7.0.99.git20090324.tar.bz2
+4bd79f75d5672302acc42fe01135c858  network-manager-applet-0.7.0.99.svn1233.tar.bz2


--- NetworkManager-0.7.0.99-fix-hal-resync.patch DELETED ---


--- NetworkManager-0.7.1-localhost-localdomain.patch DELETED ---


--- missing-onboot-equals-yes.patch DELETED ---