From 54d9ae1428dfd46b7087c99766366d2c6d8d751d Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 24 Aug 2026 09:35:02 -0400
Subject: [PATCH] import CS python-jwcrypto-1.5.8-1.el9

---
 .gitignore                                    |  2 +-
 .python-jwcrypto.metadata                     |  2 +-
 ...nsafe-skip-rsa-key-validation-compat.patch | 40 +++++++++++++++++++
 SPECS/python-jwcrypto.spec                    | 25 ++++++++----
 4 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 SOURCES/0002-handle-unsafe-skip-rsa-key-validation-compat.patch

diff --git a/.gitignore b/.gitignore
index 9af756a..1d1c763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jwcrypto-1.5.6.tar.gz
+SOURCES/jwcrypto-1.5.8.tar.gz
diff --git a/.python-jwcrypto.metadata b/.python-jwcrypto.metadata
index 2311a93..ec7fc6b 100644
--- a/.python-jwcrypto.metadata
+++ b/.python-jwcrypto.metadata
@@ -1 +1 @@
-e3fdb8f42c60e947cbe58346d086850d915a2b60 SOURCES/jwcrypto-1.5.6.tar.gz
+e2d079a2269aa24d585762c4a201ca5382c75c67 SOURCES/jwcrypto-1.5.8.tar.gz
diff --git a/SOURCES/0002-handle-unsafe-skip-rsa-key-validation-compat.patch b/SOURCES/0002-handle-unsafe-skip-rsa-key-validation-compat.patch
new file mode 100644
index 0000000..047a65f
--- /dev/null
+++ b/SOURCES/0002-handle-unsafe-skip-rsa-key-validation-compat.patch
@@ -0,0 +1,40 @@
+--- jwcrypto-1.5.7/jwcrypto/jwk.py	2026-06-03 13:07:15
++++ jwcrypto-1.5.7-new/jwcrypto/jwk.py	2026-06-23 00:49:09
+@@ -839,9 +839,14 @@
+     def _rsa_pri(self):
+         k = self._cache_pri_k
+         if k is None:
+-            u = self.unsafe_skip_rsa_key_validation
+-            k = self._rsa_pri_n().private_key(default_backend(),
+-                                              unsafe_skip_rsa_key_validation=u)
++            try:
++                u = self.unsafe_skip_rsa_key_validation
++                k = self._rsa_pri_n().private_key(
++                    default_backend(),
++                    unsafe_skip_rsa_key_validation=u)
++            except TypeError:
++                k = self._rsa_pri_n().private_key(
++                    default_backend())
+             self._cache_pri_k = k
+         return k
+ 
+@@ -997,10 +1002,15 @@
+         """
+ 
+         try:
+-            u = self.unsafe_skip_rsa_key_validation
+-            key = serialization.load_pem_private_key(
+-                data, password=password, backend=default_backend(),
+-                unsafe_skip_rsa_key_validation=u)
++            try:
++                u = self.unsafe_skip_rsa_key_validation
++                key = serialization.load_pem_private_key(
++                    data, password=password, backend=default_backend(),
++                    unsafe_skip_rsa_key_validation=u)
++            except TypeError:
++                key = serialization.load_pem_private_key(
++                    data, password=password,
++                    backend=default_backend())
+         except ValueError as e:
+             if password is not None:
+                 raise e
diff --git a/SPECS/python-jwcrypto.spec b/SPECS/python-jwcrypto.spec
index f3a26bc..3ec8769 100644
--- a/SPECS/python-jwcrypto.spec
+++ b/SPECS/python-jwcrypto.spec
@@ -18,15 +18,16 @@
 %global srcname jwcrypto
 
 Name:           python-%{srcname}
-Version:        1.5.6
-Release:        2%{?dist}
+Version:        1.5.8
+Release:        1%{?dist}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
 
 License:        LGPLv3+
 URL:            https://github.com/latchset/%{srcname}
 Source0:        https://github.com/latchset/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
 
-Patch0001:         0001-ignore-deprecated-annotation.patch
+Patch1:         0001-ignore-deprecated-annotation.patch
+Patch2:         0002-handle-unsafe-skip-rsa-key-validation-compat.patch
 
 BuildArch:      noarch
 %if 0%{?with_python2}
@@ -71,10 +72,8 @@ Implements JWK, JWS, JWE specifications using python-cryptography
 
 %prep
 %setup -q -n %{srcname}-%{version}
-
-for p in %patches; do
-    %__patch -p1 -i $p
-done
+%patch -P 1 -p 1
+%patch -P 2 -p 1
 
 
 %build
@@ -131,6 +130,18 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 
 
 %changelog
+* Thu Jun 25 2026 Rafael Jeffman <rjeffman@redhat.com> - 1.5.8-1
+- Rebase to 1.5.8
+  Resolves: RHEL-168728
+
+* Tue Jun 23 2026 Rafael Jeffman <rjeffman@redhat.com> - 1.5.7-1
+- Rebase to 1.5.7
+  Resolves: RHEL-168728
+
+* Tue Apr 14 2026 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-3
+- Limit max plaintext size for JWE decompression
+  Resolves: RHEL-166029
+
 * Fri Aug 09 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-2
 - Disable auto-generation of dependencies
   Related: RHEL-34809