diff --git a/0001-platform-statement-braces.patch b/0001-platform-statement-braces.patch new file mode 100644 index 0000000..4d423e5 --- /dev/null +++ b/0001-platform-statement-braces.patch @@ -0,0 +1,33 @@ +From e119ce167d8c220eb743f2c26e6dbaafdac5c16a Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Thu, 21 Jan 2016 16:53:56 +0100 +Subject: [PATCH 1/1] linux-platform: fix accidental Python + +Coverity: CID 59378 (#1 of 1): Nesting level does not match indentation +(NESTING_INDENT_MISMATCH) This statement is indented to column 41, as if +it were nested within the preceding parent statement, but it is not. + +(cherry picked from commit 88da21caa156b30cb1cf62a930770e60c89b86a8) +--- + src/platform/nm-linux-platform.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c +index f73c228..ea2d5d3 100644 +--- a/src/platform/nm-linux-platform.c ++++ b/src/platform/nm-linux-platform.c +@@ -5728,9 +5728,10 @@ after_read: + i++; + + if ( data_next.seq_number == 0 +- || data_next.timeout_abs_ns > data->timeout_abs_ns) ++ || data_next.timeout_abs_ns > data->timeout_abs_ns) { + data_next.seq_number = data->seq_number; + data_next.timeout_abs_ns = data->timeout_abs_ns; ++ } + } + } + +-- +2.5.0 + diff --git a/NetworkManager.spec b/NetworkManager.spec index 946d21f..f4d42d0 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -92,6 +92,7 @@ Source2: 00-server.conf Source3: 20-connectivity-fedora.conf #Patch1: 0001-some.patch +Patch1: 0001-platform-statement-braces.patch Requires(post): systemd Requires(preun): systemd @@ -331,6 +332,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %setup -q -n NetworkManager-%{real_version} #%patch1 -p1 +%patch1 -p1 %build @@ -637,6 +639,7 @@ fi %changelog * Wed Feb 3 2016 Thomas Haller - 1:1.2.0-0.6.beta1 - specfile: remove no longer needed 10-ibft-plugin.conf and sync with contrib/rpm +- core: backport fix for missing braces bug in platform * Wed Feb 03 2016 Fedora Release Engineering - 1:1.2.0-0.5.beta1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild