From 1f9004af08c18a516012410e0eda0e44580d90ae Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Mon, 30 Sep 2024 16:26:21 +0000
Subject: [PATCH] import CS python-jwcrypto-1.5.6-2.el9

---
 .gitignore                                    |  2 +-
 .python-jwcrypto.metadata                     |  2 +-
 .../0001-ignore-deprecated-annotation.patch   | 40 +++++++++++++++++++
 SPECS/python-jwcrypto.spec                    | 29 ++++++++++++--
 4 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 SOURCES/0001-ignore-deprecated-annotation.patch

diff --git a/.gitignore b/.gitignore
index 8fe4afb..9af756a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jwcrypto-0.8.tar.gz
+SOURCES/jwcrypto-1.5.6.tar.gz
diff --git a/.python-jwcrypto.metadata b/.python-jwcrypto.metadata
index a1371f7..2311a93 100644
--- a/.python-jwcrypto.metadata
+++ b/.python-jwcrypto.metadata
@@ -1 +1 @@
-038ee5faf896548477c0b57c3cacb92add36e550 SOURCES/jwcrypto-0.8.tar.gz
+e3fdb8f42c60e947cbe58346d086850d915a2b60 SOURCES/jwcrypto-1.5.6.tar.gz
diff --git a/SOURCES/0001-ignore-deprecated-annotation.patch b/SOURCES/0001-ignore-deprecated-annotation.patch
new file mode 100644
index 0000000..60c2dfb
--- /dev/null
+++ b/SOURCES/0001-ignore-deprecated-annotation.patch
@@ -0,0 +1,40 @@
+diff -Naur jwcrypto-1.5.6/jwcrypto/jwk.py jwcrypto-1.5.6-new/jwcrypto/jwk.py
+--- jwcrypto-1.5.6/jwcrypto/jwk.py	2024-02-07 13:52:39.000000000 -0300
++++ jwcrypto-1.5.6-new/jwcrypto/jwk.py	2024-06-12 13:06:28.553972422 -0300
+@@ -11,7 +11,15 @@
+ from cryptography.hazmat.primitives.asymmetric import ec
+ from cryptography.hazmat.primitives.asymmetric import rsa
+ 
+-from typing_extensions import deprecated
++try:
++    from typing_extensions import deprecated
++except ImportError:
++    def deprecated(_fn, *args):
++        def inner(func):
++            return func
++
++        return inner
++
+ 
+ from jwcrypto.common import JWException
+ from jwcrypto.common import base64url_decode, base64url_encode
+diff -Naur jwcrypto-1.5.6/jwcrypto/jwt.py jwcrypto-1.5.6-new/jwcrypto/jwt.py
+--- jwcrypto-1.5.6/jwcrypto/jwt.py	2024-02-07 13:52:39.000000000 -0300
++++ jwcrypto-1.5.6-new/jwcrypto/jwt.py	2024-06-12 13:26:48.534696766 -0300
+@@ -4,7 +4,15 @@
+ import time
+ import uuid
+ 
+-from typing_extensions import deprecated
++try:
++    from typing_extensions import deprecated
++except ImportError:
++    def deprecated(*args):
++        def inner(func):
++            return func
++
++        return inner
++
+ 
+ from jwcrypto.common import JWException, JWKeyNotFound
+ from jwcrypto.common import json_decode, json_encode
diff --git a/SPECS/python-jwcrypto.spec b/SPECS/python-jwcrypto.spec
index b02b74e..f3a26bc 100644
--- a/SPECS/python-jwcrypto.spec
+++ b/SPECS/python-jwcrypto.spec
@@ -12,17 +12,22 @@
 %bcond_without python2
 %endif
 
+# Disable auto-generation of python dependencies.
+%{?python_disable_dependency_generator}
+
 %global srcname jwcrypto
 
 Name:           python-%{srcname}
-Version:        0.8
-Release:        4%{?dist}
+Version:        1.5.6
+Release:        2%{?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
+
 BuildArch:      noarch
 %if 0%{?with_python2}
 BuildRequires:  python2-devel
@@ -34,7 +39,7 @@ BuildRequires:  python2-pytest
 %if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-cryptography >= 1.5
+BuildRequires:  python%{python3_pkgversion}-cryptography >= 2.3
 BuildRequires:  python%{python3_pkgversion}-pytest
 %endif
 
@@ -56,7 +61,7 @@ Implements JWK, JWS, JWE specifications using python-cryptography
 %if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
-Requires:       python%{python3_pkgversion}-cryptography >= 1.5
+Requires:       python%{python3_pkgversion}-cryptography >= 2.3
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
 %description -n python%{python3_pkgversion}-%{srcname}
@@ -67,6 +72,10 @@ Implements JWK, JWS, JWE specifications using python-cryptography
 %prep
 %setup -q -n %{srcname}-%{version}
 
+for p in %patches; do
+    %__patch -p1 -i $p
+done
+
 
 %build
 %if 0%{?with_python2}
@@ -122,6 +131,18 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 
 
 %changelog
+* Fri Aug 09 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-2
+- Disable auto-generation of dependencies
+  Related: RHEL-34809
+
+* Tue Jun 18 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-1
+- Rebase to version 1.5.6
+  Resolve: RHEL-34809
+
+* Thu Apr 04 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.8-5
+- Address potential DoS with high compression ratio
+  Resolves: RHEL-28698
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688