From bb9d6e9560ba9ea85ad28b72c7ecc44066873617 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Fri, 11 Jan 2008 06:10:35 +0000
Subject: [PATCH] - Fix crash when activating a mobile broadband connection -
 Better handling of non-SSID-broadcasting APs on kernels that support it    
 (gnome.org #464215) (rh #373841) - Honor DHCP-server provided MTU if present
 (gnome.org #332953) - Use previous DNS settings if the VPN concentrator
 doesn't provide any     (gnome.org #346833)

---
 .cvsignore          | 13 ++++++++++---
 NetworkManager.spec | 22 ++++++++++++++++------
 sources             |  4 ++--
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a922ff8..b5133cf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -57,6 +57,13 @@ nm-applet-0.7.0.svn363.tar.gz
 NetworkManager-0.7.0.svn3109.tar.gz
 nm-applet-0.7.0.svn367.tar.gz
 nm-applet-0.7.0.svn368.tar.gz
-NetworkManager-0.7.0.svn3180.tar.gz
-nm-applet-0.7.0.svn405.tar.gz
-NetworkManager-0.7.0.svn3181.tar.gz
+NetworkManager-0.7.0.svn3133.tar.gz
+nm-applet-0.7.0.svn376.tar.gz
+NetworkManager-0.7.0.svn3134.tar.gz
+nm-applet-0.7.0.svn378.tar.gz
+NetworkManager-0.7.0.svn3138.tar.gz
+nm-applet-0.7.0.svn383.tar.gz
+NetworkManager-0.7.0.svn3204.tar.gz
+nm-applet-0.7.0.svn429.tar.gz
+NetworkManager-0.7.0.svn3235.tar.gz
+nm-applet-0.7.0.svn438.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index c791165..e12f2b3 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,13 +1,15 @@
 ExcludeArch: s390 s390x
 
-%define dbus_version	1.1
+%define dbus_version 1.1
 %define dbus_glib_version 0.73
 %define hal_version 0.5.0
 
 %define gtk2_version	2.12.0
 %define wireless_tools_version 1:28-0pre9
+%define libnl_version 1.0-0.15.pre8.git20071218
 
-%define snapshot svn3204
+%define snapshot svn3235
+%define applet_snapshot svn438
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +20,7 @@ Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn429.tar.gz
+Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,9 +32,9 @@ Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
-Requires: wpa_supplicant >= 0.5.7-16
+Requires: wpa_supplicant >= 0.5.7-21
+Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
-Requires: libnl >= 1.0-0.15.pre8.git20071218
 Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -49,7 +51,7 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
 BuildRequires: wpa_supplicant
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= %{libnl_version}
 BuildRequires: libnotify-devel >= 0.3
 BuildRequires: perl(XML::Parser)
 BuildRequires: automake autoconf intltool libtool
@@ -269,6 +271,14 @@ fi
 
 
 %changelog
+* Fri Jan 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3235
+- Fix crash when activating a mobile broadband connection
+- Better handling of non-SSID-broadcasting APs on kernels that support it
+    (gnome.org #464215) (rh #373841)
+- Honor DHCP-server provided MTU if present (gnome.org #332953)
+- Use previous DNS settings if the VPN concentrator doesn't provide any
+    (gnome.org #346833)
+
 * Fri Jan  4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3204
 - Fix WPA passphrase hashing on big endian (PPC, Sparc, etc) (rh #426233)
 
diff --git a/sources b/sources
index e2f047b..e5de3fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dac36bcb1109f871979a91a4a95fe3ef  NetworkManager-0.7.0.svn3204.tar.gz
-880f12c3a37b95bc1511f78ca436a7cc  nm-applet-0.7.0.svn429.tar.gz
+e91418fd1afc2df1344d9954b09ad43e  NetworkManager-0.7.0.svn3235.tar.gz
+e74967eb842fc6cab2bd692ce28a6749  nm-applet-0.7.0.svn438.tar.gz