From 1fe2e942f6da3b3c8dc5616642a7b299185a6f7d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 26 Aug 2011 10:38:45 -0500 Subject: [PATCH] Update to 0.9 --- .gitignore | 39 ++++++++++++++-- NetworkManager.spec | 24 +++++++--- nm-applet-internal-buildfixes.patch | 66 ++++++++++++++-------------- nm-applet-no-notifications.patch | 6 +-- nm-applet-wifi-dialog-ui-fixes.patch | 6 +-- sources | 4 +- 6 files changed, 96 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 7169128..56e0ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -218,11 +218,44 @@ network-manager-applet-0.8.1.tar.bz2 /network-manager-applet-0.8.2.tar.bz2 /NetworkManager-0.8.2.git20101117.tar.bz2 /network-manager-applet-0.8.2.git20101117.tar.bz2 +/NetworkManager-0.8.995.git20110308.tar.bz2 +/network-manager-applet-0.8.995.git20110308.tar.bz2 +/NetworkManager-0.8.996.tar.bz2 +/network-manager-applet-0.8.996.tar.bz2 +/NetworkManager-0.8.997.tar.bz2 +/network-manager-applet-0.8.997.tar.bz2 +/NetworkManager-0.8.997.git20110324.tar.bz2 +/network-manager-applet-0.8.997.git20110324.tar.bz2 /NetworkManager-0.8.997.git20110325.tar.bz2 -/NetworkManager-0.8.997.git20110328.tar.bz2 /network-manager-applet-0.8.997.git20110325.tar.bz2 +/NetworkManager-0.8.997.git20110328.tar.bz2 /network-manager-applet-0.8.997.git20110328.tar.bz2 -/NetworkManager-0.8.999.tar.bz2 +/NetworkManager-0.8.997-compat.git20110330.tar.bz2 +/network-manager-applet-0.8.997.git20110330.tar.bz2 +/NetworkManager-0.8.997-compat.git20110331.tar.bz2 +/network-manager-applet-0.8.997.git20110331.tar.bz2 +/NetworkManager-0.8.998-compat.tar.bz2 +/network-manager-applet-0.8.998.tar.bz2 +/NetworkManager-0.8.998-compat.git20110406.tar.bz2 +/NetworkManager-0.8.998-compat.git20110419.tar.bz2 +/network-manager-applet-0.8.998.git20110419.tar.bz2 +/NetworkManager-0.8.998-compat.git20110427.tar.bz2 +/network-manager-applet-0.8.998.git20110427.tar.bz2 +/NetworkManager-0.8.999-compat.tar.bz2 /network-manager-applet-0.8.999.tar.bz2 -/NetworkManager-0.8.9997.git20110531.tar.bz2 +/NetworkManager-0.8.999-compat.git20110509.tar.bz2 +/network-manager-applet-0.8.999.git20110509.tar.bz2 +/NetworkManager-0.8.999-compat.git20110526.tar.bz2 +/network-manager-applet-0.8.999.git20110526.tar.bz2 +/NetworkManager-0.8.9997-compat.git20110531.tar.bz2 /network-manager-applet-0.8.9997.git20110531.tar.bz2 +/NetworkManager-0.8.9997-compat.git20110613.tar.bz2 +/network-manager-applet-0.8.9997.git20110613.tar.bz2 +/NetworkManager-0.8.9997-compat.git20110620.tar.bz2 +/network-manager-applet-0.8.9997.git20110620.tar.bz2 +/NetworkManager-0.8.9997.git20110702.tar.bz2 +/network-manager-applet-0.8.9997.git20110702.tar.bz2 +/NetworkManager-0.8.9997.git20110721.tar.bz2 +/network-manager-applet-0.8.9997.git20110721.tar.bz2 +/NetworkManager-0.9.0.tar.bz2 +/network-manager-applet-0.9.0.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index bd67105..72543c3 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,15 +7,15 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20110721 -%define applet_snapshot .git20110721 -%define realversion 0.8.9997 +%define snapshot %{nil} +%define applet_snapshot %{nil} +%define realversion 0.9.0 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.8.9997 -Release: 6%{snapshot}%{?dist} +Version: 0.9.0 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -421,6 +421,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue Aug 23 2011 Dan Williams - 0.9.0-1 +- Update to 0.9 release +- core: fix issue where scan results could be ignored +- core: ensure agent secrets are preserved when updating connections +- core: don't autoconnect disabled modems +- core: fix race when checking modem enabled/disabled status after disabling +- core: ensure newly installed VPN plugins can actually talk to NM +- core: add support for 802.1X certificate subject matching +- libnm-glib: various introspection fixes +- applet/editor: updated translations + +* Fri Aug 05 2011 Ray Strode 0.8.9997-7.git20110721 +- Add some patches for some blocker (rh #727501) + * Thu Jul 21 2011 Dan Williams - 0.8.9997-6.git20110721 - core: updated Russian translation (rh #652904) - core: fix possible crash if secrets are missing diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 4b43269..4a7ff40 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac 2009-07-28 13:11:39.261718877 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac 2009-07-28 13:11:39.261718877 -0400 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 -- NetworkManager >= 0.8.998 -- libnm-glib >= 0.8.998 -- libnm-util >= 0.8.998 -- libnm-glib-vpn >= 0.8.998 +- NetworkManager >= 0.9 +- libnm-glib >= 0.9 +- libnm-util >= 0.9 +- libnm-glib-vpn >= 0.9 gmodule-export-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0]) @@ -17,16 +17,16 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac.bu AC_MSG_CHECKING(for gnome-bluetooth) PKG_CHECK_MODULES(GNOME_BLUETOOTH, - gnome-bluetooth-1.0 >= 2.27.6 -- libnm-util >= 0.8.998 -- libnm-glib >= 0.8.998, +- libnm-util >= 0.9 +- libnm-glib >= 0.9, + gnome-bluetooth-1.0 >= 2.27.6, have_gbt=yes, have_gbt=no) ;; esac -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -49,9 +49,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection- uidir = $(datadir)/nm-applet ui_DATA = \ -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -82,9 +82,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpe + -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.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -94,9 +94,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpe noinst_PROGRAMS = test-upgrade -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 @@ -6,6 +6,9 @@ INCLUDES = \ -I$(top_builddir) \ -I${top_builddir}/src/marshallers \ @@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluet endif EXTRA_DIST = $(BT_WIDGET_SOURCES) -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -143,9 +143,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am uidir = $(datadir)/nm-applet ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -165,9 +165,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makef + -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.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -177,9 +177,9 @@ diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch index 73ee674..327d9ad 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in.foo NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 @@ -6,7 +6,7 @@ /apps/nm-applet/disable-connected-notifications nm-applet diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch index 817d294..5d24ef9 100644 --- a/nm-applet-wifi-dialog-ui-fixes.patch +++ b/nm-applet-wifi-dialog-ui-fixes.patch @@ -1,7 +1,7 @@ -diff --git NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c +diff --git NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c index 2cd75e0..5ae4764 100644 ---- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c -+++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c +--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c ++++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c @@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self, tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."), diff --git a/sources b/sources index 62d7c04..7d1df1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1131c26777ea56cf494a7a787173d831 NetworkManager-0.8.9997.git20110721.tar.bz2 -aaa651ba076a5b0876784930d325285e network-manager-applet-0.8.9997.git20110721.tar.bz2 +0acb51a218ed16454d0ee04fe186e445 NetworkManager-0.9.0.tar.bz2 +8d1e26870039e27ae6b4606f593631d5 network-manager-applet-0.9.0.tar.bz2