diff --git a/.cvsignore b/.cvsignore index ba80974..12abbf0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -95,3 +95,5 @@ NetworkManager-0.7.0.svn3549.tar.gz nm-applet-0.7.0.svn662.tar.gz NetworkManager-0.7.0.svn3566.tar.gz nm-applet-0.7.0.svn679.tar.gz +NetworkManager-0.7.0.svn3570.tar.gz +nm-applet-0.7.0.svn682.tar.gz diff --git a/NetworkManager.spec b/NetworkManager.spec index e9eae21..1a682b9 100644 --- a/NetworkManager.spec +++ b/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 svn3566 -%define applet_snapshot svn679 +%define snapshot svn3570 +%define applet_snapshot svn682 Name: NetworkManager Summary: Network connection manager and user applications @@ -26,6 +26,7 @@ Source2: nm-system-settings.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -139,6 +140,7 @@ tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .no-strict-aliasing %patch3 -p1 -b .wait-for-network +%patch4 -p1 -b .serial-debug %build # Even though we don't require named, we still build with it @@ -287,6 +289,10 @@ fi %changelog +* Thu Apr 17 2008 Dan Williams - 1:0.7.0-0.9.2.svn3570 +- PPoE authentication fixes +- More robust handing of mobile broadband device communications + * Wed Apr 16 2008 Dan Williams - 1:0.7.0-0.9.2.svn3566 - Honor options from /etc/sysconfig/network for blocking until network is up diff --git a/serial-debug.patch b/serial-debug.patch new file mode 100644 index 0000000..cfb0b20 --- /dev/null +++ b/serial-debug.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-0.7.0/src/nm-serial-device.c.foo NetworkManager-0.7.0/src/nm-serial-device.c +--- NetworkManager-0.7.0/src/nm-serial-device.c.foo 2008-04-10 12:51:43.000000000 -0400 ++++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-04-10 12:51:49.000000000 -0400 +@@ -19,7 +19,7 @@ + #include "nm-setting-ppp.h" + #include "nm-utils.h" + +-/* #define NM_DEBUG_SERIAL 1 */ ++#define NM_DEBUG_SERIAL 1 + + #define SERIAL_BUF_SIZE 2048 + diff --git a/sources b/sources index 24833f3..bc09744 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -029de3e4769d5a0d729191f57eb22c01 NetworkManager-0.7.0.svn3566.tar.gz -3ee218cd29382f3d3f871fe3f16894d3 nm-applet-0.7.0.svn679.tar.gz +e4bfe6f6b8ff60ca8129764b49841123 NetworkManager-0.7.0.svn3570.tar.gz +6782a0e8cd9c589a43a80ebc33b73ebd nm-applet-0.7.0.svn682.tar.gz