From cf6741f3db4c8818e466de9658e7c676c951841d Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Mar 01 2006 12:45:27 +0000
Subject: - Fix VPN-related crash

- Fix issue where NM would refuse to activate a VPN connection once it had
    timed out
- Log wpa_supplicant output for better debugging

---

diff --git a/.cvsignore b/.cvsignore
index 6b67eb3..9049d2d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 NetworkManager-0.5.1.cvs20060227.tar.gz
+NetworkManager-0.5.1.cvs20060301.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7d9c9e6..531d51e 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,13 +9,13 @@ ExcludeArch: s390 s390x
 %define bind_version 24:9.3.1-20
 
 %if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060227
+%define nm_cvs_version	.cvs20060301
 %endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 17%{?nm_cvs_version}
+Release: 18%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -23,7 +23,6 @@ Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
-Patch1: three-scan-prune.patch
 
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
@@ -118,7 +117,6 @@ NetworkManager functionality from applications that use glib.
 %prep
 %setup -q
 %patch0 -p0 -b .madwifi
-%patch1 -p0 -b .three-scan-prune
 
 %build
 %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes
@@ -216,6 +214,11 @@ fi
 
 
 %changelog
+* Wed Mar  1 2006 Dan Williams <dcbw@redhat.com> 0.5.1-18.cvs20060301
+- Fix VPN-related crash
+- Fix issue where NM would refuse to activate a VPN connection once it had timed out
+- Log wpa_supplicant output for better debugging
+
 * Tue Feb 28 2006 Christopher Aillon <caillon@redhat.com> 0.5.1-17.cvs20060228
 - Tweak three-scan-prune.patch
 
diff --git a/sources b/sources
index 899da5d..5b17353 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ec085cf5956fd4d8aad70e2d2b86cc2  NetworkManager-0.5.1.cvs20060227.tar.gz
+a3c6086c4c36a9110a0ea3914e6ef91d  NetworkManager-0.5.1.cvs20060301.tar.gz