From 275a0ca5379aa4e3ecd6eb7a7bffbcfbbdb14039 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Oct 16 2009 05:27:49 +0000 Subject: - nm: add support for PEAP-GTC (rh #451027) - nm: ensure VPN secrets aren't re-used when they shouldn't be - nm: fix race causing erroneous ethernet carrier change events - nm: fixes for ZTE, Onda, and Sierra modem detection and operation - nm: enhanced support for Ericsson 'mbm' modems - nm: enhanced support for AT&T Quicksilver and Option iCON 505 - nm: work around PPP bug returning bogus nameservers - applet: PEAP, TTLS, and wired 802.1x fixes - applet: install GConf schemas - applet: fix default focus for passphrase dialogs - applet: translation updates - editor: fix editing system-wide VPN connections --- diff --git a/.cvsignore b/.cvsignore index 12b3464..2d4f06b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -161,3 +161,5 @@ NetworkManager-0.7.1.995.git20090928.tar.bz2 network-manager-applet-0.7.1.995.git20090928.tar.bz2 NetworkManager-0.7.1.996.git20091015.tar.bz2 network-manager-applet-0.7.1.996.tar.bz2 +NetworkManager-0.7.1.997.tar.bz2 +network-manager-applet-0.7.1.997.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index 26853ed..f105ab4 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,13 +9,13 @@ %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20091015 +%define snapshot %{nil} %define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.1.996 +Version: 0.7.1.997 Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ @@ -347,7 +347,7 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog -* Thu Oct 15 2009 Dan Williams - 0.7.1.996-1.git20091015 +* Thu Oct 15 2009 Dan Williams - 0.7.1.997-1 - nm: add support for PEAP-GTC (rh #451027) - nm: ensure VPN secrets aren't re-used when they shouldn't be - nm: fix race causing erroneous ethernet carrier change events @@ -355,6 +355,7 @@ fi - nm: enhanced support for Ericsson 'mbm' modems - nm: enhanced support for AT&T Quicksilver and Option iCON 505 - nm: work around PPP bug returning bogus nameservers +- editor: fix editing system-wide VPN connections - applet: PEAP, TTLS, and wired 802.1x fixes - applet: install GConf schemas - applet: fix default focus for passphrase dialogs diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 8114976..1cf1343 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,20 +1,20 @@ -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac 2009-04-05 08:31:12.000000000 -0400 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.10 -- NetworkManager >= 0.7.1 -- libnm_glib >= 0.7.1 -- libnm-util >= 0.7.1 -- libnm_glib_vpn >= 0.7.1 +- NetworkManager >= 0.7.1.997 +- libnm_glib >= 0.7.1.997 +- libnm-util >= 0.7.1.997 +- libnm_glib_vpn >= 0.7.1.997 gtk+-2.0 >= 2.14 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connectio if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-hel + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile. gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Mak + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am ---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 -+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am +--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 ++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/sources b/sources index 7614e81..92baa99 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e7ee1e623756c632134dc6b4cf47bcb1 network-manager-applet-0.7.1.996.tar.bz2 -5f0e1d01ca37011680c1411255c0fd61 NetworkManager-0.7.1.996.git20091015.tar.bz2 +12f12b2586043c21c3508b05e7994ba2 NetworkManager-0.7.1.997.tar.bz2 +3183f5ae3553da0ce9c381dadbcc19e0 network-manager-applet-0.7.1.997.tar.bz2