Hello community,
here is the log from the commit of package salt for openSUSE:Factory checked in at 2020-05-01 11:07:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/salt (Old)
and /work/SRC/openSUSE:Factory/.salt.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt"
Fri May 1 11:07:16 2020 rev:103 rq:799271 version:3000.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/salt/salt.changes 2020-04-10 23:52:59.664687426 +0200
+++ /work/SRC/openSUSE:Factory/.salt.new.2738/salt.changes 2020-05-01 11:07:22.511067410 +0200
@@ -1,0 +2,39 @@
+Thu Apr 30 13:24:35 UTC 2020 - Pablo Suárez Hernández
+
+- 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
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
fix-for-unless-requisite-when-pip-is-not-installed.patch
fix-regression-in-service-states-with-reload-argumen.patch
v3000.tar.gz
New:
----
fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch
remove-vendored-backports-abc-from-requirements.patch
v3000.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ salt.spec ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.747076622 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.751076630 +0200
@@ -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 @@
Patch91: add-missing-_utils-at-loader-grains_func.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/25b4e3ea983b2606b2fb3d3c0e42f9840208...
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/a8f0a15e4067ec278c8a2d690e3bf8155232...
-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/e20362f6f053eaa4144583604e6aac3d628...
# 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/b713d0b3031faadc17cd9cf09977ccc19e50...
-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/4f80e969e31247a4755d98d25f29b5d8b1b9...
+Patch108: remove-vendored-backports-abc-from-requirements.patch
+# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/a5ef829408685d9e65eaa24bba40d221adff...
+Patch109: fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@@ -802,7 +804,7 @@
%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 @@
%patch106 -p1
%patch107 -p1
%patch108 -p1
+%patch109 -p1
%build
%if 0%{?build_py2}
++++++ _lastrevision ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.807076752 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.811076761 +0200
@@ -1 +1 @@
-c96fc684a059121ecc7baf013768b1b611777d73
\ No newline at end of file
+52475d78d58db61df54486af13c5eb4055c2d12e
\ No newline at end of file
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.827076796 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.827076796 +0200
@@ -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>
++++++ accumulated-changes-from-yomi-167.patch ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.835076814 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.839076822 +0200
@@ -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
Date: Tue, 22 Oct 2019 11:02:33 +0200
Subject: [PATCH] Accumulated changes from Yomi (#167)
@@ -88,13 +88,13 @@
'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):
++++++ do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.915076987 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.919076996 +0200
@@ -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
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 @@
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 @@
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 @@
+ return ret
- def _clear_context(bin_env=None):
+ def _pip_bin_env(cwd, bin_env):
--
2.16.4
++++++ fix-a-wrong-rebase-in-test_core.py-180.patch ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:26.939077040 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:26.943077048 +0200
@@ -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
Date: Fri, 25 Oct 2019 15:43:16 +0200
Subject: [PATCH] Fix a wrong rebase in test_core.py (#180)
@@ -44,12 +44,12 @@
# 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):
++++++ fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch ++++++
From a5ef829408685d9e65eaa24bba40d221adffaa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
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
++++++ fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch ++++++
From 3df8359421f60140fd335d95c3c06de0bfd6ac4f Mon Sep 17 00:00:00 2001
From: tyl0re
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
++++++ make-setup.py-script-to-not-require-setuptools-9.1.patch ++++++
--- /var/tmp/diff_new_pack.6Mbovw/_old 2020-05-01 11:07:27.043077266 +0200
+++ /var/tmp/diff_new_pack.6Mbovw/_new 2020-05-01 11:07:27.043077266 +0200
@@ -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?=
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 @@
# _version.py in the build command
self.distribution.running_salt_install = True
--
-2.23.0
+2.16.4
++++++ remove-vendored-backports-abc-from-requirements.patch ++++++
From 3bbb31815bb3c6eacedb8891f6bf4ece8098deca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
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
++++++ v3000.tar.gz -> v3000.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/salt/v3000.tar.gz /work/SRC/openSUSE:Factory/.salt.new.2738/v3000.2.tar.gz differ: char 16, line 1