diff --git a/2018.3.0rc1.tar.gz b/2018.3.0rc1.tar.gz index a7c4f3a..7ebc2ff 100644 --- a/2018.3.0rc1.tar.gz +++ b/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 diff --git a/activate-all-beacons-sources-config-pillar-grains.patch b/activate-all-beacons-sources-config-pillar-grains.patch index a153228..cbf4f79 100644 --- a/activate-all-beacons-sources-config-pillar-grains.patch +++ b/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 Date: Tue, 17 Oct 2017 16:52:33 +0200 Subject: [PATCH] Activate all beacons sources: config/pillar/grains diff --git a/avoid-excessive-syslogging-by-watchdog-cronjob-58.patch b/avoid-excessive-syslogging-by-watchdog-cronjob-58.patch index fd8f1c5..b08db5e 100644 --- a/avoid-excessive-syslogging-by-watchdog-cronjob-58.patch +++ b/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 Date: Mon, 27 Nov 2017 13:55:13 +0100 Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58) diff --git a/feat-add-grain-for-all-fqdns.patch b/feat-add-grain-for-all-fqdns.patch index 0f2babb..02a0e28 100644 --- a/feat-add-grain-for-all-fqdns.patch +++ b/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 Date: Thu, 14 Dec 2017 18:20:02 +0100 Subject: [PATCH] Feat: add grain for all FQDNs diff --git a/fix-bsc-1065792.patch b/fix-bsc-1065792.patch index 6a9a776..0e97c10 100644 --- a/fix-bsc-1065792.patch +++ b/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 Date: Thu, 14 Dec 2017 16:21:40 +0100 Subject: [PATCH] Fix bsc#1065792 diff --git a/fix-grains-with-n.patch b/fix-grains-with-n.patch new file mode 100644 index 0000000..cd335e1 --- /dev/null +++ b/fix-grains-with-n.patch @@ -0,0 +1,26 @@ +From 53a6d53b50695baa8004bce5f31a64f7455351f2 Mon Sep 17 00:00:00 2001 +From: Mihai Dinca +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 + + diff --git a/remove-obsolete-unicode-handling-in-pkg.info_install.patch b/remove-obsolete-unicode-handling-in-pkg.info_install.patch index f032d89..02e9cf5 100644 --- a/remove-obsolete-unicode-handling-in-pkg.info_install.patch +++ b/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 Date: Tue, 13 Feb 2018 16:11:20 +0100 Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed diff --git a/run-salt-api-as-user-salt-bsc-1064520.patch b/run-salt-api-as-user-salt-bsc-1064520.patch index 86dc03c..8e1d59a 100644 --- a/run-salt-api-as-user-salt-bsc-1064520.patch +++ b/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 Date: Mon, 27 Nov 2017 13:10:26 +0100 Subject: [PATCH] Run salt-api as user salt (bsc#1064520) diff --git a/run-salt-master-as-dedicated-salt-user.patch b/run-salt-master-as-dedicated-salt-user.patch index 43df57d..c33bd4c 100644 --- a/run-salt-master-as-dedicated-salt-user.patch +++ b/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?= Date: Wed, 20 Jan 2016 11:01:06 +0100 Subject: [PATCH] Run salt master as dedicated salt user diff --git a/salt.changes b/salt.changes index 10a7dff..ad3f828 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 10:35:18 UTC 2018 - Mihai Dinca + +- Fix grains containing trailing "\n" + +- Added: + * fix-grains-with-n.patch + ------------------------------------------------------------------- Tue Feb 20 10:47:34 UTC 2018 - Mihai Dinca diff --git a/salt.spec b/salt.spec index 7405368..593223d 100644 --- a/salt.spec +++ b/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}