Forwarded: https://github.com/saltstack/salt/pull/51594

Update to upstream version '2018.3.4+dfsg1'
with Debian dir bf79f55f91ef7cf1dbdf9fc464496c6d4eb0771b

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

The upstream tarball does not ship the NOTICE file (it is just in their
git repository).

This reverts commit 02969e4a.

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%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 236, in test_conf_cloud_maps_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.maps.d/'

======================================================================
ERROR: test_conf_cloud_profiles_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 200, in test_conf_cloud_profiles_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.profiles.d/'

======================================================================
ERROR: test_conf_cloud_providers_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 218, in test_conf_cloud_providers_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.providers.d/'
```

Forwarded: https://github.com/saltstack/salt/pull/52403


Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>

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%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/utils/test_extend.py", line 40, in test_run
    out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
  File "salt/utils/extend.py", line 242, in run
    MODULE_OPTIONS = _fetch_templates(os.path.join(salt_dir, 'templates'))
  File "salt/utils/extend.py", line 76, in _fetch_templates
    for item in os.listdir(src):
FileNotFoundError: [Errno 2] No such file or directory: ' templates'
```

Forwarded: https://github.com/saltstack/salt/pull/52403


Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>

Seven test cases fail when using ASCII encoding:

```
======================================================================
ERROR: setUpClass (unit.fileserver.test_gitfs.GitPythonTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/fileserver/test_gitfs.py", line 428, in setUpClass
    repo.index.add([x for x in os.listdir(TMP_REPO_DIR)
  File "/usr/lib/python3/dist-packages/git/index/base.py", line 804, in add
    self.write(ignore_extension_data=not write_extension_data)
  File "/usr/lib/python3/dist-packages/git/index/base.py", line 216, in write
    self._serialize(stream, ignore_extension_data)
  File "/usr/lib/python3/dist-packages/git/index/base.py", line 181, in _serialize
    write_cache(entries, stream, extension_data)
  File "/usr/lib/python3/dist-packages/git/index/fun.py", line 139, in write_cache
    path = force_bytes(path, encoding=defenc)
  File "/usr/lib/python3/dist-packages/gitdb/utils/encoding.py", line 16, in force_bytes
    return data.encode(encoding)
UnicodeEncodeError: 'utf-8' codec can't encode character '\udcd0' in position 0: surrogates not allowed
```

These test cases use Unicode in the filenames on the disk and Python's
`os.listdir` fail to retreive them correcty when using the ASCII
encoding.

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

The minified documentation CSS files are not used. Therefore remove them
before building the documentation.

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

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%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/grains/test_core.py", line 701, in test_xen_virtual
    'Xen PV DomU'
AssertionError: None != 'Xen PV DomU'

----------------------------------------------------------------------
Ran 7575 tests in 3249.235s
[...]
```

  (http://autopkgtest.ubuntu.com/packages/s/salt/disco/ppc64el)

The cause of this failure is an improper test which mocks up an isfile check
for /sys/bus/xen/drivers/xenconsole, but which doesn't also mock up the
check for the /sys/bus/xen directory; so if run on a kernel with no Xen
support at all, the test will fail.

The test happens to pass on the other architectures on which Ubuntu runs
autopkgtests, because these happen to be architectures which have Xen
support and Xen happens to be enabled in the kernels on these architectures.
But it's a bad test that depends on the kernel instead of actually unit
testing the code.

Therefore also mock `os.path.isdir` to return `True` for the path
`/sys/bus/xen`.

Closes: #922352
Forwarded: https://github.com/saltstack/salt/pull/52582


Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>

0002-Explicitly-import-attributes-from-tornado.patch introduces double
spaces after an equal sign. Remove the duplicate.

The salt master/minion will show following deprecation warning on
startup:

```
[WARNING ] /usr/lib/python3/dist-packages/salt/transport/zeromq.py:40:
VisibleDeprecationWarning: zmq.eventloop.minitornado is deprecated in
pyzmq 14.0 and will be removed.
    Install tornado itself to use zmq with the tornado IOLoop.

  import zmq.eventloop.ioloop
```

Fix this warning by exposing tornado4 as tornado for
zmq.eventloop.ioloop.

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

lintian found more spelling mistakes.