[NetworkManager/f14] Update to 0.8.5.93 (0.8.6-rc2)
Daniel Williams
dcbw at fedoraproject.org
Tue Oct 25 03:40:12 UTC 2011
commit 04c0f9116f7cc3788c120502c53915941df39f05
Author: Dan Williams <dcbw at redhat.com>
Date: Mon Oct 24 22:40:03 2011 -0500
Update to 0.8.5.93 (0.8.6-rc2)
.gitignore | 2 +
NetworkManager.spec | 24 +++++++++++++----
nm-applet-internal-buildfixes.patch | 48 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 ++--
sources | 4 +-
5 files changed, 49 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ca02bb..4a91b7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -237,3 +237,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.5.91.tar.bz2
/NetworkManager-0.8.5.92.git20110927.tar.bz2
/network-manager-applet-0.8.5.92.git20110927.tar.bz2
+/NetworkManager-0.8.5.93.tar.bz2
+/network-manager-applet-0.8.5.93.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 5151d76..9fefa93 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,14 +7,14 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20110927
-%define applet_snapshot .git20110927
-%define realversion 0.8.5.92
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.5.93
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.5.92
+Version: 0.8.5.93
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -281,7 +281,7 @@ fi
%post gnome
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
@@ -291,7 +291,7 @@ fi
%postun gnome
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%files -f %{name}.lang
@@ -383,6 +383,18 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Tue Oct 25 2011 Dan Williams <dcbw at redhat.com> - 0.8.5.93-1
+- Update to 0.8.5.93 (0.8.6-rc2)
+- core: fix crash when a client requests the "Uuid" property of an active VPN connection
+- core: bump dnsmasq cache size
+- core: make sure IPv6 routes are flushed for manual configurations
+- core: fix possible crash when starting ModemManager
+- core: accept IPv6 RAs when forwarding is on
+- core: fix setting hostname from DHCP options (rh #719100)
+- core: fix changing WPA connections to WEP
+- applet: show active VPN connections in the Connection Information dialog
+- applet: auto-unlock GSM modems when requested
+
* Tue Sep 27 2011 Jiří Klimeš <jklimes at redhat.com> - 0.8.5.92-1.git20110927
- Update to 0.8.5.92 (0.8.6-rc1) + git snapshot
- core: ifcfg-rh: remove newlines when writing to ifcfg files (CVE-2011-3364) (rh #737338)
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index fd31e93..caa0b56 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/configure.ac.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/configure.ac
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/configure.ac.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/configure.ac
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/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
@@ -24,9 +24,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/configure.ac.bu
;;
esac
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/connection-editor/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/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.5.92/network-manager-applet-0.8.5.92/src/connection-
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -69,9 +69,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/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.5.92/network-manager-applet-0.8.5.92/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/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 \
@@ -93,9 +93,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/gnome-bluet
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/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.5.92/network-manager-applet-0.8.5.92/src/utils/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -140,9 +140,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/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.5.92/network-manager-applet-0.8.5.92/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/tests/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/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 \
@@ -152,9 +152,9 @@ diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/utils/tests
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/wireless-security/Makefile.am
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/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 d9117d9..e6dbdbe 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/nm-applet.schemas.in.foo NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/nm-applet.schemas.in
---- NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.5.92/network-manager-applet-0.8.5.92/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/nm-applet.schemas.in.foo NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/nm-applet.schemas.in
+--- NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.5.93/network-manager-applet-0.8.5.93/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner>
diff --git a/sources b/sources
index c0c9f17..8ebd35e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-15e7844044566ab71a5db75c52155288 NetworkManager-0.8.5.92.git20110927.tar.bz2
-eec1f3bca42659372b64f5e095d1e8d4 network-manager-applet-0.8.5.92.git20110927.tar.bz2
+9263ec08dd4af20ff183c89653129762 NetworkManager-0.8.5.93.tar.bz2
+491744da4fe7451b912cd95565437792 network-manager-applet-0.8.5.93.tar.bz2
More information about the scm-commits
mailing list