From 702d995767622031ee19bdf687e1f92f5dcd8272 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Aug 27 2008 20:33:13 +0000 Subject: - Fix parsing of DOMAIN in ifcfg files (rh #459370) - Fix reconnection to mobile broadband networks after an auth failure - Fix recognition of timeouts of PPP during mobile broadband connection - More compatible connection sharing (rh #458625) - Fix DHCP in minimal environments without glibc locale information installed - Add support for Option mobile broadband devices (like iCON 225 and iCON 7.2) - Add IP4 config information to dispatcher script environment - Merge WEP ASCII and Hex key types for cleaner UI - Pre-fill PPPoE password when authentication fails - Fixed some changes not getting saved in the connection editor - Accept both prefix and netmask in the conection editor's IPv4 page --- diff --git a/.cvsignore b/.cvsignore index b9bc29b..cbbf125 100644 --- a/.cvsignore +++ b/.cvsignore @@ -116,3 +116,5 @@ NetworkManager-0.7.0.svn3667.tar.gz NetworkManager-0.7.0.svn3669.tar.gz NetworkManager-0.7.0.svn3747.tar.gz nm-applet-0.7.0.svn755.tar.gz +NetworkManager-0.7.0.svn4022.tar.gz +nm-applet-0.7.0.svn870.tar.gz diff --git a/NetworkManager.spec b/NetworkManager.spec index ac5a853..dd92a2a 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,8 +9,8 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn3930 -%define applet_snapshot svn838 +%define snapshot svn4022 +%define applet_snapshot svn870 Name: NetworkManager Summary: Network connection manager and user applications @@ -47,8 +47,9 @@ Obsoletes: dhcdbd # Due to VPN auth-dialog changes in applet r662 # Due to using prefixes instead of netmasks in NM > r3812 # Due to consolidation of vpn + vpn-properties settings in NM >= r3927 -Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3927 -Conflicts: NetworkManager-openvpn < 1:0.7.0-15.svn3927 +# Due to UUID changes in NM >= 4013 +Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4022 +Conflicts: NetworkManager-openvpn < 1:0.7.0-15.svn4022 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -302,8 +303,23 @@ fi %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so +%dir %{_datadir}/gtk-doc/html/libnm-glib +%{_datadir}/gtk-doc/html/libnm-glib/ %changelog +* Wed Aug 27 2008 Dan Williams - 1:0.7.0-0.11.svn4022 +- Fix parsing of DOMAIN in ifcfg files (rh #459370) +- Fix reconnection to mobile broadband networks after an auth failure +- Fix recognition of timeouts of PPP during mobile broadband connection +- More compatible connection sharing (rh #458625) +- Fix DHCP in minimal environments without glibc locale information installed +- Add support for Option mobile broadband devices (like iCON 225 and iCON 7.2) +- Add IP4 config information to dispatcher script environment +- Merge WEP ASCII and Hex key types for cleaner UI +- Pre-fill PPPoE password when authentication fails +- Fixed some changes not getting saved in the connection editor +- Accept both prefix and netmask in the conection editor's IPv4 page + * Mon Aug 11 2008 Dan Williams - 1:0.7.0-0.11.svn3930 - Fix issue with mobile broadband connections that don't require authentication diff --git a/explain-dns1-dns2.patch b/explain-dns1-dns2.patch index b10b87f..eec05f8 100644 --- a/explain-dns1-dns2.patch +++ b/explain-dns1-dns2.patch @@ -1,22 +1,27 @@ diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 NetworkManager-0.7.0/src/named-manager/nm-named-manager.c ---- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-05-30 14:39:45.000000000 -0400 -+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-06-11 08:54:34.000000000 -0400 -@@ -268,6 +268,18 @@ rewrite_resolv_conf (NMNamedManager *mgr +--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-08-27 13:20:27.000000000 -0400 ++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-08-27 16:02:31.000000000 -0400 +@@ -236,7 +236,7 @@ update_resolv_conf (const char *iface, + g_free (tmp_str); + } + +- if (nameservers) { ++ if (nameservers && g_strv_length (nameservers)) { + GString *str; + int num; + int i; +@@ -259,6 +259,14 @@ update_resolv_conf (const char *iface, + } + + nameservers_str = g_string_free (str, FALSE); ++ } else { ++ nameservers_str = 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", ++ "# DOMAIN=lab.foo.com bar.foo.com\n"); + } - /* Using glibc resolver */ - 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 : "", diff --git a/sources b/sources index b348f99..8b55a46 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d04202fa281866c3984f9183ea01210e NetworkManager-0.7.0.svn3930.tar.gz -94074d228e4d52f7b1623b31ae32fc5e nm-applet-0.7.0.svn838.tar.gz +4634ada3bfe879592eeda006273e5126 NetworkManager-0.7.0.svn4022.tar.gz +ea879a8b628afce457e8f3c6b5be409b nm-applet-0.7.0.svn870.tar.gz