From ad57d03301a9f68db953347c94572d3cc90ffbc6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 5 Aug 2011 16:01:34 -0400 Subject: [PATCH 01/10] handle changes to ifcfg files properly This commit adds upstream commits: 312c7c952cbb3f20bcb1092db9bfbb51485fcebd adc7ec170d429b6b8cdeb302c8afa96fbd3ba907 in order to squash an alpha blocker. See https://bugzilla.redhat.com/show_bug.cgi?id=727501 --- NetworkManager.spec | 8 ++- nm-controlled.patch | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 nm-controlled.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index bd67105..dd0116b 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.8.9997 -Release: 6%{snapshot}%{?dist} +Release: 7%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -28,6 +28,7 @@ Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch Patch4: nm-polkit-permissive.patch Patch5: nm-applet-wifi-dialog-ui-fixes.patch +Patch6: nm-controlled.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -164,6 +165,7 @@ tar -xjf %{SOURCE1} %patch3 -p1 -b .no-notifications %patch4 -p1 -b .polkit-permissive %patch5 -p1 -b .applet-wifi-ui +%patch6 -p1 -b .nm-controlled %build @@ -421,6 +423,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Fri Aug 05 2011 Ray Strode 0.8.9997-7.git20110721 +- Add some patches for some blocker + Resolves: #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-controlled.patch b/nm-controlled.patch new file mode 100644 index 0000000..6e2a182 --- /dev/null +++ b/nm-controlled.patch @@ -0,0 +1,123 @@ +From 312c7c952cbb3f20bcb1092db9bfbb51485fcebd Mon Sep 17 00:00:00 2001 +From: Jiří Klimeš +Date: Tue, 02 Aug 2011 07:15:37 +0000 +Subject: ifcfg-rh: emit "updated" signal when connection file is changed (rh #727501) + +Chain up to parent's commit_changes() even if in-memory and on-disk data are the +same; they are the same when another process changes the on-disk file. Just make +sure not to write out the data needlessly when same. + +This fixes a regression caused by 9cba854fa0a32022a44e922dd4e70aaaf3c00dd2. +It exhibits e.g. by not auto-activating connection when ONBOOT is changed from +"no" to "yes". Connection "updated" signal was not emitted and listeners like +NMPolicy was not prodded. +--- +diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +index 534f44d..04d3d3e 100644 +--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c ++++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +@@ -15,7 +15,7 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * +- * Copyright (C) 2008 - 2010 Red Hat, Inc. ++ * Copyright (C) 2008 - 2011 Red Hat, Inc. + */ + + #include +@@ -181,7 +181,7 @@ nm_ifcfg_connection_get_unmanaged_spec (NMIfcfgConnection *self) + static void + commit_changes (NMSettingsConnection *connection, + NMSettingsConnectionCommitFunc callback, +- gpointer user_data) ++ gpointer user_data) + { + NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (connection); + GError *error = NULL; +@@ -208,9 +208,12 @@ commit_changes (NMSettingsConnection *connection, + NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS); + g_object_unref (reread); + +- /* Don't bother writing anything out if nothing really changed */ +- if (same == TRUE) ++ /* Don't bother writing anything out if in-memory and on-disk data are the same */ ++ if (same) { ++ /* But chain up to parent to handle success - emits updated signal */ ++ NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->commit_changes (connection, callback, user_data); + return; ++ } + } + + if (writer_update_connection (NM_CONNECTION (connection), +@@ -227,7 +230,7 @@ commit_changes (NMSettingsConnection *connection, + } + } + +-static void ++static void + do_delete (NMSettingsConnection *connection, + NMSettingsConnectionDeleteFunc callback, + gpointer user_data) +-- +cgit v0.8.3-6-g21f6 +From adc7ec170d429b6b8cdeb302c8afa96fbd3ba907 Mon Sep 17 00:00:00 2001 +From: Jiří Klimeš +Date: Tue, 02 Aug 2011 08:45:43 +0000 +Subject: ifcfg-rh: make NM_CONTROLLED changes function properly (rh #727501) + +Changing NM_CONTROLED from "no" to "yes" worked just the first time. +Fix that by storing unmanaged spec when interface becomes unmanaged +and adjust condition identifying "no-change" updates to the ifcfg +file. +--- +diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c +index 7d27656..ed0dcec 100644 +--- a/src/settings/plugins/ifcfg-rh/plugin.c ++++ b/src/settings/plugins/ifcfg-rh/plugin.c +@@ -269,20 +269,24 @@ connection_new_or_changed (SCPluginIfcfg *self, + + /* Successfully read connection changes */ + +- /* When the connections are the same, nothing is done */ +- if (nm_connection_compare (NM_CONNECTION (existing), +- NM_CONNECTION (new), +- NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | +- NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) { ++ old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (existing)); ++ new_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (new)); ++ ++ /* When interface is unmanaged or the connections and unmanaged specs are the same ++ * there's nothing to do */ ++ if ( (g_strcmp0 (old_unmanaged, new_unmanaged) == 0 && new_unmanaged != NULL) ++ || ( nm_connection_compare (NM_CONNECTION (existing), ++ NM_CONNECTION (new), ++ NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | ++ NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS) ++ && g_strcmp0 (old_unmanaged, new_unmanaged) == 0)) { ++ + g_object_unref (new); + return; + } + + PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path); + +- old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (existing)); +- new_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (new)); +- + if (new_unmanaged) { + if (!old_unmanaged) { + /* Unexport the connection by telling the settings service it's +@@ -290,6 +294,11 @@ connection_new_or_changed (SCPluginIfcfg *self, + * unmanaged specs have changed. + */ + nm_settings_connection_signal_remove (NM_SETTINGS_CONNECTION (existing)); ++ /* Remove the path so that claim_connection() doesn't complain later when ++ * interface gets managed and connection is re-added. */ ++ nm_connection_set_path (NM_CONNECTION (existing), NULL); ++ ++ g_object_set (existing, NM_IFCFG_CONNECTION_UNMANAGED, new_unmanaged, NULL); + g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED); + } + } else { +-- +cgit v0.8.3-6-g21f6 From 2a9230ddc9969acdfda07d11eda54982e9935a26 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 26 Aug 2011 10:37:57 -0500 Subject: [PATCH 02/10] Update to 0.9 --- .gitignore | 39 ++++++++- NetworkManager.spec | 26 ++++-- nm-applet-internal-buildfixes.patch | 66 +++++++------- nm-applet-no-notifications.patch | 6 +- nm-applet-wifi-dialog-ui-fixes.patch | 6 +- nm-controlled.patch | 123 --------------------------- sources | 4 +- 7 files changed, 94 insertions(+), 176 deletions(-) delete mode 100644 nm-controlled.patch 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 dd0116b..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: 7%{snapshot}%{?dist} +Version: 0.9.0 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -28,7 +28,6 @@ Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch Patch4: nm-polkit-permissive.patch Patch5: nm-applet-wifi-dialog-ui-fixes.patch -Patch6: nm-controlled.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -165,7 +164,6 @@ tar -xjf %{SOURCE1} %patch3 -p1 -b .no-notifications %patch4 -p1 -b .polkit-permissive %patch5 -p1 -b .applet-wifi-ui -%patch6 -p1 -b .nm-controlled %build @@ -423,9 +421,19 @@ 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 - Resolves: #727501 +- 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) 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/nm-controlled.patch b/nm-controlled.patch deleted file mode 100644 index 6e2a182..0000000 --- a/nm-controlled.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 312c7c952cbb3f20bcb1092db9bfbb51485fcebd Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš -Date: Tue, 02 Aug 2011 07:15:37 +0000 -Subject: ifcfg-rh: emit "updated" signal when connection file is changed (rh #727501) - -Chain up to parent's commit_changes() even if in-memory and on-disk data are the -same; they are the same when another process changes the on-disk file. Just make -sure not to write out the data needlessly when same. - -This fixes a regression caused by 9cba854fa0a32022a44e922dd4e70aaaf3c00dd2. -It exhibits e.g. by not auto-activating connection when ONBOOT is changed from -"no" to "yes". Connection "updated" signal was not emitted and listeners like -NMPolicy was not prodded. ---- -diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c -index 534f44d..04d3d3e 100644 ---- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c -+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c -@@ -15,7 +15,7 @@ - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Copyright (C) 2008 - 2010 Red Hat, Inc. -+ * Copyright (C) 2008 - 2011 Red Hat, Inc. - */ - - #include -@@ -181,7 +181,7 @@ nm_ifcfg_connection_get_unmanaged_spec (NMIfcfgConnection *self) - static void - commit_changes (NMSettingsConnection *connection, - NMSettingsConnectionCommitFunc callback, -- gpointer user_data) -+ gpointer user_data) - { - NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (connection); - GError *error = NULL; -@@ -208,9 +208,12 @@ commit_changes (NMSettingsConnection *connection, - NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS); - g_object_unref (reread); - -- /* Don't bother writing anything out if nothing really changed */ -- if (same == TRUE) -+ /* Don't bother writing anything out if in-memory and on-disk data are the same */ -+ if (same) { -+ /* But chain up to parent to handle success - emits updated signal */ -+ NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->commit_changes (connection, callback, user_data); - return; -+ } - } - - if (writer_update_connection (NM_CONNECTION (connection), -@@ -227,7 +230,7 @@ commit_changes (NMSettingsConnection *connection, - } - } - --static void -+static void - do_delete (NMSettingsConnection *connection, - NMSettingsConnectionDeleteFunc callback, - gpointer user_data) --- -cgit v0.8.3-6-g21f6 -From adc7ec170d429b6b8cdeb302c8afa96fbd3ba907 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš -Date: Tue, 02 Aug 2011 08:45:43 +0000 -Subject: ifcfg-rh: make NM_CONTROLLED changes function properly (rh #727501) - -Changing NM_CONTROLED from "no" to "yes" worked just the first time. -Fix that by storing unmanaged spec when interface becomes unmanaged -and adjust condition identifying "no-change" updates to the ifcfg -file. ---- -diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c -index 7d27656..ed0dcec 100644 ---- a/src/settings/plugins/ifcfg-rh/plugin.c -+++ b/src/settings/plugins/ifcfg-rh/plugin.c -@@ -269,20 +269,24 @@ connection_new_or_changed (SCPluginIfcfg *self, - - /* Successfully read connection changes */ - -- /* When the connections are the same, nothing is done */ -- if (nm_connection_compare (NM_CONNECTION (existing), -- NM_CONNECTION (new), -- NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | -- NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) { -+ old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (existing)); -+ new_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (new)); -+ -+ /* When interface is unmanaged or the connections and unmanaged specs are the same -+ * there's nothing to do */ -+ if ( (g_strcmp0 (old_unmanaged, new_unmanaged) == 0 && new_unmanaged != NULL) -+ || ( nm_connection_compare (NM_CONNECTION (existing), -+ NM_CONNECTION (new), -+ NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | -+ NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS) -+ && g_strcmp0 (old_unmanaged, new_unmanaged) == 0)) { -+ - g_object_unref (new); - return; - } - - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path); - -- old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (existing)); -- new_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (new)); -- - if (new_unmanaged) { - if (!old_unmanaged) { - /* Unexport the connection by telling the settings service it's -@@ -290,6 +294,11 @@ connection_new_or_changed (SCPluginIfcfg *self, - * unmanaged specs have changed. - */ - nm_settings_connection_signal_remove (NM_SETTINGS_CONNECTION (existing)); -+ /* Remove the path so that claim_connection() doesn't complain later when -+ * interface gets managed and connection is re-added. */ -+ nm_connection_set_path (NM_CONNECTION (existing), NULL); -+ -+ g_object_set (existing, NM_IFCFG_CONNECTION_UNMANAGED, new_unmanaged, NULL); - g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED); - } - } else { --- -cgit v0.8.3-6-g21f6 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 From 9261b89fcb35f4e94121eecac53586c136450216 Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Fri, 9 Sep 2011 13:44:48 -0400 Subject: [PATCH 03/10] fix systemd scriptlets and trigger --- NetworkManager.spec | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 72543c3..4ce9adb 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -32,6 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig Requires(preun): chkconfig +Requires(post): systemd-sysv Requires(post): /bin/systemctl Requires(preun): /bin/systemctl Requires(postun): /bin/systemctl @@ -254,35 +255,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desk %post -if [ $1 == 1 ]; then - /sbin/chkconfig --add NetworkManager - /sbin/chkconfig NetworkManager resetpriorities - - # Enable (but don't start) the units by default - /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || : +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ]; then - /sbin/service NetworkManager stop >/dev/null 2>&1 - killall -TERM nm-system-settings >/dev/null 2>&1 - /sbin/chkconfig --del NetworkManager - - # Disable and stop the units - /bin/systemctl disable NetworkManager.service >/dev/null 2>&1 || : + # Package removal, not upgrade + /bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || : /bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || : fi %postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then - # On upgrade, reload init system configuration if we changed unit files - /bin/systemctl daemon-reload >/dev/null 2>&1 || : + # Package upgrade, not uninstall + /bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || : fi %triggerun -- NetworkManager < 1:0.8.990 -if /sbin/chkconfig --level 5 NetworkManager ; then - /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || : -fi +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply NetworkManager +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save NetworkManager >/dev/null 2>&1 ||: +/bin/systemctl --no-reload enable NetworkManager.service >/dev/null 2>&1 ||: +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del NetworkManager >/dev/null 2>&1 || : +/bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || : + %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 /sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 @@ -421,6 +422,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Fri Sep 9 2011 Tom Callaway - 0.9.0-2 +- fix systemd scriptlets and trigger + * Tue Aug 23 2011 Dan Williams - 0.9.0-1 - Update to 0.9 release - core: fix issue where scan results could be ignored From f0fa260b649caabb34fad5c4a5a246b6307775f1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 Sep 2011 23:23:54 -0500 Subject: [PATCH 04/10] Remove some old bits --- NetworkManager.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 4ce9adb..212afc8 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -242,9 +242,7 @@ install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir} %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/ # don't autostart in KDE on F13+ (#541353) -%if 0%{?fedora} > 12 echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop -%endif # validate the autostart .desktop file desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop From 71139934b4dfbed96a00991254f6b116fe209d82 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 20 Sep 2011 00:02:31 -0500 Subject: [PATCH 05/10] Update to 0.9.1.90 --- .gitignore | 2 + NetworkManager.spec | 51 ++++++++++++- nm-applet-internal-buildfixes.patch | 109 +++++++++++++++++---------- nm-applet-no-notifications.patch | 6 +- nm-applet-wifi-dialog-ui-fixes.patch | 6 +- sources | 4 +- 6 files changed, 127 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 56e0ca5..34d65e4 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,5 @@ network-manager-applet-0.8.1.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 +/NetworkManager-0.9.1.90.tar.bz2 +/network-manager-applet-0.9.1.90.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index 212afc8..0ed1069 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,13 +9,13 @@ %define snapshot %{nil} %define applet_snapshot %{nil} -%define realversion 0.9.0 +%define realversion 0.9.1.90 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.9.0 -Release: 2%{snapshot}%{?dist} +Version: 0.9.1.90 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -116,6 +116,7 @@ Summary: GNOME applications for use with NetworkManager Group: Applications/Internet Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-glib = %{epoch}:%{version}-%{release} +Requires: %{name}-gtk = %{epoch}:%{version}-%{release} Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: libnotify >= 0.4.3 @@ -154,6 +155,29 @@ This package contains the header and pkg-config files for development applicatio NetworkManager functionality from applications that use glib. +%package gtk +Summary: Private libraries for NetworkManager GUI support +Group: Development/Libraries +Requires: gtk3 >= %{gtk3_version} + +%description gtk +This package contains private libraries to be used only by nm-applet and +the GNOME Control Center. + + +%package gtk-devel +Summary: Private header files for NetworkManager GUI support +Group: Development/Libraries +Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-glib = %{epoch}:%{version}-%{release} +Requires: gtk3-devel +Requires: pkgconfig + +%description gtk-devel +This package contains private header and pkg-config files to be used only by +nm-applet and the GNOME control center. + + %prep %setup -q -n NetworkManager-%{realversion} @@ -419,7 +443,28 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/gtk-doc/html/libnm-util %{_datadir}/gtk-doc/html/libnm-util/* +%files gtk +%defattr(-,root,root,0755) +%{_libdir}/libnm-gtk.so.* + +%files gtk-devel +%defattr(-,root,root,0755) +%dir %{_includedir}/libnm-gtk +%{_includedir}/libnm-gtk/*.h +%{_libdir}/pkgconfig/libnm-gtk.pc +%{_libdir}/libnm-gtk.so +%dir %{_datadir}/libnm-gtk +%{_datadir}/libnm-gtk/*.ui + %changelog +* Mon Sep 19 2011 Dan Williams - 0.9.1.90-1 +- Update to 0.9.1.90 (0.9.2-beta1) +- core: fix IPv6 link-local DNS servers in the dnsmasq DNS plugin +- cli: add ability to delete connections +- keyfile: fix an issue with duplicated keyfile connections +- core: ensure the 'novj' option is passed through to pppd +- core: store timestamps for VPN connections too (rh #725353) + * Fri Sep 9 2011 Tom Callaway - 0.9.0-2 - fix systemd scriptlets and trigger diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 4a7ff40..e588671 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9 -- libnm-glib >= 0.9 -- libnm-util >= 0.9 -- libnm-glib-vpn >= 0.9 +- NetworkManager >= 0.9.1 +- libnm-glib >= 0.9.1 +- libnm-util >= 0.9.1 +- libnm-glib-vpn >= 0.9.1 gmodule-export-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0]) @@ -17,16 +17,16 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix AC_MSG_CHECKING(for gnome-bluetooth) PKG_CHECK_MODULES(GNOME_BLUETOOTH, - gnome-bluetooth-1.0 >= 2.27.6 -- libnm-util >= 0.9 -- libnm-glib >= 0.9, +- libnm-util >= 0.9.1 +- libnm-glib >= 0.9.1, + gnome-bluetooth-1.0 >= 2.27.6, have_gbt=yes, have_gbt=no) ;; esac -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -38,7 +38,7 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor $(GTK_CFLAGS) \ $(NMA_CFLAGS) \ @@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \ - ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/libnm-gtk/libnm-gtk.la \ $(GTK_LIBS) \ $(NMA_LIBS) \ - -lm @@ -49,9 +49,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor uidir = $(datadir)/nm-applet ui_DATA = \ -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9.0/network-manager-applet-0.9.0/src/gconf-helpers/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.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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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,13 +94,13 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tes noinst_PROGRAMS = test-upgrade -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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 \ -I${top_srcdir}/src/utils \ + -I${top_srcdir}/src/libnm-gtk \ + -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-glib \ @@ -108,9 +108,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M $(DISABLE_DEPRECATED) \ $(WARN_CFLAGS) @@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la - libnma_la_LIBADD = \ $(top_builddir)/src/marshallers/libmarshallers.la \ $(top_builddir)/src/utils/libutils.la \ + $(top_builddir)/src/libnm-gtk/libnm-gtk.la \ - $(GNOME_BLUETOOTH_LIBS) + $(GNOME_BLUETOOTH_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ @@ -118,9 +118,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M endif EXTRA_DIST = $(BT_WIDGET_SOURCES) -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -133,19 +133,19 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.build $(GTK_CFLAGS) \ $(NMA_CFLAGS) \ @@ -54,7 +58,9 @@ nm_applet_LDADD = \ - ${top_builddir}/src/marshallers/libmarshallers.la \ ${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ +- ${top_builddir}/src/libnm-gtk/libnm-gtk.la ++ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \ + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la uidir = $(datadir)/nm-applet - ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png -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 + ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am + -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.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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9.0/network-manager-applet-0.9.0/src/utils/tests/Makef noinst_PROGRAMS = test-utils -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -202,3 +202,32 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security uidir = $(datadir)/nm-applet ui_DATA = \ +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500 +@@ -1,3 +1,7 @@ ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + uidir = $(datadir)/libnm-gtk + ui_DATA = wifi.ui + +@@ -36,11 +40,14 @@ libnm_gtk_la_LIBADD = \ + $(NMA_LIBS) \ + $(GNOME_KEYRING_LIBS) \ + $(top_builddir)/src/marshallers/libmarshallers.la \ +- $(top_builddir)/src/wireless-security/libwireless-security.la ++ $(top_builddir)/src/wireless-security/libwireless-security.la \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la + + libnm_gtk_la_LDFLAGS = -Wl,-no-undefined + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnm-gtk.pc + +-EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA) +\ No newline at end of file ++EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA) diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch index 327d9ad..542a03b 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -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 +diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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 5d24ef9..296c4ec 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.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 +diff --git NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c index 2cd75e0..5ae4764 100644 ---- 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 +--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c ++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-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 7d1df1b..d970fac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0acb51a218ed16454d0ee04fe186e445 NetworkManager-0.9.0.tar.bz2 -8d1e26870039e27ae6b4606f593631d5 network-manager-applet-0.9.0.tar.bz2 +eef82b56869329b46f7d6960bfb041cb NetworkManager-0.9.1.90.tar.bz2 +c2eba14ca9194efac58334eebf0b844c network-manager-applet-0.9.1.90.tar.bz2 From 459e9986dd9f76bc42ce321faa4b57a32d6a0506 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 20 Sep 2011 00:13:23 -0500 Subject: [PATCH 06/10] BuildRequire: iso-codes --- NetworkManager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/NetworkManager.spec b/NetworkManager.spec index 0ed1069..70c3361 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -90,6 +90,7 @@ BuildRequires: desktop-file-utils BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 %endif BuildRequires: systemd +BuildRequires: iso-codes %description NetworkManager is a system network service that manages your network devices From a32d7328690492fc762c617760c1e51c39a09c74 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 20 Sep 2011 00:23:03 -0500 Subject: [PATCH 07/10] Fix iso-codes requirement --- NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 70c3361..acb24b4 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -90,7 +90,7 @@ BuildRequires: desktop-file-utils BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 %endif BuildRequires: systemd -BuildRequires: iso-codes +BuildRequires: iso-codes-devel %description NetworkManager is a system network service that manages your network devices From 69624ea7ae6170d6389aafa7dbc9858753d6e378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 27 Sep 2011 14:32:38 +0200 Subject: [PATCH 08/10] Updated git snapshot to fix ifcfg-rh security issue (CVE-2011-3364) (rh #737338) see https://bugzilla.redhat.com/show_bug.cgi?id=737338 (parent bug) https://bugzilla.redhat.com/show_bug.cgi?id=741418 (tracker bug) --- .gitignore | 2 ++ NetworkManager.spec | 11 ++++++++--- sources | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 34d65e4..99c57a1 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,5 @@ network-manager-applet-0.8.1.tar.bz2 /network-manager-applet-0.9.0.tar.bz2 /NetworkManager-0.9.1.90.tar.bz2 /network-manager-applet-0.9.1.90.tar.bz2 +/NetworkManager-0.9.1.90.git20110927.tar.bz2 +/network-manager-applet-0.9.1.90.git20110927.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index acb24b4..9c73bfc 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,15 +7,15 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot %{nil} -%define applet_snapshot %{nil} +%define snapshot .git20110927 +%define applet_snapshot .git20110927 %define realversion 0.9.1.90 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.1.90 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -458,6 +458,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/libnm-gtk/*.ui %changelog +* Tue Sep 27 2011 Jiří Klimeš - 0.9.1.90-2.git20110927 +- core: ifcfg-rh: remove newlines when writing to ifcfg files (CVE-2011-3364) (rh #737338) +- core: change iscsiadm path to /sbin/iscsiadm in ifcfg-rh plugin (rh #740753) +- core: fix refcounting when deleting a default wired connection (lp:797868) + * Mon Sep 19 2011 Dan Williams - 0.9.1.90-1 - Update to 0.9.1.90 (0.9.2-beta1) - core: fix IPv6 link-local DNS servers in the dnsmasq DNS plugin diff --git a/sources b/sources index d970fac..face1a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -eef82b56869329b46f7d6960bfb041cb NetworkManager-0.9.1.90.tar.bz2 -c2eba14ca9194efac58334eebf0b844c network-manager-applet-0.9.1.90.tar.bz2 +485df497921ae4a9eba8f25fb2b5fc81 NetworkManager-0.9.1.90.git20110927.tar.bz2 +c8f0627d303ed3893c38e151086ad5a5 network-manager-applet-0.9.1.90.git20110927.tar.bz2 From 06db800a5c6ef230b43339cc9dbd62df5518f054 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 27 Sep 2011 14:00:05 -0500 Subject: [PATCH 09/10] fix location of wifi.ui (rh #741448) --- NetworkManager.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 9c73bfc..717edc2 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.1.90 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -447,6 +447,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files gtk %defattr(-,root,root,0755) %{_libdir}/libnm-gtk.so.* +%dir %{_datadir}/libnm-gtk +%{_datadir}/libnm-gtk/*.ui %files gtk-devel %defattr(-,root,root,0755) @@ -454,10 +456,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libnm-gtk/*.h %{_libdir}/pkgconfig/libnm-gtk.pc %{_libdir}/libnm-gtk.so -%dir %{_datadir}/libnm-gtk -%{_datadir}/libnm-gtk/*.ui %changelog +* Tue Sep 27 2011 Dan Williams - 0.9.1.90-3.git20110927 +- core: fix location of wifi.ui (rh #741448) + * Tue Sep 27 2011 Jiří Klimeš - 0.9.1.90-2.git20110927 - core: ifcfg-rh: remove newlines when writing to ifcfg files (CVE-2011-3364) (rh #737338) - core: change iscsiadm path to /sbin/iscsiadm in ifcfg-rh plugin (rh #740753) From 38ea3e9999aff478d05f59c739bc593bc97e2791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 21 Oct 2011 10:38:10 +0200 Subject: [PATCH 10/10] Fix setting hostname from DHCP options (rh #719100) --- NetworkManager.spec | 7 ++++- rh719100-dhcp-hostname-fix.patch | 44 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 rh719100-dhcp-hostname-fix.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 717edc2..9da7812 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.1.90 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -28,6 +28,7 @@ Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch Patch4: nm-polkit-permissive.patch Patch5: nm-applet-wifi-dialog-ui-fixes.patch +Patch6: rh719100-dhcp-hostname-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -190,6 +191,7 @@ tar -xjf %{SOURCE1} %patch3 -p1 -b .no-notifications %patch4 -p1 -b .polkit-permissive %patch5 -p1 -b .applet-wifi-ui +%patch6 -p1 -b .dhcp-hostname %build @@ -458,6 +460,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libnm-gtk.so %changelog +* Fri Oct 21 2011 Jiří Klimeš - 0.9.1.90-4.git20110927 +- core: fix setting hostname from DHCP options (rh #719100) + * Tue Sep 27 2011 Dan Williams - 0.9.1.90-3.git20110927 - core: fix location of wifi.ui (rh #741448) diff --git a/rh719100-dhcp-hostname-fix.patch b/rh719100-dhcp-hostname-fix.patch new file mode 100644 index 0000000..0bc8fb8 --- /dev/null +++ b/rh719100-dhcp-hostname-fix.patch @@ -0,0 +1,44 @@ +From 74615ce23c8db9bbb4404860523feed1c9a5ffc8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Thu, 20 Oct 2011 16:51:02 +0200 +Subject: [PATCH] policy: fix setting hostname from DHCP options (rh #719100) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This commit fixes a regression introduced by commit +6272052f9dd9a27a2253515f47c8414ed53c09cf. + +dhclient prefixes options with "new_", however we remove that prefix +before putting options into NMDHCP4Config. + +Signed-off-by: Jiří Klimeš +--- + src/nm-policy.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nm-policy.c b/src/nm-policy.c +index 02292f7..5c4059e 100644 +--- a/src/nm-policy.c ++++ b/src/nm-policy.c +@@ -322,7 +322,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) + /* Grab a hostname out of the device's DHCP4 config */ + dhcp4_config = nm_device_get_dhcp4_config (best4); + if (dhcp4_config) { +- p = dhcp_hostname = nm_dhcp4_config_get_option (dhcp4_config, "new_host_name"); ++ p = dhcp_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); + if (dhcp_hostname && strlen (dhcp_hostname)) { + /* Sanity check; strip leading spaces */ + while (*p) { +@@ -341,7 +341,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) + /* Grab a hostname out of the device's DHCP6 config */ + dhcp6_config = nm_device_get_dhcp6_config (best6); + if (dhcp6_config) { +- p = dhcp_hostname = nm_dhcp6_config_get_option (dhcp6_config, "new_host_name"); ++ p = dhcp_hostname = nm_dhcp6_config_get_option (dhcp6_config, "host_name"); + if (dhcp_hostname && strlen (dhcp_hostname)) { + /* Sanity check; strip leading spaces */ + while (*p) { +-- +1.7.6.4 +