diff --git a/srcpkgs/python3-httpbin/patches/brotli.patch b/srcpkgs/python3-httpbin/patches/brotli.patch index 534164cc508..b8468ee5af3 100644 --- a/srcpkgs/python3-httpbin/patches/brotli.patch +++ b/srcpkgs/python3-httpbin/patches/brotli.patch @@ -1,6 +1,19 @@ -diff -ur python3-httpbin-0.10.1.orig/httpbin/filters.py python3-httpbin-0.10.1/httpbin/filters.py ---- python3-httpbin-0.10.1.orig/httpbin/filters.py 2023-10-17 08:12:56.814139485 -0400 -+++ python3-httpbin-0.10.1/httpbin/filters.py 2023-10-17 08:14:20.979514500 -0400 +https://github.com/psf/httpbin/pull/31 + +From 7ab2459cbca7cf2266e275ecbff80533f52f4f58 Mon Sep 17 00:00:00 2001 +From: "Andrew J. Hesford" +Date: Tue, 17 Oct 2023 09:09:18 -0400 +Subject: [PATCH] Use brotli with CPython, brotlicffi elsewhere + +--- + httpbin/filters.py | 5 ++++- + pyproject.toml | 3 ++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/httpbin/filters.py b/httpbin/filters.py +index 4deeaaad..933a8b96 100644 +--- a/httpbin/filters.py ++++ b/httpbin/filters.py @@ -10,7 +10,10 @@ import gzip as gzip2 import zlib @@ -13,16 +26,17 @@ diff -ur python3-httpbin-0.10.1.orig/httpbin/filters.py python3-httpbin-0.10.1/h from six import BytesIO from decimal import Decimal -diff -ur python3-httpbin-0.10.1.orig/pyproject.toml python3-httpbin-0.10.1/pyproject.toml ---- python3-httpbin-0.10.1.orig/pyproject.toml 2023-10-17 08:12:56.816139494 -0400 -+++ python3-httpbin-0.10.1/pyproject.toml 2023-10-17 08:13:46.165359377 -0400 -@@ -32,7 +32,8 @@ +diff --git a/pyproject.toml b/pyproject.toml +index c5bdb811..f0aaf871 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -31,7 +31,8 @@ classifiers = [ + "Programming Language :: Python :: 3.12", ] dependencies = [ - "Flask", - "brotlicffi", + "brotli; platform_python_implementation == 'CPython'", + "brotlicffi; platform_python_implementation != 'CPython'", "decorator", "flasgger", - 'greenlet < 3.0; python_version<"3.12"', + "flask >= 2.2.4", diff --git a/srcpkgs/python3-httpbin/patches/flask-3.0.patch b/srcpkgs/python3-httpbin/patches/flask-3.0.patch deleted file mode 100644 index 70b98e89141..00000000000 --- a/srcpkgs/python3-httpbin/patches/flask-3.0.patch +++ /dev/null @@ -1,110 +0,0 @@ -From c1d9e33049263fed3cb27806a97f094acc350905 Mon Sep 17 00:00:00 2001 -From: Nate Prewitt -Date: Thu, 12 Oct 2023 08:30:42 -0700 -Subject: [PATCH] Support Flask 3.0 (#29) - ---- - httpbin/core.py | 8 +++----- - httpbin/helpers.py | 21 ++++++++++++++++----- - pyproject.toml | 3 +-- - 3 files changed, 20 insertions(+), 12 deletions(-) - -diff --git a/httpbin/core.py b/httpbin/core.py -index 5c1783a1..a82c1b88 100644 ---- a/httpbin/core.py -+++ b/httpbin/core.py -@@ -32,7 +32,7 @@ - from werkzeug.wrappers import Response - except ImportError: # werkzeug < 2.1 - from werkzeug.wrappers import BaseResponse as Response --from werkzeug.http import parse_authorization_header -+ - from flasgger import Swagger, NO_SANITIZER - - from . import filters -@@ -47,6 +47,7 @@ - H, - ROBOT_TXT, - ANGRY_ASCII, -+ parse_authorization_header, - parse_multi_value_header, - next_stale_after_value, - digest_challenge_response, -@@ -636,16 +637,13 @@ def redirect_to(): - args_dict = request.args.items() - args = CaseInsensitiveDict(args_dict) - -- # We need to build the response manually and convert to UTF-8 to prevent -- # werkzeug from "fixing" the URL. This endpoint should set the Location -- # header to the exact string supplied. - response = app.make_response("") - response.status_code = 302 - if "status_code" in args: - status_code = int(args["status_code"]) - if status_code >= 300 and status_code < 400: - response.status_code = status_code -- response.headers["Location"] = args["url"].encode("utf-8") -+ response.headers["Location"] = args["url"] - - return response - -diff --git a/httpbin/helpers.py b/httpbin/helpers.py -index b29e1835..836c8026 100644 ---- a/httpbin/helpers.py -+++ b/httpbin/helpers.py -@@ -13,8 +13,14 @@ - import time - import os - from hashlib import md5, sha256, sha512 --from werkzeug.http import parse_authorization_header - from werkzeug.datastructures import WWWAuthenticate -+from werkzeug.http import dump_header -+ -+try: -+ from werkzeug.http import parse_authorization_header -+except ImportError: # werkzeug < 2.3 -+ from werkzeug.datastructures import Authorization -+ parse_authorization_header = Authorization.from_header - - from flask import request, make_response - from six.moves.urllib.parse import urlparse, urlunparse -@@ -466,9 +472,14 @@ def digest_challenge_response(app, qop, algorithm, stale = False): - ]), algorithm) - opaque = H(os.urandom(10), algorithm) - -- auth = WWWAuthenticate("digest") -- auth.set_digest('me@kennethreitz.com', nonce, opaque=opaque, -- qop=('auth', 'auth-int') if qop is None else (qop,), algorithm=algorithm) -- auth.stale = stale -+ values = { -+ 'realm': 'me@kennethreitz.com', -+ 'nonce': nonce, -+ 'opaque': opaque, -+ 'qop': dump_header(('auth', 'auth-int') if qop is None else (qop,)), -+ 'algorithm': algorithm, -+ 'stale': stale, -+ } -+ auth = WWWAuthenticate("digest", values=values) - response.headers['WWW-Authenticate'] = auth.to_header() - return response -diff --git a/pyproject.toml b/pyproject.toml -index 020457ec..9454e569 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -31,15 +31,14 @@ classifiers = [ - "Programming Language :: Python :: 3.12", - ] - dependencies = [ -- "Flask", -+ "flask >= 2.2.4", - "brotli; platform_python_implementation == 'CPython'", - "brotlicffi; platform_python_implementation != 'CPython'", - "decorator", - "flasgger", - 'greenlet < 3.0; python_version<"3.12"', - 'greenlet >= 3.0.0a1; python_version>="3.12.0rc0"', - 'importlib-metadata; python_version<"3.8"', -- "werkzeug >= 0.14.1", - "six", - ] - diff --git a/srcpkgs/python3-httpbin/template b/srcpkgs/python3-httpbin/template index 2352d48df5b..757b2a827aa 100644 --- a/srcpkgs/python3-httpbin/template +++ b/srcpkgs/python3-httpbin/template @@ -1,6 +1,6 @@ # Template file for 'python3-httpbin' pkgname=python3-httpbin -version=0.10.1 +version=0.10.2 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -8,11 +8,11 @@ depends="python3-Flask python3-Brotli python3-decorator python3-flasgger python3-greenlet python3-six" checkdepends="python3-pytest $depends" short_desc="HTTP Request & Response Service" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="ISC" homepage="https://github.com/psf/httpbin" distfiles="${PYPI_SITE}/h/httpbin/httpbin-${version}.tar.gz" -checksum=7b8596beb0e75a7b653c39d1f3cf263d6d5c476d29e1df6f7bb2b70bf9f06a3d +checksum=632148698261c8684ea2d2b624cdea845b402b1fe91736e89df886408c6317a9 post_install() { vlicense LICENSE