Package: salt / 2018.3.4+dfsg1-6

Metadata

Package Version Patches format
salt 2018.3.4+dfsg1-6 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
gitfs Fix use of deprecated pygit2 function.patch | (download)

salt/utils/gitfs.py | 27 20 + 7 - 0 !
1 file changed, 20 insertions(+), 7 deletions(-)

 [patch] gitfs: fix use of deprecated pygit2 function

0.27.4 (released 5 days ago) removed pygit2.Reference.get_object()

Fix retrieve systemd version using regex.patch | (download)

salt/utils/systemd.py | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 [patch] fix retrieve systemd version using regex

Fixes #51745

Signed-off-by: Jordan Jacobelli <jordan@cri.epita.fr>

Fix edge case when minion ID is a 16 character string.patch | (download)

salt/_compat.py | 2 1 + 1 - 0 !
tests/unit/utils/test_network.py | 9 9 + 0 - 0 !
2 files changed, 10 insertions(+), 1 deletion(-)

 [patch] fix edge case when minion id is a 16-character string

Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.

Closes: #928337
prevent_intersphinx_network_access.patch | (download)

doc/conf.py | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 prevent network access during build
 See https://bugs.debian.org/755026
Make the Salt Proxy environment aware.patch | (download)

salt/minion.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] make the salt proxy environment aware

The Salt proxy minion is looking for proxy minion modules in
salt://_proxy/. It does so however only in the default "base"
environment. On setups which do not use "base" or shall be executed in a
remove privacy breach.patch | (download)

doc/_themes/saltstack/layout.html | 1 0 + 1 - 0 !
doc/topics/cloud/index.html | 2 1 + 1 - 0 !
doc/topics/ssh/index.html | 6 3 + 3 - 0 !
3 files changed, 4 insertions(+), 5 deletions(-)

 remove privacy breach in docs
Make default pki directory configurable.patch | (download)

salt/config/__init__.py | 6 3 + 3 - 0 !
salt/syspaths.py | 6 5 + 1 - 0 !
setup.py | 5 5 + 0 - 0 !
3 files changed, 13 insertions(+), 4 deletions(-)

 [patch] make default pki directory configurable

The files in /etc/salt/pki are not configuration files in the sense
of the FHS ("local file used to control the operation of a program").
Debian wants to change the default location to /var/lib/salt/pki (to
properly follow FHS and to allow setting StateDirectory in the salt
master systemd configuration).

Therefore introduce a STATE_DIR syspaths variable which defaults to
CONFIG_DIR, but can be individually customized.

fixes #3396
Bug-Debian: https://bugs.debian.org/698898
Do not load zyppnotify file on module import.patch | (download)

tests/unit/test_zypp_plugins.py | 7 5 + 2 - 0 !
1 file changed, 5 insertions(+), 2 deletions(-)

 [patch] do not load zyppnotify file on module import

The call imp.load_source() could fail (i.e. when the specified
zyppnotify does not exist). To prevent an import failure in that case,
move the loading of the zyppnotify file into the test case.

0001 Skip SampleConfTest if sample conf directories are m.patch | (download)

tests/unit/test_config.py | 21 15 + 6 - 0 !
1 file changed, 15 insertions(+), 6 deletions(-)

 [patch 1/2] skip sampleconftest if sample conf directories are
 missing

The release tarball does not contain `conf/cloud.profiles.d`,
`conf/cloud.providers.d`, and `conf/cloud.maps.d`. Therefore the test
cases will fail:

```
======================================================================
ERROR: test_conf_cloud_maps_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]

0002 Skip ExtendTestCase if templates directory is missin.patch | (download)

tests/unit/utils/test_extend.py | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 [patch 2/2] skip extendtestcase if templates directory is missing

The release tarball does not contain the `templates` directory.
Therefore `ExtendTestCase` will fail:

```
======================================================================
ERROR: test_run (unit.utils.test_extend.ExtendTestCase)
[CPU:0.0%|MEM:53.9%]

disable failing tests.patch | (download)

tests/unit/fileserver/test_roots.py | 3 3 + 0 - 0 !
tests/unit/pillar/test_hg_pillar.py | 1 1 + 0 - 0 !
tests/unit/test_doc.py | 2 2 + 0 - 0 !
tests/unit/test_minion.py | 2 2 + 0 - 0 !
tests/unit/test_zypp_plugins.py | 2 2 + 0 - 0 !
tests/unit/utils/test_botomod.py | 2 1 + 1 - 0 !
tests/unit/utils/test_jinja.py | 1 1 + 0 - 0 !
7 files changed, 12 insertions(+), 1 deletion(-)

 disabling failing tests
 Some unit tests fail. Just disable these tests for now to at least run the
 remaining unit test (instead of running none).
run salt master as salt user.patch | (download)

pkg/salt-master.service | 5 5 + 0 - 0 !
salt/config/__init__.py | 2 2 + 0 - 0 !
2 files changed, 7 insertions(+)

 run salt-master daemon as 'salt' user
Support unittest.mock from Python 3.6 again.patch | (download)

tests/support/mock.py | 14 9 + 5 - 0 !
1 file changed, 9 insertions(+), 5 deletions(-)

 [patch] support unittest.mock from python >= 3.6 again

Python 3.6 contains unittest.mock which provide all needed functions
(including MagicMock.assert_called). Therefore reverts commit
9d004f6512d0619df895e0aca56143490a34337c partially to only require
mock >= 2.0.0 for Python < 3.6.

fixes #46281
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>

Skip failing openssl 1.1.1 tests for now.patch | (download)

tests/unit/utils/test_event.py | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 [patch] skip failing openssl 1.1.1 tests (for now)

One tests fails when using openssl 1.1.1 with TLS 1.3 support. Disable
this test for now. Please fix the bug in tornado and re-enable it again.

Bug: https://github.com/tornadoweb/tornado/issues/2536

ignore failing kubernetes test.patch | (download)

tests/unit/modules/test_kubernetes.py | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 ignore failing kubernetes test
 This needs to be reported upstream and fixed.
test_argspec_report Fix expected argspec_report resu.patch | (download)

tests/unit/utils/test_args.py | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 [patch] test_argspec_report: fix expected argspec_report result

The test_argspec_report test fails on Debian testing/unstable:

```
======================================================================
FAIL: test_argspec_report (unit.utils.test_args.ArgsTestCase)
[CPU:100.0%|MEM:21.2%]

Silence linux_distribution deprecation warning.patch | (download)

salt/grains/core.py | 8 7 + 1 - 0 !
salt/version.py | 8 7 + 1 - 0 !
2 files changed, 14 insertions(+), 2 deletions(-)

 [patch] silence linux_distribution deprecation warning

The salt master log is flooded with deprecation warnings:

```
Feb 07 10:45:34 debian salt-master[1657]: [WARNING ]
/usr/lib/python3/dist-packages/salt/grains/core.py:1759:
DeprecationWarning: dist() and linux_distribution() functions are
deprecated in Python 3.5
Feb 07 10:45:34 debian salt-master[1657]:
linux_distribution(supported_dists=_supported_dists)]
Feb 07 10:45:34 debian salt-master[1657]: [WARNING ]
/usr/lib/python3/dist-packages/salt/grains/core.py:1759:
DeprecationWarning: dist() and linux_distribution() functions are
deprecated in Python 3.5
```

Since the import statement already falls back to use
distro.linux_distribution, silence the deprecation warning.

Bug-Debian: https://bugs.debian.org/921630
Skip test_module_name_source_match.patch | (download)

tests/unit/test_module_names.py | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 [patch] skip test_module_name_source_match

Running the unittest with autopkgtest against the installed version of
salt fails:

```
======================================================================
FAIL: test_module_name_source_match
(unit.test_module_names.BadTestModuleNamesTestCase)
[CPU:0.0%|MEM:66.8%]

Fix test_xen_virtual on kernels with no Xen support.patch | (download)

tests/unit/grains/test_core.py | 9 4 + 5 - 0 !
1 file changed, 4 insertions(+), 5 deletions(-)

 [patch] fix test_xen_virtual on kernels with no xen support

The latest version of salt is failing its autopkgtests on ppc64el and s390x
architectures in Ubuntu:

```
[...]
FAIL: test_xen_virtual (unit.grains.test_core.CoreGrainsTestCase)
[CPU:0.0%|MEM:53.3%]

doc fix logo link.patch | (download)

doc/_themes/saltstack/layout.html | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] doc: fix logo link

The link on the brand image was pointing to index.html which does not
exist. The index file seems to be contents.html.

ensure searchtools.js gets included.patch | (download)

doc/_themes/saltstack/layout.html | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 [patch] doc: ensure searchtools.js gets included

Searchtools did not get included with Debian > stretch and
Sphinx > 1.6.7.

0001 Import tornado.gen as tornado_gen.patch | (download)

salt/client/__init__.py | 14 7 + 7 - 0 !
salt/crypt.py | 22 11 + 11 - 0 !
salt/master.py | 6 3 + 3 - 0 !
salt/minion.py | 50 25 + 25 - 0 !
salt/netapi/rest_tornado/saltnado.py | 42 21 + 21 - 0 !
salt/netapi/rest_tornado/saltnado_websockets.py | 6 3 + 3 - 0 !
salt/pillar/__init__.py | 10 5 + 5 - 0 !
salt/transport/ipc.py | 30 15 + 15 - 0 !
salt/transport/mixins/auth.py | 6 3 + 3 - 0 !
salt/transport/tcp.py | 76 38 + 38 - 0 !
salt/transport/zeromq.py | 52 26 + 26 - 0 !
tests/unit/transport/test_ipc.py | 4 2 + 2 - 0 !
tests/unit/transport/test_tcp.py | 14 7 + 7 - 0 !
tests/unit/transport/test_zeromq.py | 10 5 + 5 - 0 !
tests/unit/utils/test_asynchronous.py | 14 7 + 7 - 0 !
tests/unit/utils/test_context.py | 14 7 + 7 - 0 !
16 files changed, 185 insertions(+), 185 deletions(-)

 [patch 1/3] import tornado.gen as tornado_gen

```
sed -i 's/tornado.gen/tornado_gen/' $(find salt tests -type f)
sed -i 's/import tornado_gen/import tornado.gen as tornado_gen/' \
    $(find salt tests -type f)
```

0002 Explicitly import attributes from tornado.patch | (download)

salt/client/mixins.py | 4 2 + 2 - 0 !
salt/crypt.py | 10 6 + 4 - 0 !
salt/engines/ircbot.py | 14 7 + 7 - 0 !
salt/engines/webhook.py | 14 7 + 7 - 0 !
salt/minion.py | 31 16 + 15 - 0 !
salt/netapi/rest_tornado/__init__.py | 14 8 + 6 - 0 !
salt/netapi/rest_tornado/saltnado.py | 42 21 + 21 - 0 !
salt/netapi/rest_tornado/saltnado_websockets.py | 4 2 + 2 - 0 !
salt/transport/ipc.py | 32 16 + 16 - 0 !
salt/transport/tcp.py | 64 33 + 31 - 0 !
salt/transport/zeromq.py | 4 2 + 2 - 0 !
salt/utils/asynchronous.py | 8 4 + 4 - 0 !
salt/utils/event.py | 14 7 + 7 - 0 !
salt/utils/gitfs.py | 4 2 + 2 - 0 !
salt/utils/http.py | 14 7 + 7 - 0 !
salt/utils/zeromq.py | 11 6 + 5 - 0 !
tests/support/helpers.py | 10 5 + 5 - 0 !
tests/unit/fileserver/test_gitfs.py | 5 3 + 2 - 0 !
tests/unit/netapi/test_rest_tornado.py | 12 6 + 6 - 0 !
tests/unit/test_minion.py | 24 13 + 11 - 0 !
tests/unit/transport/test_ipc.py | 4 2 + 2 - 0 !
tests/unit/transport/test_tcp.py | 14 7 + 7 - 0 !
tests/unit/utils/test_asynchronous.py | 4 2 + 2 - 0 !
tests/unit/utils/test_context.py | 6 3 + 3 - 0 !
24 files changed, 187 insertions(+), 176 deletions(-)

 [patch 2/3] explicitly import attributes from tornado

To ease the rename of tornado to tornado4, explicitly import the
attributes from tornado to support changing only the import statements.

0003 Use renamed python3 tornado4.patch | (download)

doc/conf.py | 17 17 + 0 - 0 !
salt/client/__init__.py | 5 4 + 1 - 0 !
salt/client/mixins.py | 5 4 + 1 - 0 !
salt/crypt.py | 11 8 + 3 - 0 !
salt/engines/ircbot.py | 8 6 + 2 - 0 !
salt/engines/webhook.py | 11 8 + 3 - 0 !
salt/fileclient.py | 5 4 + 1 - 0 !
salt/master.py | 5 4 + 1 - 0 !
salt/minion.py | 17 12 + 5 - 0 !
salt/netapi/rest_tornado/__init__.py | 13 10 + 3 - 0 !
salt/netapi/rest_tornado/saltnado.py | 20 14 + 6 - 0 !
salt/netapi/rest_tornado/saltnado_websockets.py | 9 6 + 3 - 0 !
salt/pillar/__init__.py | 5 4 + 1 - 0 !
salt/transport/client.py | 9 7 + 2 - 0 !
salt/transport/ipc.py | 23 16 + 7 - 0 !
salt/transport/mixins/auth.py | 5 4 + 1 - 0 !
salt/transport/tcp.py | 26 18 + 8 - 0 !
salt/transport/zeromq.py | 20 14 + 6 - 0 !
salt/utils/asynchronous.py | 8 6 + 2 - 0 !
salt/utils/event.py | 8 6 + 2 - 0 !
salt/utils/gitfs.py | 5 4 + 1 - 0 !
salt/utils/http.py | 11 8 + 3 - 0 !
salt/utils/process.py | 5 4 + 1 - 0 !
salt/utils/thin.py | 5 4 + 1 - 0 !
salt/utils/zeromq.py | 8 6 + 2 - 0 !
salt/version.py | 10 8 + 2 - 0 !
tests/integration/__init__.py | 8 6 + 2 - 0 !
tests/integration/files/engines/runtests_engine.py | 8 4 + 4 - 0 !
tests/integration/modules/test_gem.py | 5 4 + 1 - 0 !
tests/integration/modules/test_ssh.py | 5 4 + 1 - 0 !
tests/support/helpers.py | 8 6 + 2 - 0 !
tests/unit/fileserver/test_gitfs.py | 5 4 + 1 - 0 !
tests/unit/modules/test_random_org.py | 5 4 + 1 - 0 !
tests/unit/netapi/test_rest_tornado.py | 20 14 + 6 - 0 !
tests/unit/test_minion.py | 18 13 + 5 - 0 !
tests/unit/transport/test_ipc.py | 11 8 + 3 - 0 !
tests/unit/transport/test_tcp.py | 14 10 + 4 - 0 !
tests/unit/transport/test_zeromq.py | 13 11 + 2 - 0 !
tests/unit/utils/test_asynchronous.py | 11 8 + 3 - 0 !
tests/unit/utils/test_context.py | 11 8 + 3 - 0 !
tests/unit/utils/test_event.py | 5 4 + 1 - 0 !
41 files changed, 314 insertions(+), 107 deletions(-)

 [patch 3/3] use renamed python3-tornado4