pool/salt
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osc copypac from project:systemsmanagement:saltstack:testing package:salt revision:335

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=167
This commit is contained in:
Pablo Suárez Hernández 2020-04-30 14:20:16 +00:00 committed by Git OBS Bridge
parent dede5bd1d4
commit 1fcc3faaac
15 changed files with 178 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_lastrevision
View File

@ -1 +1 @@
c96fc684a059121ecc7baf013768b1b611777d73
52475d78d58db61df54486af13c5eb4055c2d12e

6
_service
View File

@ -3,7 +3,7 @@
<param name="url">https://github.com/openSUSE/salt-packaging.git</param>
<param name="subdir">salt</param>
<param name="filename">package</param>
<param name="revision">3000</param>
<param name="revision">3000.2</param>
<param name="scm">git</param>
</service>
<service name="extract_file" mode="disabled">
@ -12,8 +12,8 @@
</service>
<service name="download_url" mode="disabled">
<param name="host">codeload.github.com</param>
<param name="path">openSUSE/salt/tar.gz/v3000-suse</param>
<param name="filename">v3000.tar.gz</param>
<param name="path">openSUSE/salt/tar.gz/v3000.2-suse</param>
<param name="filename">v3000.2.tar.gz</param>
</service>
<service name="update_changelog" mode="disabled"></service>
</services>

12
accumulated-changes-from-yomi-167.patch
View File

@ -1,4 +1,4 @@
From 63f28a891449889fa3d7139470266162b10e88f2 Mon Sep 17 00:00:00 2001
From 951d2a385a40c5322155f952e08430e8402bfbde Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@gmail.com>
Date: Tue, 22 Oct 2019 11:02:33 +0200
Subject: [PATCH] Accumulated changes from Yomi (#167)
@ -88,13 +88,13 @@ index f7158e0810..5f3b6d6855 100644
'install_date_time_t': None,
}]
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
index 60914204b0..c4731f667a 100644
index e722bfab5b..33d6a9507f 100644
--- a/tests/unit/grains/test_core.py
+++ b/tests/unit/grains/test_core.py
@@ -1543,3 +1543,71 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
self.assertIn('osfullname', os_grains)
self.assertEqual(os_grains.get('osfullname'), 'FreeBSD')
@@ -1559,3 +1559,71 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
assert len(info) == 2
assert all([x is not None for x in info])
assert all([isinstance(x, int) for x in info])
+
+ @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
+ def test_kernelparams_return(self):

8
do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch
View File

@ -1,4 +1,4 @@
From b1c96bdaec9723fd76a6dd5d72cf7fbfd681566f Mon Sep 17 00:00:00 2001
From 3d5d89428ca333caa2c2259f679f8fffd7110ba6 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Fri, 21 Sep 2018 17:31:39 +0200
Subject: [PATCH] Do not load pip state if there is no 3rd party
@ -10,7 +10,7 @@ Safe import 3rd party dependency
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/salt/modules/pip.py b/salt/modules/pip.py
index ffdb73aefa..ff0836c35f 100644
index 0a0773a8f4..f19593ed1a 100644
--- a/salt/modules/pip.py
+++ b/salt/modules/pip.py
@@ -82,7 +82,10 @@ from __future__ import absolute_import, print_function, unicode_literals
@ -25,7 +25,7 @@ index ffdb73aefa..ff0836c35f 100644
import re
import shutil
import sys
@@ -119,7 +122,12 @@ def __virtual__():
@@ -121,7 +124,12 @@ def __virtual__():
entire filesystem. If it's not installed in a conventional location, the
user is required to provide the location of pip each time it is used.
'''
@ -38,7 +38,7 @@ index ffdb73aefa..ff0836c35f 100644
+ return ret
def _clear_context(bin_env=None):
def _pip_bin_env(cwd, bin_env):
--
2.16.4

10
fix-a-wrong-rebase-in-test_core.py-180.patch
View File

@ -1,4 +1,4 @@
From 6418d9ebc3b269a0246262f79c0bab367e39cc52 Mon Sep 17 00:00:00 2001
From 67830ea17ae1e87a6bffca2a9542788c200d7dd9 Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@gmail.com>
Date: Fri, 25 Oct 2019 15:43:16 +0200
Subject: [PATCH] Fix a wrong rebase in test_core.py (#180)
@ -44,12 +44,12 @@ index 68c43482d3..20950988d9 100644
# PermissionError is new to Python 3, but corresponds to the EACESS and
# EPERM error numbers. Use those instead here for PY2 compatibility.
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
index c4731f667a..b4ed9379e5 100644
index 33d6a9507f..7fa2436e58 100644
--- a/tests/unit/grains/test_core.py
+++ b/tests/unit/grains/test_core.py
@@ -1544,51 +1544,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
self.assertIn('osfullname', os_grains)
self.assertEqual(os_grains.get('osfullname'), 'FreeBSD')
@@ -1560,51 +1560,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
assert all([x is not None for x in info])
assert all([isinstance(x, int) for x in info])
- @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
- def test_kernelparams_return(self):

50
fix-for-unless-requisite-when-pip-is-not-installed.patch
View File

@ -1,50 +0,0 @@
From f8b490c26be8e7f76947cc07f606f95c133805a7 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@saltstack.com>
Date: Thu, 20 Feb 2020 21:07:07 +0000
Subject: [PATCH] Fix for unless requisite when pip is not installed
Only remove pip relasted modules
---
salt/states/pip_state.py | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py
index 0f762752d02bf5ced17928a4c7fd2a3f027b66d5..11e466389fc46574923e2a71d8ca06f2c411f369 100644
--- a/salt/states/pip_state.py
+++ b/salt/states/pip_state.py
@@ -51,7 +51,7 @@ def purge_pip():
return
pip_related_entries = [
(k, v) for (k, v) in sys.modules.items()
- or getattr(v, '__module__', '').startswith('pip.')
+ if getattr(v, '__module__', '').startswith('pip.')
or (isinstance(v, types.ModuleType) and v.__name__.startswith('pip.'))
]
for name, entry in pip_related_entries:
@@ -96,21 +96,8 @@ try:
HAS_PIP = True
except ImportError:
HAS_PIP = False
- # Remove references to the loaded pip module above so reloading works
- import sys
- pip_related_entries = [
- (k, v) for (k, v) in sys.modules.items()
- or getattr(v, '__module__', '').startswith('pip.')
- or (isinstance(v, types.ModuleType) and v.__name__.startswith('pip.'))
- ]
- for name, entry in pip_related_entries:
- sys.modules.pop(name)
- del entry
+ purge_pip()
- del pip
- sys_modules_pip = sys.modules.pop('pip', None)
- if sys_modules_pip is not None:
- del sys_modules_pip
if HAS_PIP is True:
if not hasattr(purge_pip, '__pip_ver__'):
--
2.23.0

131
fix-regression-in-service-states-with-reload-argumen.patch
View File

@ -1,131 +0,0 @@
From 1a3e69af7c69a4893642dd1e9a9c4d3eb99cf874 Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik.johnson@level3.com>
Date: Mon, 17 Feb 2020 18:43:06 -0600
Subject: [PATCH] Fix regression in service states with reload argument
Add functional test
Fix failing test
Add __opts__ and __grains__ just in case
Skip on OSX for now
---
salt/states/service.py | 2 +-
tests/unit/states/test_service.py | 79 +++++++++++++++++++++++++++++--
2 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/salt/states/service.py b/salt/states/service.py
index 987e37cd421713313c41db4459b85019c041d549..89afa0dfa625e9ee3d9ecd7566232452d79ca99c 100644
--- a/salt/states/service.py
+++ b/salt/states/service.py
@@ -488,7 +488,7 @@ def running(name,
time.sleep(init_delay)
# only force a change state if we have explicitly detected them
- after_toggle_status = __salt__['service.status'](name, sig, **kwargs)
+ after_toggle_status = __salt__['service.status'](name, sig, **status_kwargs)
if 'service.enabled' in __salt__:
after_toggle_enable_status = __salt__['service.enabled'](name)
else:
diff --git a/tests/unit/states/test_service.py b/tests/unit/states/test_service.py
index 30c716025495f537efddf69bf6df8c68bc938e2e..3eead4c3576eefdd8d96eec4cc113edf194ebbc6 100644
--- a/tests/unit/states/test_service.py
+++ b/tests/unit/states/test_service.py
@@ -7,14 +7,15 @@
from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
+from tests.support.helpers import destructiveTest
from tests.support.mixins import LoaderModuleMockMixin
-from tests.support.unit import TestCase
-from tests.support.mock import (
- MagicMock,
- patch,
-)
+from tests.support.unit import TestCase, skipIf
+from tests.support.mock import MagicMock, patch
# Import Salt Libs
+import salt.utils.platform
+import salt.config
+import salt.loader
import salt.states.service as service
@@ -251,3 +252,71 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin):
ret[3])
self.assertDictEqual(service.mod_watch("salt", "stack"), ret[1])
+
+
+@destructiveTest
+@skipIf(salt.utils.platform.is_darwin(), "service.running is currently failing on OSX")
+class ServiceTestCaseFunctional(TestCase, LoaderModuleMockMixin):
+ '''
+ Validate the service state
+ '''
+ def setup_loader_modules(self):
+ self.opts = salt.config.DEFAULT_MINION_OPTS.copy()
+ self.opts['grains'] = salt.loader.grains(self.opts)
+ self.utils = salt.loader.utils(self.opts)
+ self.modules = salt.loader.minion_mods(self.opts, utils=self.utils)
+
+ self.service_name = 'cron'
+ cmd_name = 'crontab'
+ os_family = self.opts['grains']['os_family']
+ os_release = self.opts['grains']['osrelease']
+ if os_family == 'RedHat':
+ self.service_name = 'crond'
+ elif os_family == 'Arch':
+ self.service_name = 'sshd'
+ cmd_name = 'systemctl'
+ elif os_family == 'MacOS':
+ self.service_name = 'org.ntp.ntpd'
+ if int(os_release.split('.')[1]) >= 13:
+ self.service_name = 'com.openssh.sshd'
+ elif os_family == 'Windows':
+ self.service_name = 'Spooler'
+
+ if os_family != 'Windows' and salt.utils.path.which(cmd_name) is None:
+ self.skipTest('{0} is not installed'.format(cmd_name))
+
+ return {
+ service: {
+ '__grains__': self.opts['grains'],
+ '__opts__': self.opts,
+ '__salt__': self.modules,
+ '__utils__': self.utils,
+ },
+ }
+
+ def setUp(self):
+ self.pre_srv_enabled = True if self.service_name in self.modules['service.get_enabled']() else False
+ self.post_srv_disable = False
+ if not self.pre_srv_enabled:
+ self.modules['service.enable'](self.service_name)
+ self.post_srv_disable = True
+
+ def tearDown(self):
+ if self.post_srv_disable:
+ self.modules['service.disable'](self.service_name)
+
+ def test_running_with_reload(self):
+ with patch.dict(service.__opts__, {'test': False}):
+ service.dead(self.service_name, enable=False)
+ result = service.running(name=self.service_name, enable=True, reload=False)
+
+ expected = {
+ 'changes': {
+ self.service_name: True
+ },
+ 'comment': 'Service {0} has been enabled, and is '
+ 'running'.format(self.service_name),
+ 'name': self.service_name,
+ 'result': True
+ }
+ self.assertDictEqual(result, expected)
--
2.23.0

28
fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch Normal file
View File

@ -0,0 +1,28 @@
From a5ef829408685d9e65eaa24bba40d221adffaa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Thu, 30 Apr 2020 14:15:00 +0100
Subject: [PATCH] Fix typo in 'minion_runner' for AESFuncs exposed
methods
---
salt/master.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/master.py b/salt/master.py
index 997fd643b59aa133152b0280f408fcb41afe02b1..5a6ba44f11cf7a3ad3a4477524ed468dbba43993 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1178,7 +1178,7 @@ class AESFuncs(TransportMethods):
'verify_minion', '_master_tops', '_ext_nodes', '_master_opts',
'_mine_get', '_mine', '_mine_delete', '_mine_flush', '_file_recv',
'_pillar', '_minion_event', '_handle_minion_event', '_return',
- '_syndic_return', '_minion_runner', 'pub_ret', 'minion_pub',
+ '_syndic_return', 'minion_runner', 'pub_ret', 'minion_pub',
'minion_publish', 'revoke_auth', 'run_func', '_serve_file',
'_file_find', '_file_hash', '_file_find_and_stat', '_file_list',
'_file_list_emptydirs', '_dir_list', '_symlink_list', '_file_envs',
--
2.23.0

33
fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch Normal file
View File

@ -0,0 +1,33 @@
From 3df8359421f60140fd335d95c3c06de0bfd6ac4f Mon Sep 17 00:00:00 2001
From: tyl0re <andreas@vogler.name>
Date: Wed, 17 Jul 2019 10:13:09 +0200
Subject: [PATCH] Fixed Bug LVM has no Parttion Type. the Scipt Later
it is checked if fs_type: cmd = ('parted', '-m', '-s', '--', device,
'mkpart', part_type, fs_type, start, end) else: cmd = ('parted', '-m', '-s',
'--', device, 'mkpart', part_type, start, end) But never reached. The Check
was in earlier Versions with parted.py 443 if fs_type and fs_type not in
set(['ext2', 'fat32', 'fat16', 'linux-swap', 'reiserfs', 444 'hfs', 'hfs+',
'hfsx', 'NTFS', 'ufs', 'xfs', 'zfs']):
So the check on not defined fs_type is missing
---
salt/modules/parted_partition.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/modules/parted_partition.py b/salt/modules/parted_partition.py
index 9441fec49fd1833da590b3f65637e8e92b287d1c..7d08a7b315c990e7a87c9c77fd6550a6174b7160 100644
--- a/salt/modules/parted_partition.py
+++ b/salt/modules/parted_partition.py
@@ -515,7 +515,7 @@ def mkpartfs(device, part_type, fs_type, start, end):
'Invalid part_type passed to partition.mkpartfs'
)
- if not _is_fstype(fs_type):
+ if fs_type and not _is_fstype(fs_type):
raise CommandExecutionError(
'Invalid fs_type passed to partition.mkpartfs'
)
--
2.23.0

15
make-setup.py-script-to-not-require-setuptools-9.1.patch
View File

@ -1,23 +1,22 @@
From 39b88fd0a3f882e0b33973665bbbacdd60c26a9b Mon Sep 17 00:00:00 2001
From b73d7f73bebcde2936a55245471fbcb383778b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Wed, 25 Mar 2020 13:09:52 +0000
Subject: [PATCH] Make setup.py script to not require setuptools > 9.1
---
setup.py | 9 ---------
1 file changed, 9 deletions(-)
setup.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/setup.py b/setup.py
index 06374647df5e82a21fc39b08d41c596f0483ff0c..67a915c64ce5d774e8f89ff3502e85b6bc04b82f 100755
index e852080e4b..033ccee8c3 100755
--- a/setup.py
+++ b/setup.py
@@ -700,15 +700,6 @@ class Install(install):
@@ -727,14 +727,6 @@ class Install(install):
install.finalize_options(self)
def run(self):
- from distutils.version import StrictVersion
- if StrictVersion(setuptools.__version__) < StrictVersion('9.1'):
- if LooseVersion(setuptools.__version__) < LooseVersion('9.1'):
- sys.stderr.write(
- '\n\nInstalling Salt requires setuptools >= 9.1\n'
- 'Available setuptools version is {}\n\n'.format(setuptools.__version__)
@ -29,6 +28,6 @@ index 06374647df5e82a21fc39b08d41c596f0483ff0c..67a915c64ce5d774e8f89ff3502e85b6
# _version.py in the build command
self.distribution.running_salt_install = True
--
2.23.0
2.16.4

26
remove-vendored-backports-abc-from-requirements.patch Normal file
View File

@ -0,0 +1,26 @@
From 3bbb31815bb3c6eacedb8891f6bf4ece8098deca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Mon, 27 Apr 2020 16:37:38 +0100
Subject: [PATCH] Remove vendored 'backports-abc' from requirements
---
requirements/base.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/requirements/base.txt b/requirements/base.txt
index 922aec4c754178fd5c317ed636a0ebe487fcb25d..8adf76a2a045f4fca8695c584fedcfc913f54db2 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,7 +4,6 @@ PyYAML
MarkupSafe
requests>=1.0.0
# Requirements for Tornado 4.5.3 (vendored as salt.ext.tornado)
-backports-abc==0.5; python_version < '3.0'
singledispatch==3.4.0.3; python_version < '3.4'
# Required by Tornado to handle threads stuff.
futures>=2.0; python_version < '3.0'
--
2.23.0

39
salt.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Thu Apr 30 13:24:35 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Update to Salt release version 3000.2
See release notes: https://docs.saltstack.com/en/latest/topics/releases/3000.2.html
- Fix typo in 'minion_runner' for AESFuncs exposed methods
- Added:
* fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
- Removed:
* fix-cve-2020-11651-and-fix-cve-2020-11652.patch
-------------------------------------------------------------------
Thu Apr 30 12:30:04 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Update to Salt release version 3000.1
See release notes: https://docs.saltstack.com/en/latest/topics/releases/3000.1.html
- Fix CVE-2020-11651 and CVE-2020-11652 (bsc#1170595)
- Do not require vendored backports-abc (bsc#1170288)
- Fix partition.mkpart to work without fstype (bsc#1169800)
- Added:
* fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch
* remove-vendored-backports-abc-from-requirements.patch
* fix-cve-2020-11651-and-fix-cve-2020-11652.patch
- Modified:
* fix-a-wrong-rebase-in-test_core.py-180.patch
* make-setup.py-script-to-not-require-setuptools-9.1.patch
* do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch
* accumulated-changes-from-yomi-167.patch
- Removed:
* fix-for-unless-requisite-when-pip-is-not-installed.patch
* fix-regression-in-service-states-with-reload-argumen.patch
-------------------------------------------------------------------
Tue Apr 7 10:38:57 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>

43
salt.spec
View File

@ -63,7 +63,7 @@
%bcond_with builddocs
Name: salt
Version: 3000
Version: 3000.2
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
@ -264,40 +264,42 @@ Patch90: changed-imports-to-vendored-tornado.patch
Patch91: add-missing-_utils-at-loader-grains_func.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/25b4e3ea983b2606b2fb3d3c0e42f9840208bf84
Patch92: remove-deprecated-usage-of-no_mock-and-no_mock_reaso.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56215
Patch93: fix-for-unless-requisite-when-pip-is-not-installed.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/a8f0a15e4067ec278c8a2d690e3bf815523286ca
Patch94: fix-wrong-test_mod_del_repo_multiline_values-test-af.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56185
Patch95: fix-regression-in-service-states-with-reload-argumen.patch
Patch93: fix-wrong-test_mod_del_repo_multiline_values-test-af.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56369
Patch96: make-salt.ext.tornado.gen-to-use-salt.ext.backports_.patch
Patch94: make-salt.ext.tornado.gen-to-use-salt.ext.backports_.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/221
Patch97: loader-invalidate-the-import-cachefor-extra-modules.patch
Patch95: loader-invalidate-the-import-cachefor-extra-modules.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/55814
Patch98: opensuse-3000-virt-defined-states-222.patch
Patch96: opensuse-3000-virt-defined-states-222.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/223
Patch99: fix-for-temp-folder-definition-in-loader-unit-test.patch
Patch97: fix-for-temp-folder-definition-in-loader-unit-test.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56392
Patch100: virt._get_domain-don-t-raise-an-exception-if-there-i.patch
Patch98: virt._get_domain-don-t-raise-an-exception-if-there-i.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/226
Patch101: re-adding-function-to-test-for-root.patch
Patch99: re-adding-function-to-test-for-root.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/227
Patch102: loop-fix-variable-names-for-until_no_eval.patch
Patch100: loop-fix-variable-names-for-until_no_eval.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/226
Patch103: make-setup.py-script-to-not-require-setuptools-9.1.patch
Patch101: make-setup.py-script-to-not-require-setuptools-9.1.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/50453
# https://github.com/saltstack/salt/commit/e20362f6f053eaa4144583604e6aac3d62838419
# Can be dropped one pull/50453 is in released version.
Patch104: reintroducing-reverted-changes.patch
Patch102: reintroducing-reverted-changes.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/b713d0b3031faadc17cd9cf09977ccc19e50bef7
Patch105: add-new-custom-suse-capability-for-saltutil-state-mo.patch
Patch103: add-new-custom-suse-capability-for-saltutil-state-mo.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56463
Patch106: fix-typo-on-msgpack-version-when-sanitizing-msgpack-.patch
Patch104: fix-typo-on-msgpack-version-when-sanitizing-msgpack-.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56491
Patch107: sanitize-grains-loaded-from-roster_grains.json.patch
Patch105: sanitize-grains-loaded-from-roster_grains.json.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/228
Patch108: adds-explicit-type-cast-for-port.patch
Patch106: adds-explicit-type-cast-for-port.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53882
Patch107: fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/4f80e969e31247a4755d98d25f29b5d8b1b916c3
Patch108: remove-vendored-backports-abc-from-requirements.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/a5ef829408685d9e65eaa24bba40d221adffaa95
Patch109: fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@ -802,7 +804,7 @@ This package adds the standalone configuration for the Salt master in order to m
%prep
# %setup -q -n salt-%{version}
%setup -q -n salt-3000-suse
%setup -q -n salt-3000.2-suse
cp %{S:1} .
cp %{S:5} ./.travis.yml
%patch1 -p1
@ -913,6 +915,7 @@ cp %{S:5} ./.travis.yml
%patch106 -p1
%patch107 -p1
%patch108 -p1
%patch109 -p1
%build
%if 0%{?build_py2}

3
v3000.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:076fc5752da6a0a5cfcc0ca6428664a89611a4a41b2757dba9ecf469c3e8a0d1
size 15253221

3
v3000.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47118206f5c3480796cec0c15f2efdcb79200c3636576758437f65c35daf2667
size 15191254