rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

Accepting request 586784 from systemsmanagement:saltstack:testing

Browse Source 
- Update patches
- Modified:
  * run-salt-master-as-dedicated-salt-user.patch
  * run-salt-api-as-user-salt-bsc-1064520.patch
  * fix-openscap-push.patch
  * fix-cp.push-empty-file.patch
  * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
  * feat-add-grain-for-all-fqdns.patch
  * fix-bsc-1065792.patch
  * move-log_file-option-to-changeable-defaults.patch
  * activate-all-beacons-sources-config-pillar-grains.patch
  * remove-obsolete-unicode-handling-in-pkg.info_install.patch
  
- Removed:
  * salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
  
-------------------------------------------------------------------                                                                                                     
                                                                                    
- Update cp.push patch
- Modified:
  * fix-cp.push-empty-file.patch
  * salt-ssh-fix-json-load-of-return-data-when-it-contai.patch

- force re-generate a new thin.tgz when an update gets installed

- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:

OBS-URL: https://build.opensuse.org/request/show/586784
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=115
This commit is contained in:
Mihai Dincă 2018-03-19 08:54:13 +00:00 committed by Git OBS Bridge
parent af73acbf5d
commit bbe3fe8f72
17 changed files with 243 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2018.3.0rc1.tar.gz
View File

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

1
_lastrevision Normal file
View File

@ -0,0 +1 @@
HEAD

7
_service
View File

@ -1,18 +1,19 @@
<services> <services>
<service name="tar_scm" mode="localonly"> <service name="tar_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/salt-packaging.git</param> <param name="url">https://github.com/openSUSE/salt-packaging.git</param>
<param name="subdir">salt</param> <param name="subdir">salt</param>
<param name="filename">package</param> <param name="filename">package</param>
<param name="revision">oxygen-rc1</param> <param name="revision">oxygen-rc1</param>
<param name="scm">git</param> <param name="scm">git</param>
</service> </service>
<service name="extract_file" mode="localonly"> <service name="extract_file" mode="disabled">
<param name="archive">*package*.tar</param> <param name="archive">*package*.tar</param>
<param name="files">*/*</param> <param name="files">*/*</param>
</service> </service>
<service name="download_url" mode="localonly"> <service name="download_url" mode="disabled">
<param name="host">codeload.github.com</param> <param name="host">codeload.github.com</param>
<param name="path">saltstack/salt/tar.gz/2018.3.0rc1</param> <param name="path">saltstack/salt/tar.gz/2018.3.0rc1</param>
<param name="filename">2018.3.0rc1.tar.gz</param> <param name="filename">2018.3.0rc1.tar.gz</param>
</service> </service>
<service name="update_changelog" mode="disabled"></service>
</services> </services>

4
_servicedata
View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/salt-packaging.git</param>
<param name="changesrevision">b8859cfa3f978b24c1dba6aefa5c37547e09a1b0</param></service></servicedata>

4
activate-all-beacons-sources-config-pillar-grains.patch
View File

@ -1,4 +1,4 @@
From 9ba410b90abccad0359ceb96dbc17a357d141e94 Mon Sep 17 00:00:00 2001 From 8550c9cc51d227d4c32c844c7fe0526ae58f4874 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de> From: Bo Maryniuk <bo@suse.de>
Date: Tue, 17 Oct 2017 16:52:33 +0200 Date: Tue, 17 Oct 2017 16:52:33 +0200
Subject: [PATCH] Activate all beacons sources: config/pillar/grains Subject: [PATCH] Activate all beacons sources: config/pillar/grains
@ -21,6 +21,6 @@ index df69d3c7bd..4a30e70be5 100644
return self.beacons.process(b_conf, self.opts['grains']) # pylint: disable=no-member return self.beacons.process(b_conf, self.opts['grains']) # pylint: disable=no-member
return [] return []
-- --
2.16.1 2.16.2

4
avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
View File

@ -1,4 +1,4 @@
From d1150dafa305a15813f7d08756d086814fa1a61f Mon Sep 17 00:00:00 2001 From 5dfc5ebd799d5c9a4588d9e1a27b813b8c35ce25 Mon Sep 17 00:00:00 2001
From: Hubert Mantel <mantel@suse.de> From: Hubert Mantel <mantel@suse.de>
Date: Mon, 27 Nov 2017 13:55:13 +0100 Date: Mon, 27 Nov 2017 13:55:13 +0100
Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58) Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58)
@ -21,6 +21,6 @@ index 2e418094ed..73a91ebd62 100755
/usr/bin/salt-daemon-watcher --with-init & disown /usr/bin/salt-daemon-watcher --with-init & disown
fi fi
-- --
2.16.1 2.16.2

6
feat-add-grain-for-all-fqdns.patch
View File

@ -1,4 +1,4 @@
From 73727acbfc0bd6a263b0a1464c58f692950b43f7 Mon Sep 17 00:00:00 2001 From 067b63ccbc6942a0399eb43d7fdf314b5c9b417f Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@suse.com> From: Michele Bologna <michele.bologna@suse.com>
Date: Thu, 14 Dec 2017 18:20:02 +0100 Date: Thu, 14 Dec 2017 18:20:02 +0100
Subject: [PATCH] Feat: add grain for all FQDNs Subject: [PATCH] Feat: add grain for all FQDNs
@ -21,7 +21,7 @@ https://github.com/saltstack/salt/pull/45060
3 files changed, 29 insertions(+) 3 files changed, 29 insertions(+)
diff --git a/salt/grains/core.py b/salt/grains/core.py diff --git a/salt/grains/core.py b/salt/grains/core.py
index 7d628bccb9..af25097117 100644 index 9352987abd..f8e36a895e 100644
--- a/salt/grains/core.py --- a/salt/grains/core.py
+++ b/salt/grains/core.py +++ b/salt/grains/core.py
@@ -1890,6 +1890,33 @@ def append_domain(): @@ -1890,6 +1890,33 @@ def append_domain():
@ -83,6 +83,6 @@ index e781fadefe..dba8d082c5 100644
# Import Salt Testing Libs # Import Salt Testing Libs
try: try:
-- --
2.16.1 2.16.2

4
fix-bsc-1065792.patch
View File

@ -1,4 +1,4 @@
From 341c175135c555ee1a02f1ce952c95d14fd834fa Mon Sep 17 00:00:00 2001 From 1d2030c6d002ef293c7a71c77db1617fdb5a8cb0 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de> From: Bo Maryniuk <bo@suse.de>
Date: Thu, 14 Dec 2017 16:21:40 +0100 Date: Thu, 14 Dec 2017 16:21:40 +0100
Subject: [PATCH] Fix bsc#1065792 Subject: [PATCH] Fix bsc#1065792
@ -20,6 +20,6 @@ index c5bf3f2d54..a5ec426ec4 100644
return __virtualname__ return __virtualname__
else: else:
-- --
2.16.1 2.16.2

27
fix-cp.push-empty-file.patch Normal file
View File

@ -0,0 +1,27 @@
From e91e2db15b99ef677cb112bb817275ed60a1f0e1 Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdinca@suse.de>
Date: Wed, 7 Mar 2018 13:11:16 +0100
Subject: [PATCH] Fix cp.push empty file
Co-authored-by: Jochen Breuer <jbreuer@suse.de>
---
salt/master.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/master.py b/salt/master.py
index fb704909c8..6fb37ece1a 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1451,7 +1451,7 @@ class AESFuncs(object):
if load['loc']:
fp_.seek(load['loc'])
- fp_.write(load['data'])
+ fp_.write(salt.utils.stringutils.to_bytes(load['data']))
return True
def _pillar(self, load):
--
2.16.2

26
fix-grains-with-n.patch
View File

@ -1,26 +0,0 @@
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

35
fix-openscap-push.patch Normal file
View File

@ -0,0 +1,35 @@
From 7259333c3652d5208258632532a9151648c9cb4d Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdinca@suse.de>
Date: Fri, 2 Mar 2018 17:17:58 +0100
Subject: [PATCH] Fix openscap push
---
salt/modules/openscap.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/salt/modules/openscap.py b/salt/modules/openscap.py
index c5b51a1846..e3190e1e11 100644
--- a/salt/modules/openscap.py
+++ b/salt/modules/openscap.py
@@ -13,7 +13,6 @@ from subprocess import Popen, PIPE
# Import Salt libs
from salt.ext import six
-from salt.client import Caller
ArgumentParser = object
@@ -105,8 +104,7 @@ def xccdf(params):
success = _OSCAP_EXIT_CODES_MAP[proc.returncode]
returncode = proc.returncode
if success:
- caller = Caller()
- caller.cmd('cp.push_dir', tempdir)
+ __salt__['cp.push_dir'](tempdir)
shutil.rmtree(tempdir, ignore_errors=True)
upload_dir = tempdir
--
2.16.2

33
move-log_file-option-to-changeable-defaults.patch Normal file
View File

@ -0,0 +1,33 @@
From 76706e2b241c932e4067487139325dc16ca08477 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Sun, 11 Feb 2018 19:15:27 +0100
Subject: [PATCH] move log_file option to changeable defaults
---
salt/client/ssh/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
index 3dd46899e3..f1c1ad9a22 100644
--- a/salt/client/ssh/__init__.py
+++ b/salt/client/ssh/__init__.py
@@ -884,6 +884,7 @@ class Single(object):
# Pre apply changeable defaults
self.minion_opts = {
'grains_cache': True,
+ 'log_file': 'salt-call.log',
}
self.minion_opts.update(opts.get('ssh_minion_opts', {}))
if minion_opts is not None:
@@ -893,7 +894,6 @@ class Single(object):
'root_dir': os.path.join(self.thin_dir, 'running_data'),
'id': self.id,
'sock_dir': '/',
- 'log_file': 'salt-call.log',
'fileserver_list_cache_time': 3,
})
self.minion_config = salt.serializers.yaml.serialize(self.minion_opts)
--
2.16.2

4
remove-obsolete-unicode-handling-in-pkg.info_install.patch
View File

@ -1,4 +1,4 @@
From 79a840d183975d949d4c4cadf392e0f37dea16a9 Mon Sep 17 00:00:00 2001 From a29071d597553184ea39f7c5783b0bd4f29fab2b Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdinca@suse.de> From: Mihai Dinca <mdinca@suse.de>
Date: Tue, 13 Feb 2018 16:11:20 +0100 Date: Tue, 13 Feb 2018 16:11:20 +0100
Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed
@ -37,6 +37,6 @@ index 51d01c3fc9..659d8858f0 100644
t_nfo['source'] = value t_nfo['source'] = value
else: else:
-- --
2.16.1 2.16.2

4
run-salt-api-as-user-salt-bsc-1064520.patch
View File

@ -1,4 +1,4 @@
From d1dfed119ba7e90964451a0859eb9a72c5ff8db8 Mon Sep 17 00:00:00 2001 From ff376d2811248384e3a41e69404d2c66affd5279 Mon Sep 17 00:00:00 2001
From: Christian Lanig <clanig@suse.com> From: Christian Lanig <clanig@suse.com>
Date: Mon, 27 Nov 2017 13:10:26 +0100 Date: Mon, 27 Nov 2017 13:10:26 +0100
Subject: [PATCH] Run salt-api as user salt (bsc#1064520) Subject: [PATCH] Run salt-api as user salt (bsc#1064520)
@ -20,6 +20,6 @@ index 7ca582dfb4..bf513e4dbd 100644
ExecStart=/usr/bin/salt-api ExecStart=/usr/bin/salt-api
TimeoutStopSec=3 TimeoutStopSec=3
-- --
2.16.1 2.16.2

4
run-salt-master-as-dedicated-salt-user.patch
View File

@ -1,4 +1,4 @@
From b69a8f76657ce9e1078a75dcbcb8c3ea0d4a842f Mon Sep 17 00:00:00 2001 From 1df8d3011ebe645c25be8541cbc40ac2b700dfcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 20 Jan 2016 11:01:06 +0100 Date: Wed, 20 Jan 2016 11:01:06 +0100
Subject: [PATCH] Run salt master as dedicated salt user Subject: [PATCH] Run salt master as dedicated salt user
@ -42,6 +42,6 @@ index 3cd002308e..0d99d1b801 100644
missingok missingok
rotate 7 rotate 7
-- --
2.16.1 2.16.2

110
salt.changes
View File

@ -1,5 +1,113 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 1 10:35:18 UTC 2018 - Mihai Dinca <mdinca@suse.de> Wed Mar 14 09:37:07 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Update patches
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Removed:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
Tue Mar 13 18:28:03 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Update cp.push patch
- Modified:
* fix-cp.push-empty-file.patch
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
Mon Mar 12 17:47:34 UTC 2018 - Michael Calmer <mc@suse.de>
- force re-generate a new thin.tgz when an update gets installed
-------------------------------------------------------------------
Sat Mar 10 12:00:17 UTC 2018 - Michael Calmer <mc@suse.de>
- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Removed:
* dumps-should-return-unicode-also-with-py2-to-prevent.patch
-------------------------------------------------------------------
Fri Mar 9 15:56:00 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Fix unicode decode error with salt-ssh
- Added:
* dumps-should-return-unicode-also-with-py2-to-prevent.patch
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
-------------------------------------------------------------------
Thu Mar 8 11:20:01 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Fix cp.push empty file (bsc#1075950)
- salt-ssh - move log_file option to changeable defaults
- Added:
* fix-cp.push-empty-file.patch
* move-log_file-option-to-changeable-defaults.patch
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
-------------------------------------------------------------------
Fri Mar 2 13:15:46 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Daily update
- Added:
* fix-openscap-push.patch
- Removed:
* fix-grains-with-n.patch
-------------------------------------------------------------------
Fri Mar 2 13:15:46 UTC 2018 - Mihai Dinca <mdinca@suse.de>
- Fix grains containing trailing "\n" - Fix grains containing trailing "\n"

19
salt.spec
View File

@ -74,8 +74,11 @@ Patch5: feat-add-grain-for-all-fqdns.patch
Patch6: fix-bsc-1065792.patch Patch6: fix-bsc-1065792.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46006 # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46006
Patch7: remove-obsolete-unicode-handling-in-pkg.info_install.patch Patch7: remove-obsolete-unicode-handling-in-pkg.info_install.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46278 Patch8: fix-openscap-push.patch
Patch8: fix-grains-with-n.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/45972
Patch9: move-log_file-option-to-changeable-defaults.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46416
Patch10: fix-cp.push-empty-file.patch
# BuildRoot: %{_tmppath}/%{name}-%{version}-build # BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %{_tmppath}/%{name}-2018.3.0rc1-build BuildRoot: %{_tmppath}/%{name}-2018.3.0rc1-build
@ -532,6 +535,8 @@ cp %{S:5} ./.travis.yml
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
%patch10 -p1
%build %build
%if 0%{?build_py2} %if 0%{?build_py2}
@ -1023,6 +1028,16 @@ fi
%endif %endif
%endif %endif
%posttrans -n python2-salt
# force re-generate a new thin.tgz
rm -f %{_localstatedir}/cache/salt/master/thin/version
%if 0%{?build_py3}
%posttrans -n python3-salt
# force re-generate a new thin.tgz
rm -f %{_localstatedir}/cache/salt/master/thin/version
%endif
%files api %files api
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/salt-api %{_bindir}/salt-api