Accepting request 581636 from systemsmanagement:saltstack:testing

- Fix grains containing trailing "\n"
- Added:
  * fix-grains-with-n.patch

OBS-URL: https://build.opensuse.org/request/show/581636
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=113

2018.3.0rc1.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8699ddca2cb1f0fc09269f563b3dc4911830bc9777f009b429b154de2432146
-size 13576212
+oid sha256:7b81d27aa8c93aee69dc27990a76aee60dfaadda118b8303e717c5168b041b42
+size 13576729

activate-all-beacons-sources-config-pillar-grains.patch

@@ -1,4 +1,4 @@
-From b221de02c16f4be9871a1190f31f150b5fe2652c Mon Sep 17 00:00:00 2001
+From 9ba410b90abccad0359ceb96dbc17a357d141e94 Mon Sep 17 00:00:00 2001
 From: Bo Maryniuk <bo@suse.de>
 Date: Tue, 17 Oct 2017 16:52:33 +0200
 Subject: [PATCH] Activate all beacons sources: config/pillar/grains

avoid-excessive-syslogging-by-watchdog-cronjob-58.patch

@@ -1,4 +1,4 @@
-From 8507ed69aceb38020ed41b3e0c738c4ca516f431 Mon Sep 17 00:00:00 2001
+From d1150dafa305a15813f7d08756d086814fa1a61f Mon Sep 17 00:00:00 2001
 From: Hubert Mantel <mantel@suse.de>
 Date: Mon, 27 Nov 2017 13:55:13 +0100
 Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58)

feat-add-grain-for-all-fqdns.patch

@@ -1,4 +1,4 @@
-From eadad9aacd0c660feeb4b99217310f77958843e0 Mon Sep 17 00:00:00 2001
+From 73727acbfc0bd6a263b0a1464c58f692950b43f7 Mon Sep 17 00:00:00 2001
 From: Michele Bologna <michele.bologna@suse.com>
 Date: Thu, 14 Dec 2017 18:20:02 +0100
 Subject: [PATCH] Feat: add grain for all FQDNs

fix-bsc-1065792.patch

@@ -1,4 +1,4 @@
-From b9a351b84ce765e8638513e7e9d4fd804589d15a Mon Sep 17 00:00:00 2001
+From 341c175135c555ee1a02f1ce952c95d14fd834fa Mon Sep 17 00:00:00 2001
 From: Bo Maryniuk <bo@suse.de>
 Date: Thu, 14 Dec 2017 16:21:40 +0100
 Subject: [PATCH] Fix bsc#1065792

fix-grains-with-n.patch

@@ -0,0 +1,26 @@
+From 53a6d53b50695baa8004bce5f31a64f7455351f2 Mon Sep 17 00:00:00 2001
+From: Mihai Dinca <mdinca@suse.de>
+Date: Thu, 1 Mar 2018 11:06:15 +0100
+Subject: [PATCH] Fix grains with '\n'
+
+---
+ salt/grains/core.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/salt/grains/core.py b/salt/grains/core.py
+index af25097117..f8e36a895e 100644
+--- a/salt/grains/core.py
++++ b/salt/grains/core.py
+@@ -2196,7 +2196,7 @@ def _hw_data(osdata):
+             if os.path.exists(contents_file):
+                 try:
+                     with salt.utils.files.fopen(contents_file, 'r') as ifile:
+-                        grains[key] = ifile.read()
++                        grains[key] = ifile.read().strip()
+                         if key == 'uuid':
+                             grains['uuid'] = grains['uuid'].lower()
+                 except (IOError, OSError) as err:
+-- 
+2.16.1
+
+

remove-obsolete-unicode-handling-in-pkg.info_install.patch

@@ -1,4 +1,4 @@
-From bb72ede10d92f1f6689def594e1875ace24d7a12 Mon Sep 17 00:00:00 2001
+From 79a840d183975d949d4c4cadf392e0f37dea16a9 Mon Sep 17 00:00:00 2001
 From: Mihai Dinca <mdinca@suse.de>
 Date: Tue, 13 Feb 2018 16:11:20 +0100
 Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed

run-salt-api-as-user-salt-bsc-1064520.patch

@@ -1,4 +1,4 @@
-From 97ff824d9a9b2953811055612c7d1cfcb7cde213 Mon Sep 17 00:00:00 2001
+From d1dfed119ba7e90964451a0859eb9a72c5ff8db8 Mon Sep 17 00:00:00 2001
 From: Christian Lanig <clanig@suse.com>
 Date: Mon, 27 Nov 2017 13:10:26 +0100
 Subject: [PATCH] Run salt-api as user salt (bsc#1064520)

run-salt-master-as-dedicated-salt-user.patch

@@ -1,4 +1,4 @@
-From 73d468c3f7b79b2c13610aa89f549ae4803fe969 Mon Sep 17 00:00:00 2001
+From b69a8f76657ce9e1078a75dcbcb8c3ea0d4a842f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Wed, 20 Jan 2016 11:01:06 +0100
 Subject: [PATCH] Run salt master as dedicated salt user

salt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  1 10:35:18 UTC 2018 - Mihai Dinca <mdinca@suse.de>
+
+- Fix grains containing trailing "\n"
+
+- Added:
+  * fix-grains-with-n.patch
+
 -------------------------------------------------------------------
 Tue Feb 20 10:47:34 UTC 2018 - Mihai Dinca <mdinca@suse.de>
 

salt.spec

@@ -74,6 +74,8 @@ Patch5:        feat-add-grain-for-all-fqdns.patch
 Patch6:        fix-bsc-1065792.patch
 # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46006
 Patch7:        remove-obsolete-unicode-handling-in-pkg.info_install.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46278
+Patch8:        fix-grains-with-n.patch
 
 # BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRoot:      %{_tmppath}/%{name}-2018.3.0rc1-build
@@ -529,6 +531,7 @@ cp %{S:5} ./.travis.yml
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %if 0%{?build_py2}