retitle 927348 unblock: salt/2018.3.4+dfsg1-4
thanks
Hi,
two more uploads for salt were needed: The first for repairing the
documentation (correct JavaScript symlinks and making the search work
again). The second for fixing the autopkgtest when using systemd 241-3.
A debdiff between salt 2018.3.4+dfsg1-2 and 2018.3.4+dfsg1-4 is
attached.
unblock salt/2018.3.4+dfsg1-4
--
Benjamin Drung
System Developer
Debian & Ubuntu Developer
1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de
Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss
Member of United Internet
diff -Nru salt-2018.3.4+dfsg1/debian/changelog salt-2018.3.4+dfsg1/debian/changelog
--- salt-2018.3.4+dfsg1/debian/changelog 2019-04-17 20:26:11.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/changelog 2019-04-26 16:38:39.000000000 +0200
@@ -1,3 +1,26 @@
+salt (2018.3.4+dfsg1-4) unstable; urgency=medium
+
+ * Cherry-pick upstream patch to fix retrieving systemd version (for 241-3)
+
+ -- Benjamin Drung <benjamin.dr...@cloud.ionos.com> Fri, 26 Apr 2019 16:38:39 +0200
+
+salt (2018.3.4+dfsg1-3) unstable; urgency=medium
+
+ [ Benjamin Drung ]
+ * tests: Drop copying missing templates directory
+ * salt-doc: Install favicon in document root and do not compress it
+ * salt-doc: Fix JavaScript symlinks to bootstrap (Closes: #919849)
+ * doc: Set script type explicitly to text/javascript
+ * Use jquery.js from sphinx
+ * Symlink vendor JavaScript files before building
+ * Use dh_sphinxdoc
+
+ [ Steffen Kockel ]
+ * doc: Fix logo link to point to contents.html
+ * doc: Ensure searchtools.js gets included (to fix the search)
+
+ -- Benjamin Drung <benjamin.dr...@cloud.ionos.com> Thu, 25 Apr 2019 13:39:10 +0200
+
salt (2018.3.4+dfsg1-2) unstable; urgency=medium
* Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
diff -Nru salt-2018.3.4+dfsg1/debian/control salt-2018.3.4+dfsg1/debian/control
--- salt-2018.3.4+dfsg1/debian/control 2019-04-05 14:43:18.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/control 2019-04-25 17:08:50.000000000 +0200
@@ -11,6 +11,8 @@
debhelper (>= 11),
dh-python,
dpkg-dev (>= 1.16.2),
+ libjs-bootstrap,
+ libjs-modernizr,
python3,
python3 (>= 3.6) | python3-mock,
python3-augeas,
@@ -52,6 +54,7 @@
python3-twilio,
python3-yaml,
python3-zmq (>= 13.1.0),
+ sphinx-common,
virtualenv
Build-Depends-Indep: python3-doc, python3-sphinx (>= 1.3.5)
Standards-Version: 4.3.0
@@ -219,11 +222,11 @@
Package: salt-doc
Architecture: all
Section: doc
+Built-Using: ${sphinxdoc:Built-Using}
Depends: libjs-bootstrap,
- libjs-jquery,
libjs-modernizr,
- libjs-sphinxdoc,
- ${misc:Depends}
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
Breaks: salt-common (<< 2016.11.5)
Replaces: salt-common (<< 2016.11.5)
Description: additional documentation for salt, the distributed remote execution system
diff -Nru salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch
--- salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch 2019-04-25 17:09:29.000000000 +0200
@@ -0,0 +1,27 @@
+From 5c3036d248c4ae76d2fa7598cde179294aa4b2bb Mon Sep 17 00:00:00 2001
+From: Steffen Kockel <steffen.koc...@profitbricks.com>
+Date: Tue, 23 Apr 2019 17:45:00 +0200
+Subject: [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.
+---
+ doc/_themes/saltstack/layout.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
+index 85e0a3cf..d5ff2cd6 100644
+--- a/doc/_themes/saltstack/layout.html
++++ b/doc/_themes/saltstack/layout.html
+@@ -181,7 +181,7 @@
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+- <a class="brand" href="{{ pathto('index') }}"><img src="{{ pathto('_static/images/SaltStack-Logo.png', 1) }}" /></a>
++ <a class="brand" href="{{ pathto('contents') }}"><img src="{{ pathto('_static/images/SaltStack-Logo.png', 1) }}" /></a>
+ <div class="nav-collapse collapse">
+ {%- block relbar1 %}{{ relbar() }}{% endblock %}
+ </div>
+--
+2.17.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch
--- salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch 2019-04-25 17:09:29.000000000 +0200
@@ -0,0 +1,52 @@
+From e22e49d974937ed9107cf33c679799c914f27777 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.dr...@cloud.ionos.com>
+Date: Thu, 25 Apr 2019 11:53:09 +0200
+Subject: [PATCH] doc: Set script type explicitly to text/javascript
+
+dh_sphinxdoc (used for building the documentation in the Debian package)
+searches for script lines and expect the type set to text/javascript.
+Otherwise dh_sphinxdoc won't find the scripts.
+
+Therefore mark the JavaScript scripts explicitly as text/javascript.
+
+Forwarded: https://github.com/saltstack/salt/pull/52693
+Signed-off-by: Benjamin Drung <benjamin.dr...@cloud.ionos.com>
+---
+ doc/_themes/saltstack/layout.html | 6 +++---
+ doc/_themes/saltstack2/layout.html | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
+index 85e0a3cfa4..8c4380e7f2 100644
+--- a/doc/_themes/saltstack/layout.html
++++ b/doc/_themes/saltstack/layout.html
+@@ -81,7 +81,7 @@
+ </script>
+ {%- for scriptfile in script_files %}
+ {% if scriptfile not in js_blacklist %}
+- <script src="{{ pathto(scriptfile, 1) }}"></script>
++ <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+ {% endif %}
+ {%- endfor %}
+ {%- endmacro %}
+@@ -159,7 +159,7 @@
+ {%- endblock %}
+
+ {%- block extrahead %} {% endblock %}
+- <script src="{{ pathto('_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
++ <script type="text/javascript" src="{{ pathto('_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
+
+ {%- block analytics %}
+ {% endblock %}
+@@ -258,7 +258,7 @@
+ </footer>
+ {%- endblock %}
+
+- <script src="{{ pathto('_static/js/main.js', 1) }}"></script>
++ <script type="text/javascript" src="{{ pathto('_static/js/main.js', 1) }}"></script>
+
+ {% if on_saltstack %}
+ <script type="text/javascript" language="javascript">llactid=23943</script>
+--
+2.20.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch
--- salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch 2019-04-25 17:09:29.000000000 +0200
@@ -0,0 +1,28 @@
+From fbe10bf5c46e8a4b0ab943b45db223116e5cfc39 Mon Sep 17 00:00:00 2001
+From: Steffen Kockel <steffen.koc...@profitbricks.com>
+Date: Wed, 24 Apr 2019 16:57:13 +0200
+Subject: [PATCH] doc: Ensure searchtools.js gets included
+
+Searchtools did not get included with Debian > stretch and
+Sphinx > 1.6.7.
+---
+ doc/_themes/saltstack/layout.html | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
+index 85e0a3cf..6e5c70e0 100644
+--- a/doc/_themes/saltstack/layout.html
++++ b/doc/_themes/saltstack/layout.html
+@@ -23,6 +23,9 @@
+ {% set script_files = [
+ '_static/js/vendor/bootstrap.min.js',
+ ] + script_files %}
++{% if not '_static/searchtools.js' in script_files %}
++{% set script_files = script_files + ['_static/searchtools.js'] %}
++{% endif %}
+
+ {%- macro relbar() %}
+ <div class="related">
+--
+2.17.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/patches/Fix-retrieve-systemd-version-using-regex.patch salt-2018.3.4+dfsg1/debian/patches/Fix-retrieve-systemd-version-using-regex.patch
--- salt-2018.3.4+dfsg1/debian/patches/Fix-retrieve-systemd-version-using-regex.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/Fix-retrieve-systemd-version-using-regex.patch 2019-04-26 16:31:22.000000000 +0200
@@ -0,0 +1,38 @@
+From 94809d0a179958ef251ea38daea46c86821166d3 Mon Sep 17 00:00:00 2001
+From: Jordan Jacobelli <jor...@cri.epita.fr>
+Date: Sat, 2 Mar 2019 15:46:23 +0100
+Subject: [PATCH] Fix retrieve systemd version using regex
+
+Fixes #51745
+
+Signed-off-by: Jordan Jacobelli <jor...@cri.epita.fr>
+---
+ salt/utils/systemd.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/salt/utils/systemd.py b/salt/utils/systemd.py
+index 7790b3567d..060bc1e3fb 100644
+--- a/salt/utils/systemd.py
++++ b/salt/utils/systemd.py
+@@ -6,6 +6,7 @@ Contains systemd related help files
+ from __future__ import absolute_import, print_function, unicode_literals
+ import logging
+ import os
++import re
+ import subprocess
+
+ # Import Salt libs
+@@ -65,8 +66,8 @@ def version(context=None):
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0]
+ outstr = salt.utils.stringutils.to_str(stdout)
+ try:
+- ret = int(outstr.splitlines()[0].split()[-1])
+- except (IndexError, ValueError):
++ ret = int(re.search(r'\w+ ([0-9]+)', outstr.splitlines()[0]).group(1))
++ except (AttributeError, IndexError, ValueError):
+ log.error(
+ 'Unable to determine systemd version from systemctl '
+ '--version, output follows:\n%s', outstr
+--
+2.20.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/patches/series salt-2018.3.4+dfsg1/debian/patches/series
--- salt-2018.3.4+dfsg1/debian/patches/series 2019-04-17 17:38:18.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/patches/series 2019-04-26 16:36:03.000000000 +0200
@@ -1,4 +1,5 @@
gitfs-Fix-use-of-deprecated-pygit2-function.patch
+Fix-retrieve-systemd-version-using-regex.patch
prevent_intersphinx_network_access.patch
Make-the-Salt-Proxy-environment-aware.patch
remove-privacy-breach.patch
@@ -16,6 +17,10 @@
Skip-test_module_name_source_match.patch
Fix-test_xen_virtual-on-kernels-with-no-Xen-support.patch
fix-various-spelling-mistakes.patch
+doc-Set-script-type-explicitly-to-text-javascript.patch
+doc-fix-logo-link.patch
+Use-jquery.js-from-sphinx.patch
+ensure-searchtools.js-gets-included.patch
0001-Import-tornado.gen-as-tornado_gen.patch
0002-Explicitly-import-attributes-from-tornado.patch
0003-Use-renamed-python3-tornado4.patch
diff -Nru salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch
--- salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch 2019-04-25 17:09:29.000000000 +0200
@@ -0,0 +1,35 @@
+From 0baa23a3a01291af2b78f9e123284bbdb7de0541 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.dr...@profitbricks.com>
+Date: Wed, 24 Apr 2019 14:49:35 +0200
+Subject: [PATCH] Use jquery.js from sphinx
+
+Sphinx uses libjs-jquery >= 1.11.1 which is newer than jquery-1.9.1.js
+shipped by salt. Therefore jquery.js from sphinx can be used again.
+
+Signed-off-by: Benjamin Drung <benjamin.dr...@cloud.ionos.com>
+---
+ doc/_themes/saltstack/layout.html | 6 ------
+ 2 files changed, 7 deletions(-)
+
+diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
+index 85e0a3cf..a332b7c6 100644
+--- a/doc/_themes/saltstack/layout.html
++++ b/doc/_themes/saltstack/layout.html
+@@ -19,14 +19,8 @@
+ {%- set titlesuffix = "" %}
+ {%- endif %}
+
+-{# Remove old version of jQuery #}
+-{% set js_blacklist = [
+- '_static/jquery.js',
+-] %}
+-
+ {# Add to top of the list #}
+ {% set script_files = [
+- '_static/js/vendor/jquery-1.9.1.js',
+ '_static/js/vendor/bootstrap.min.js',
+ ] + script_files %}
+
+--
+2.20.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/rules salt-2018.3.4+dfsg1/debian/rules
--- salt-2018.3.4+dfsg1/debian/rules 2019-04-05 14:24:10.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/rules 2019-04-25 17:27:28.000000000 +0200
@@ -3,11 +3,13 @@
#export DH_VERBOSE=1
%:
- dh $@ --buildsystem pybuild --with bash-completion,python3
+ dh $@ --buildsystem pybuild --with bash-completion,python3,sphinxdoc
override_dh_auto_build:
dh_auto_build
- rm -f doc/_themes/saltstack/static/css/*.min.css
+ rm -f doc/_themes/saltstack/static/css/*.min.css doc/_themes/saltstack/static/js/vendor/*.js
+ ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js doc/_themes/saltstack/static/js/vendor/bootstrap.min.js
+ ln -s /usr/share/javascript/modernizr/modernizr.min.js doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
HTML_THEME=saltstack make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
HTML_THEME=saltstack make -C doc man SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
@@ -27,6 +29,9 @@
override_dh_install:
dh_install -X/usr/share/man/man
+override_dh_compress:
+ dh_compress -X.ico
+
override_dh_fixperms:
dh_fixperms
chmod 2750 debian/salt-common/var/log/salt
diff -Nru salt-2018.3.4+dfsg1/debian/salt-doc.links salt-2018.3.4+dfsg1/debian/salt-doc.links
--- salt-2018.3.4+dfsg1/debian/salt-doc.links 2019-04-05 14:43:18.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/salt-doc.links 2019-04-25 17:08:50.000000000 +0200
@@ -1,9 +1,3 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/salt/html/_static/js/vendor/jquery-1.9.1.js
+usr/share/doc/salt/html/_static/favicon.ico usr/share/doc/salt/html/favicon.ico
+usr/share/javascript/bootstrap/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js
usr/share/javascript/modernizr/modernizr.min.js usr/share/doc/salt/html/_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
-usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/salt/html/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/salt/html/_static/jquery.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/salt/html/_static/searchtools.js
-usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/salt/html/_static/sidebar.js
-usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/salt/html/_static/underscore.js
-usr/share/twitter-bootstrap/files/js/bootstrap.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.js
-usr/share/twitter-bootstrap/files/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js
diff -Nru salt-2018.3.4+dfsg1/debian/tests/control salt-2018.3.4+dfsg1/debian/tests/control
--- salt-2018.3.4+dfsg1/debian/tests/control 2019-04-03 16:14:25.000000000 +0200
+++ salt-2018.3.4+dfsg1/debian/tests/control 2019-04-25 17:08:50.000000000 +0200
@@ -1,4 +1,4 @@
-Test-Command: cp -r conf scripts templates tests "$AUTOPKGTEST_TMP"; cd "$AUTOPKGTEST_TMP"; python3 ./tests/runtests.py -v --no-report --unit
+Test-Command: cp -r conf scripts tests "$AUTOPKGTEST_TMP"; cd "$AUTOPKGTEST_TMP"; python3 ./tests/runtests.py -v --no-report --unit
Depends: python3 (>= 3.6) | python3-mock,
python3-augeas,
python3-boto,
