[NetworkManager/f14] Updated to 0.8.6-rc1 + git snapshot to fix ifcfg-rh security issue
Jirka Klimes
jklimes at fedoraproject.org
Tue Sep 27 11:46:42 UTC 2011
commit df717876b60a47a6de14b3fe58cbd916e991ca09
Author: Jiří Klimeš <jklimes at redhat.com>
Date: Tue Sep 27 13:34:20 2011 +0200
Updated to 0.8.6-rc1 + 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 | 17 +++++++++---
nm-applet-internal-buildfixes.patch | 48 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 ++--
sources | 4 +-
5 files changed, 44 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ff3922..8ca02bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,3 +235,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.4.git20110622.tar.bz2
/NetworkManager-0.8.5.91.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
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 1abc5a5..5151d76 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,14 +7,14 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
-%define realversion 0.8.5.91
+%define snapshot .git20110927
+%define applet_snapshot .git20110927
+%define realversion 0.8.5.92
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.5.91
+Version: 0.8.5.92
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -383,6 +383,15 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* 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)
+- core: use '@interface' for link-local DNS servers in the dnsmasq config
+- core: ensure NM can talk to newly installed VPN plugins (fdo #39463)
+- core: fix crash in ifcfg-rh plugin when system bus isn't around
+- core: add "Uuid" property to ActiveConnection interface
+- core: add 802.1X setting properties for subject and altsubject matches
+
* Tue Jul 19 2011 Dan Williams <dcbw at redhat.com> - 0.8.5.91-1
- Update to 0.8.6-beta2
- core: append interface name for IPv6 link-local DNS server addresses (rh #720001)
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index a8e3afa..fd31e93 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac 2009-07-28 13:11:39.261718877 -0400
+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
@@ -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.91/network-manager-applet-0.8.5.91/configure.ac.bu
;;
esac
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+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
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,9 +49,9 @@ diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+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
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -69,9 +69,9 @@ diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+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
@@ -6,6 +6,9 @@ INCLUDES = \
-I$(top_builddir) \
-I${top_builddir}/src/marshallers \
@@ -93,9 +93,9 @@ diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluet
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+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
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+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
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -140,9 +140,9 @@ diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+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
@@ -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.91/network-manager-applet-0.8.5.91/src/utils/tests
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+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
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index 0c6b271..d9117d9 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in.foo NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in
---- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+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
@@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner>
diff --git a/sources b/sources
index a42c5ed..c0c9f17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6433c2db4036663757633a1186698b98 NetworkManager-0.8.5.91.tar.bz2
-03455c3697aa44f51dc2ca8a29e3967c network-manager-applet-0.8.5.91.tar.bz2
+15e7844044566ab71a5db75c52155288 NetworkManager-0.8.5.92.git20110927.tar.bz2
+eec1f3bca42659372b64f5e095d1e8d4 network-manager-applet-0.8.5.92.git20110927.tar.bz2
More information about the scm-commits
mailing list