[arch-commits] Commit in httpbin/trunk (PKGBUILD httpbin-werkzeug-2.0.0.patch)

[Evangelos Foutras]

    Date: Tuesday, December 7, 2021 @ 01:17:34
  Author: foutrelis
Revision: 1065424

Add fix for werkzeug 2.0.0

Added:
  httpbin/trunk/httpbin-werkzeug-2.0.0.patch
Modified:
  httpbin/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   12 ++++++++----
 httpbin-werkzeug-2.0.0.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-06 23:42:16 UTC (rev 1065423)
+++ PKGBUILD	2021-12-07 01:17:34 UTC (rev 1065424)
@@ -12,13 +12,17 @@
          'python-blinker')
 makedepends=('python-setuptools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/requests/httpbin/archive/v$pkgver.tar.gz"
-        httpbin-werkzeug-0.15.1.patch)
+        httpbin-werkzeug-0.15.1.patch
+        httpbin-werkzeug-2.0.0.patch)
 sha512sums=('faec48a0a2ac8800293b10281966a28195884ad2f69f0f28f1b8c8e1a7bfd8933ebbc9b541c80cdc19e1031a8ba9383afe8e372b9044436cb307dd1e8eddaae7'
-            '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf')
+            '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf'
+            '25aced8dc34ed517ba7304d86d7e32fc49282262512962edf743265c78f3c5a2e3324902ec76ea121c11a9af0219d8c4e506ce301ad625d9e72f07491b8cbe49')
 
 prepare() {
-  patch -d httpbin-$pkgver -p1 -i ../httpbin-werkzeug-0.15.1.patch
-  sed -i 's/brotlipy/Brotli/g' httpbin-$pkgver/setup.py
+  cd httpbin-$pkgver
+  patch -p1 -i ../httpbin-werkzeug-0.15.1.patch
+  patch -p1 -i ../httpbin-werkzeug-2.0.0.patch
+  sed -i 's/brotlipy/Brotli/g' setup.py
 }
 
 build() {

Added: httpbin-werkzeug-2.0.0.patch
===================================================================
--- httpbin-werkzeug-2.0.0.patch	                        (rev 0)
+++ httpbin-werkzeug-2.0.0.patch	2021-12-07 01:17:34 UTC (rev 1065424)
@@ -0,0 +1,32 @@
+From ccd417eea8d13192ea980539e1a4bbe31206c802 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Mon, 19 Jul 2021 15:41:23 -0700
+Subject: [PATCH] Fix disabling of location header autocorrect for werkzeug 2+
+ (#647)
+
+In werkzeug 2.0.0 and later, the Location header autocorrection
+moved from BaseResponse to Response, so we need to set
+`autocorrect_location_header = False` in `Response` not
+`BaseResponse`. For now let's just set it in both to be safe,
+this doesn't cause any errors at least with 1.0.1 and 2.0.1.
+
+Signed-off-by: Adam Williamson <awilliam at redhat.com>
+---
+ httpbin/core.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/httpbin/core.py b/httpbin/core.py
+index 305c9882..3726e21f 100644
+--- a/httpbin/core.py
++++ b/httpbin/core.py
+@@ -77,7 +77,10 @@ def jsonify(*args, **kwargs):
+ 
+ 
+ # Prevent WSGI from correcting the casing of the Location header
++# and forcing it to be absolute. This moved from BaseResponse to
++# Response in werkzeug 2.0.0, so we set both to be safe.
+ BaseResponse.autocorrect_location_header = False
++Response.autocorrect_location_header = False
+ 
+ # Find the correct template folder when running from a different location
+ tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")