From 69624ea7ae6170d6389aafa7dbc9858753d6e378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 27 Sep 2011 14:32:38 +0200
Subject: [PATCH] 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š <jklimes@redhat.com> - 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 <dcbw@redhat.com> - 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