Sync with F-9 branch

NetworkManager.spec

@@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3614
+%define snapshot svn3623
-%define applet_snapshot svn703
+%define applet_snapshot svn709
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -27,6 +27,7 @@ Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: no-strict-aliasing.patch
 Patch3: optionally-wait-for-network.patch
 Patch4: serial-debug.patch
+Patch5: explain-dns1-dns2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -142,6 +143,7 @@ tar -xzf %{SOURCE1}
 %patch2 -p1 -b .no-strict-aliasing
 %patch3 -p1 -b .wait-for-network
 %patch4 -p1 -b .serial-debug
+%patch5 -p1 -b .explain-dns1-dns2
 
 %build
 # Even though we don't require named, we still build with it
@@ -291,6 +293,24 @@ fi
 
 
 %changelog
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3623
+- Fix asking applets for the GSM PIN/PUK
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3622
+- Guess WEP key type in applet when asking for new keys
+- Correct OK button sensitivity in applet when asking for new WEP keys
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3620
+- Fix issues with Mobile Broadband connections caused by device init race patch
+
+* Tue Apr 29 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3619
+- Fix device initialization race that caused ethernet devices to get stuck on
+    startup
+- Fix PPPoE connections not showing up in the applet
+- Fix disabled OK button in connection editor some wireless and IP4 settings
+- Don't exit if HAL isn't up yet; wait for it
+- Fix a suspend/resume crash
+
 * Sun Apr 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3614
 - Don't ask for wireless keys when the driver sends disconnect events during
 	association; wait until the entire assocation times out

explain-dns1-dns2.patch

@@ -0,0 +1,21 @@
+diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
+--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo	2008-04-29 23:19:22.000000000 -0400
++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-04-29 23:25:10.000000000 -0400
+@@ -385,6 +385,17 @@ rewrite_resolv_conf (NMNamedManager *mgr
+ 		/* Using glibc resolver */
+ 		char *nameservers = compute_nameservers (composite);
+ 
++		if (!nameservers || !strlen (nameservers)) {
++			g_free (nameservers);
++			nameservers = g_strdup_printf ("\n\n%s%s%s%s%s%s",
++			                               "# No nameservers found; try putting DNS servers into your\n",
++			                               "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
++			                               "#\n",
++			                               "# DNS1=xxx.xxx.xxx.xxx\n",
++			                               "# DNS2=xxx.xxx.xxx.xxx\n",
++			                               "# SEARCH=lab.foo.com bar.foo.com\n");
++		}
++
+ 		if (fprintf (f, "%s%s%s\n",
+ 		             domain ? domain : "",
+ 		             searches ? searches : "",

sources

@@ -1,2 +1,2 @@
-cf3b981c710f464d73c785e30c8c613e  NetworkManager-0.7.0.svn3614.tar.gz
+914847f5627a3c637d667a9e161ed546  nm-applet-0.7.0.svn709.tar.gz
-5f021f8e792c14b3329c1fe5ed554c77  nm-applet-0.7.0.svn703.tar.gz
+308ac3e35ab19780534f70e46625437d  NetworkManager-0.7.0.svn3623.tar.gz