Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Control: tags -1 moreinfo Am Samstag, den 25.05.2019, 10:58 +0200 schrieb Paul Gevers: > On 24-05-2019 15:38, Benjamin Drung wrote: > > I would like to upload that proposed version to unstable. > > Please go ahead and remove the moreinfo tag when the package is build > and installed. salt 2018.3.4+dfsg1-6 uploaded, built successfully and debci succeeded as well. -- 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
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Control: tags -1 confirmed moreinfo Hi Benjamin, On 24-05-2019 15:38, Benjamin Drung wrote: > I would like to upload that proposed version to unstable. Please go ahead and remove the moreinfo tag when the package is build and installed. Paul signature.asc Description: OpenPGP digital signature
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Hi Paul, Am Dienstag, den 14.05.2019, 20:13 +0200 schrieb Paul Gevers: > Hi Benjamin, > > On 14-05-2019 13:13, Benjamin Drung wrote: > > Hi Paul, > > > > Am Freitag, den 10.05.2019, 20:40 +0200 schrieb Paul Gevers: > > > Control: tags -1 moreinfo > > > > > > So, all in all, I don't want to unblock the new upstream with > > > your > > > packaging, we're too late in the cycle and the version really > > > doesn't > > > match the freeze policy. However, I am offering you an upload > > > based > > > on the version currently in buster via t-p-u. If you go that > > > route, > > > please only fix bugs 919849, 928337, 922352, 924763, the > > > LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849 > > > without > > > switching your build to sphinxdoc, that isn't appropriate at this > > > moment. > > > > Okay. So you prefer an upload to t-p-u or can I just revert those > > rejected changes (typos fixes and using dh_sphinxdoc) and do > > another > > upload to unstable? > > I would prefer an upload to unstable if you also revert to the > previous > upstream tar ball (e.g. using the +really version syntax). I prepared the relevant changes in the master-proposed branch: https://salsa.debian.org/salt-team/salt/commits/master-proposed Attached a diff between 2018.3.4~git20180207+dfsg1-1 from testing and the proposed 2018.3.4+dfsg1-6 created with: git diff debian/2018.3.4_git20180207+dfsg1-1..master-proposed -- debian I tested this proposed version that it builds and that the documentation works as expected (including the search) and that all needed files are there and that it contains to broken symlinks. While testing I found and fixed another instance of privacy breach: https://salsa.debian.org/salt-team/salt/commit/08a00aaa4670d0713ec55c0d23d25e64ad85e624 (privacy breach is not part of the policy yet, see #726998) Let me know if this change is acceptable or not. I would like to upload that proposed version to unstable. If you insists of staying with the 2018.3.4~git20180207+dfsg1 snapshot, I will rebase this patch on top of 2018.3.4~git20180207+dfsg1 and prepare the upload for t-p-u. -- 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 --git a/debian/changelog b/debian/changelog index e1942d9d..9d0dfca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,65 @@ +salt (2018.3.4+dfsg1-6) unstable; urgency=medium + + * Revert changes that were rejected by the release team: +- Drop fixing various spelling mistakes +- Drop using jquery.js from sphinx +- Drop using dh_sphinxdoc +- Drop patch to set script type explicitly to text/javascript + * doc: Use local Open Sans fonts instead of querying Google +to fix possible privacy breach + + -- Benjamin Drung Fri, 24 May 2019 15:01:45 +0200 + +salt (2018.3.4+dfsg1-5) unstable; urgency=medium + + * Cherry-pick upstream patch to fix edge case when minion ID is a +16-character string (Closes: #928337) + + -- Benjamin Drung Thu, 02 May 2019 13:23:44 +0200 + +salt (2018.3.4+dfsg1-4) unstable; urgency=medium + + * Cherry-pick upstream patch to fix retrieving systemd version (for 241-3) + + -- Benjamin Drung 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 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) + * Expose tornado4 as tornado for zmq.eventloop.ioloop (Closes: #924763) + + -- Benjamin Drung Wed, 17 Apr 2019 20:26:11 +0200 + +salt (2018.3.4+dfsg1-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches + * Fix various spelling mistakes + * Drop NOTICE from salt-common (the upstream tarball does not contain it) + * Skip SampleConfTest and ExtendTestCase if the required sample conf or +templates directories are missing + * Run tests with LC_ALL=C.UTF-8 + * Remove unused minified documentation CSS files + + -- Benjamin Drung Fri, 05 Apr 2019 13:58:40 +0200 + salt (2018.3.4~git20180207+dfsg1-1) unstable; urgency=medium * New upstream pre-release snapshot. diff --gi
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Hi Benjamin, On 14-05-2019 13:13, Benjamin Drung wrote: > Hi Paul, > > Am Freitag, den 10.05.2019, 20:40 +0200 schrieb Paul Gevers: >> Control: tags -1 moreinfo >> >> So, all in all, I don't want to unblock the new upstream with your >> packaging, we're too late in the cycle and the version really doesn't >> match the freeze policy. However, I am offering you an upload based >> on the version currently in buster via t-p-u. If you go that route, >> please only fix bugs 919849, 928337, 922352, 924763, the >> LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849 without >> switching your build to sphinxdoc, that isn't appropriate at this >> moment. > > Okay. So you prefer an upload to t-p-u or can I just revert those > rejected changes (typos fixes and using dh_sphinxdoc) and do another > upload to unstable? I would prefer an upload to unstable if you also revert to the previous upstream tar ball (e.g. using the +really version syntax). Paul signature.asc Description: OpenPGP digital signature
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Hi Paul, Am Freitag, den 10.05.2019, 20:40 +0200 schrieb Paul Gevers: > Control: tags -1 moreinfo > > So, all in all, I don't want to unblock the new upstream with your > packaging, we're too late in the cycle and the version really doesn't > match the freeze policy. However, I am offering you an upload based > on the version currently in buster via t-p-u. If you go that route, > please only fix bugs 919849, 928337, 922352, 924763, the > LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849 without > switching your build to sphinxdoc, that isn't appropriate at this > moment. Okay. So you prefer an upload to t-p-u or can I just revert those rejected changes (typos fixes and using dh_sphinxdoc) and do another upload to unstable? -- 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
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Control: tags -1 moreinfo Hi Benjamin, On 06-05-2019 12:47, Benjamin Drung wrote: > Am Donnerstag, den 02.05.2019, 21:05 +0200 schrieb Paul Gevers: >> Control: tags -1 moreinfo >> >> Hi Benjamin, >> >> On Thu, 18 Apr 2019 13:01:31 +0200 Benjamin Drung >> wrote: >>> This version fixes the test_xen_virtual test case (bug #922352) and >>> exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763). >>> Our >>> salt 2018.3.3+dfsg1-1 package introduced a big patch to use >>> python3-tornado4 (instead of python3-tornado) due to missing >>> support for >>> tornado version 5. Without the fix for #924763, >>> zmq.eventloop.ioloop >>> will import tornado version 5 (if python3-tornado is installed). >> >> Both bugs have severity normal. Do you really want to bother now or >> is the severity not correct (then please fix that and elaborate)? > > Bug #922352 can cause a build failure (and does on Ubuntu). Therefore I > raised it to serious. > > Determining the severity of bug #924763 is more complicated. The > reporter stumbled over a warning spit out by salt. The warning message > by itself is more or less harmless, but the underlying problem of the > wrong import might have bad effects. I haven't seen any yet, but they > might be there. IMO we shouldn't release salt with an issue introduced > by one of our patches. Ack. >>> I also included fix-various-spelling-mistakes.patch which fixes >>> several >>> spelling mistakes. Because this patch file is long, I excluded it >>> from the >>> attached debdiff. >> >> Bugs can be introduced that way. I am not going to review that diff, >> fixing spelling mistakes at this moment isn't appropriate unless >> these mistakes are crucial somewhere. > > I can drop that patch again when this is the only blocker for getting > the unblock request accepted. Please do. [...] >> You didn't even elaborate on all the (at this phase of the release >> inappropriate) changes to the packaging. There is even a newer >> version >> than the one you already mention in a follow up in this bug. > > Which changes to the packaging do you refer to? The once you discuss below. > Running the tests with LC_ALL=C.UTF-8 fixes a build failure in case the > building machine uses an ANSII locale, which would be worth another RC > bug report. Ack. > Upload 2018.3.4+dfsg1-3 repairs the documentation in salt-doc. It > ensures that the pre-built minified Javascript and CSS files are not > leaked into the salt-doc binary package and that all created symlink > are correct. Before this version, salt-doc contained broken symlinks > and the search did not work. I am very uncomfortable with these changes at this moment. > systemd 241 broke salt. Upload 2018.3.4+dfsg1-4 fixes that. There were > no bug report opened for it, but it would be worth one RC bug. Ack. > The newly opened RC bug #928337 was fixed in 2018.3.4+dfsg1-5. Ack. So, all in all, I don't want to unblock the new upstream with your packaging, we're too late in the cycle and the version really doesn't match the freeze policy. However, I am offering you an upload based on the version currently in buster via t-p-u. If you go that route, please only fix bugs 919849, 928337, 922352, 924763, the LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849 without switching your build to sphinxdoc, that isn't appropriate at this moment. You can remove the moreinfo tag when you either have a debdiff ready, or if your confident, uploaded to buster. Paul signature.asc Description: OpenPGP digital signature
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Control: tags -1 - moreinfo
Hi,
Am Donnerstag, den 02.05.2019, 21:05 +0200 schrieb Paul Gevers:
> Control: tags -1 moreinfo
>
> Hi Benjamin,
>
> On Thu, 18 Apr 2019 13:01:31 +0200 Benjamin Drung
> wrote:
> > This version fixes the test_xen_virtual test case (bug #922352) and
> > exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763).
> > Our
> > salt 2018.3.3+dfsg1-1 package introduced a big patch to use
> > python3-tornado4 (instead of python3-tornado) due to missing
> > support for
> > tornado version 5. Without the fix for #924763,
> > zmq.eventloop.ioloop
> > will import tornado version 5 (if python3-tornado is installed).
>
> Both bugs have severity normal. Do you really want to bother now or
> is the severity not correct (then please fix that and elaborate)?
Bug #922352 can cause a build failure (and does on Ubuntu). Therefore I
raised it to serious.
Determining the severity of bug #924763 is more complicated. The
reporter stumbled over a warning spit out by salt. The warning message
by itself is more or less harmless, but the underlying problem of the
wrong import might have bad effects. I haven't seen any yet, but they
might be there. IMO we shouldn't release salt with an issue introduced
by one of our patches.
> > I also included fix-various-spelling-mistakes.patch which fixes
> > several
> > spelling mistakes. Because this patch file is long, I excluded it
> > from the
> > attached debdiff.
>
> Bugs can be introduced that way. I am not going to review that diff,
> fixing spelling mistakes at this moment isn't appropriate unless
> these mistakes are crucial somewhere.
I can drop that patch again when this is the only blocker for getting
the unblock request accepted.
> > This version also switches from the a pre-release git snapshot to
> > the
> > official 2018.3.4 release. The only difference between this
> > snapshot and
> > the release are two commits ("Fix ssh on Windows" and "Update url
> > to
> > libsodium for mac builds") and that the release tarball ships less
> > files
> > than what can be found in git.
>
> If that was all (salt/modules/ssh.py and
> tests/integration/modules/test_ssh.py), I could except it. But with
> less files, there is also a changes that ...
All previous upstream releases like 2017.7.3, 2017.7.2, and so on did
not contain these additional files that the git snapshot
2018.3.4~git20180207 contained. All these additional, auxiliary files
are not needed for the installation. I should have used the upstream
method to create the release tarball instead of using "git archive"
when creating the 2018.3.4~git20180207 tarball.
> > For that reason, the attached debdiff is created with this command:
> >
> > debdiff --exclude fix-various-spelling-mistakes.patch
> > salt_2018.3.4~git20180207+dfsg1-1.dsc salt_2018.3.4+dfsg1-2.dsc |
> > filterdiff -i '*/debian/*' -i '*/tests/*/test_ssh.py' -i
> > '*/salt/modules/ssh.py' -i '*/pkg/osx/build_env.sh' >
> > salt_2018.3.4+dfsg1-2.debdiff
> >
> > Alternatively this more simple git diff command could be used:
> >
> > git diff --diff-filter=ACM
> > debian/2018.3.4_git20180207+dfsg1-1..debian/2018.3.4+dfsg1-2
> >
> > You can also look at all the individual commits on salsa:
> > https://salsa.debian.org/salt-team/salt/compare/debian%2F2018.3.4_git20180207+dfsg1-1...debian%2F2018.3.4+dfsg1-2
> >
> > All 7575 unittest succeeded and I successfully tested this new salt
> > version on Debian unstable with our production environment setup
> > (running the highstate on a salt minion connected to the salt
> > master).
> >
> > unblock salt/2018.3.4+dfsg1-2
>
> You didn't even elaborate on all the (at this phase of the release
> inappropriate) changes to the packaging. There is even a newer
> version
> than the one you already mention in a follow up in this bug.
Which changes to the packaging do you refer to?
Running the tests with LC_ALL=C.UTF-8 fixes a build failure in case the
building machine uses an ANSII locale, which would be worth another RC
bug report.
Upload 2018.3.4+dfsg1-3 repairs the documentation in salt-doc. It
ensures that the pre-built minified Javascript and CSS files are not
leaked into the salt-doc binary package and that all created symlink
are correct. Before this version, salt-doc contained broken symlinks
and the search did not work.
systemd 241 broke salt. Upload 2018.3.4+dfsg1-4 fixes that. There were
no bug report opened for it, but it would be worth one RC bug.
The newly opened RC bug #928337 was fixed in 2018.3.4+dfsg1-5.
--
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
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Control: tags -1 moreinfo
Hi Benjamin,
On Thu, 18 Apr 2019 13:01:31 +0200 Benjamin Drung
wrote:
> This version fixes the test_xen_virtual test case (bug #922352) and
> exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763). Our
> salt 2018.3.3+dfsg1-1 package introduced a big patch to use
> python3-tornado4 (instead of python3-tornado) due to missing support for
> tornado version 5. Without the fix for #924763, zmq.eventloop.ioloop
> will import tornado version 5 (if python3-tornado is installed).
Both bugs have severity normal. Do you really want to bother now or is
the severity not correct (then please fix that and elaborate)?
> I also included fix-various-spelling-mistakes.patch which fixes several
> spelling mistakes. Because this patch file is long, I excluded it from the
> attached debdiff.
Bugs can be introduced that way. I am not going to review that diff,
fixing spelling mistakes at this moment isn't appropriate unless these
mistakes are crucial somewhere.
> This version also switches from the a pre-release git snapshot to the
> official 2018.3.4 release. The only difference between this snapshot and
> the release are two commits ("Fix ssh on Windows" and "Update url to
> libsodium for mac builds") and that the release tarball ships less files
> than what can be found in git.
If that was all (salt/modules/ssh.py and
tests/integration/modules/test_ssh.py), I could except it. But with less
files, there is also a changes that ...
> For that reason, the attached debdiff is created with this command:
>
> debdiff --exclude fix-various-spelling-mistakes.patch
> salt_2018.3.4~git20180207+dfsg1-1.dsc salt_2018.3.4+dfsg1-2.dsc |
> filterdiff -i '*/debian/*' -i '*/tests/*/test_ssh.py' -i
> '*/salt/modules/ssh.py' -i '*/pkg/osx/build_env.sh' >
> salt_2018.3.4+dfsg1-2.debdiff
>
> Alternatively this more simple git diff command could be used:
>
> git diff --diff-filter=ACM
> debian/2018.3.4_git20180207+dfsg1-1..debian/2018.3.4+dfsg1-2
>
> You can also look at all the individual commits on salsa:
> https://salsa.debian.org/salt-team/salt/compare/debian%2F2018.3.4_git20180207+dfsg1-1...debian%2F2018.3.4+dfsg1-2
>
> All 7575 unittest succeeded and I successfully tested this new salt
> version on Debian unstable with our production environment setup
> (running the highstate on a salt minion connected to the salt master).
>
> unblock salt/2018.3.4+dfsg1-2
You didn't even elaborate on all the (at this phase of the release
inappropriate) changes to the packaging. There is even a newer version
than the one you already mention in a follow up in this bug.
I am not going to unblock this package, and seen the amount of time your
request stayed open and the proposed changes, I don't think my
colleagues are tempted either. I see that salt is marked for
autoremoval. I suggest you aim for a targeted fix.
Paul
signature.asc
Description: OpenPGP digital signature
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
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.0 +0200
+++ salt-2018.3.4+dfsg1/debian/changelog 2019-04-26 16:38:39.0 +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 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 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.0 +0200
+++ salt-2018.3.4+dfsg1/debian/control 2019-04-25 17:08:50.0 +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.0 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch 2019-04-25 17:09:29.0 +0200
@@ -0,0 +1,27 @@
+From 5c3036d248c4ae76d2fa7598cde179294aa4b2bb Mon Sep 17 00:00:00 2001
+From: Steffen Kockel
+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 @@
+
+
+
+-
++
+
+ {%- block relbar1 %}{{ relbar() }}{% endblock %}
+
+--
+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.0 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch 2019-04-25 17:09:29.0 +0200
@@ -0,0 +1,52 @@
+From e22e49d974937ed9107cf33c679799c914f2 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung
Bug#927348: unblock: salt/2018.3.4+dfsg1-2
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package salt
This version fixes the test_xen_virtual test case (bug #922352) and
exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763). Our
salt 2018.3.3+dfsg1-1 package introduced a big patch to use
python3-tornado4 (instead of python3-tornado) due to missing support for
tornado version 5. Without the fix for #924763, zmq.eventloop.ioloop
will import tornado version 5 (if python3-tornado is installed).
I also included fix-various-spelling-mistakes.patch which fixes several
spelling mistakes. Because this patch file is long, I excluded it from the
attached debdiff.
This version also switches from the a pre-release git snapshot to the
official 2018.3.4 release. The only difference between this snapshot and
the release are two commits ("Fix ssh on Windows" and "Update url to
libsodium for mac builds") and that the release tarball ships less files
than what can be found in git.
For that reason, the attached debdiff is created with this command:
debdiff --exclude fix-various-spelling-mistakes.patch
salt_2018.3.4~git20180207+dfsg1-1.dsc salt_2018.3.4+dfsg1-2.dsc |
filterdiff -i '*/debian/*' -i '*/tests/*/test_ssh.py' -i
'*/salt/modules/ssh.py' -i '*/pkg/osx/build_env.sh' >
salt_2018.3.4+dfsg1-2.debdiff
Alternatively this more simple git diff command could be used:
git diff --diff-filter=ACM
debian/2018.3.4_git20180207+dfsg1-1..debian/2018.3.4+dfsg1-2
You can also look at all the individual commits on salsa:
https://salsa.debian.org/salt-team/salt/compare/debian%2F2018.3.4_git20180207+dfsg1-1...debian%2F2018.3.4+dfsg1-2
All 7575 unittest succeeded and I successfully tested this new salt
version on Debian unstable with our production environment setup
(running the highstate on a salt minion connected to the salt master).
unblock salt/2018.3.4+dfsg1-2
-- System Information:
Debian Release: buster/sid
APT prefers disco
APT policy: (500, 'disco')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.0.0-13-generic (SMP w/12 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru --exclude fix-various-spelling-mistakes.patch
salt-2018.3.4~git20180207+dfsg1/debian/changelog
salt-2018.3.4+dfsg1/debian/changelog
--- salt-2018.3.4~git20180207+dfsg1/debian/changelog2019-02-08
17:05:57.0 +0100
+++ salt-2018.3.4+dfsg1/debian/changelog2019-04-17 20:26:11.0
+0200
@@ -1,3 +1,23 @@
+salt (2018.3.4+dfsg1-2) unstable; urgency=medium
+
+ * Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
+ * Expose tornado4 as tornado for zmq.eventloop.ioloop (Closes: #924763)
+
+ -- Benjamin Drung Wed, 17 Apr 2019 20:26:11
+0200
+
+salt (2018.3.4+dfsg1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Refresh patches
+ * Fix various spelling mistakes
+ * Drop NOTICE from salt-common (the upstream tarball does not contain it)
+ * Skip SampleConfTest and ExtendTestCase if the required sample conf or
+templates directories are missing
+ * Run tests with LC_ALL=C.UTF-8
+ * Remove unused minified documentation CSS files
+
+ -- Benjamin Drung Fri, 05 Apr 2019 13:58:40
+0200
+
salt (2018.3.4~git20180207+dfsg1-1) unstable; urgency=medium
* New upstream pre-release snapshot.
diff -Nru --exclude fix-various-spelling-mistakes.patch
salt-2018.3.4~git20180207+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
salt-2018.3.4+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
---
salt-2018.3.4~git20180207+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
1970-01-01 01:00:00.0 +0100
+++
salt-2018.3.4+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
2019-04-03 16:36:21.0 +0200
@@ -0,0 +1,97 @@
+From 0473683aceaba9a975fc28f72ff80e8ab12dea2d Mon Sep 17 00:00:00 2001
+From: Benjamin Drung
+Date: Wed, 3 Apr 2019 14:50:12 +0200
+Subject: [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%]
+--
+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 d
