Bug#991317: unblock: klaus/1.5.2-4

[Adrian Bunk <bunk@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package klaus

  * Fix 500 when authentication is required. Closes: #987951
  (and trivial packaging changes documented in d/changelog)
(changes by Jelmer Vernooij)

One-line fix for basic/digest authentication.

(1.5.2-3 is missing in d/changelog, the changes it originally
 documented were already in 1.5.2-1)

diff -Nru klaus-1.5.2/debian/changelog klaus-1.5.2/debian/changelog
--- klaus-1.5.2/debian/changelog	2020-07-20 01:15:41.000000000 +0300
+++ klaus-1.5.2/debian/changelog	2021-07-11 22:32:42.000000000 +0300
@@ -1,3 +1,19 @@
+klaus (1.5.2-4) unstable; urgency=medium
+
+  * Source-only upload.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 11 Jul 2021 20:32:42 +0100
+
+klaus (1.5.2-2) unstable; urgency=low
+
+  * Set Rules-Requires-Root: no.
+  * Fix field name typo in debian/upstream/metadata (Repository-Browser =>
+    Repository-Browse).
+  * Update watch file format version to 4.
+  * Fix 500 when authentication is required. Closes: #987951
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 05 May 2021 16:38:43 +0100
+
 klaus (1.5.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru klaus-1.5.2/debian/control klaus-1.5.2/debian/control
--- klaus-1.5.2/debian/control	2020-07-20 01:15:41.000000000 +0300
+++ klaus-1.5.2/debian/control	2021-07-11 22:32:42.000000000 +0300
@@ -8,6 +8,7 @@
 Vcs-Git: https://salsa.debian.org/jelmer/klaus.git
 Vcs-Browser: https://salsa.debian.org/jelmer/klaus
 Build-Depends: debhelper-compat (= 12)
+Rules-Requires-Root: no
 
 Package: klaus
 Architecture: all
diff -Nru klaus-1.5.2/debian/patches/01_httpauth klaus-1.5.2/debian/patches/01_httpauth
--- klaus-1.5.2/debian/patches/01_httpauth	2020-07-20 01:15:41.000000000 +0300
+++ klaus-1.5.2/debian/patches/01_httpauth	2021-07-11 22:32:42.000000000 +0300
@@ -3,7 +3,7 @@
 index 0000000..82860d0
 --- /dev/null
 +++ b/klaus/httpauth.py
-@@ -0,0 +1,197 @@
+@@ -0,0 +1,198 @@
 +"""
 +Copyright (c) 2012 Jonas Haag <jonas@lophus.org>. License: ISC
 +
@@ -138,7 +138,8 @@
 +            '401 Authentication Required',
 +            [('WWW-Authenticate', make_www_authenticate_header(self.realm))],
 +        )
-+        return ['<h1>401 - Authentication Required</h1>']
++        html = '<h1>401 - Authentication Required</h1>'
++        return [html if PY2 else html.encode()]
 +
 +
 +class DigestFileHttpAuthMiddleware(BaseHttpAuthMiddleware):
diff -Nru klaus-1.5.2/debian/upstream/metadata klaus-1.5.2/debian/upstream/metadata
--- klaus-1.5.2/debian/upstream/metadata	2020-07-20 01:15:41.000000000 +0300
+++ klaus-1.5.2/debian/upstream/metadata	2021-07-11 22:32:42.000000000 +0300
@@ -2,4 +2,3 @@
 Bug-Submit: https://github.com/jonashaag/klaus/issues/new
 Repository: https://github.com/jonashaag/klaus.git
 Repository-Browse: https://github.com/jonashaag/klaus
-Repository-Browser: https://github.com/jonashaag/klaus
diff -Nru klaus-1.5.2/debian/watch klaus-1.5.2/debian/watch
--- klaus-1.5.2/debian/watch	2020-07-20 01:15:41.000000000 +0300
+++ klaus-1.5.2/debian/watch	2021-07-11 22:32:42.000000000 +0300
@@ -1,2 +1,2 @@
-version=3
-https://pypi.debian.net/klaus/klaus-(.*).tar.gz
+version=4
+https://pypi.debian.net/klaus klaus-(.*).tar.gz