Compare commits

...

No commits in common. "c8s-stream-DL1" and "c9s" have entirely different histories.

7 changed files with 177 additions and 28 deletions

16
.gitignore vendored
View File

@ -1 +1,15 @@
SOURCES/jwcrypto-0.5.0.tar.gz
/jwcrypto-0.2.0.tar.gz
/jwcrypto-0.2.1.tar.gz
/jwcrypto-0.3.0.tar.gz
/jwcrypto-0.3.1.tar.gz
/jwcrypto-0.3.2.tar.gz
/jwcrypto-0.4.1.tar.gz
/jwcrypto-0.4.2.tar.gz
/jwcrypto-0.5.0.tar.gz
/jwcrypto-0.6.0.tar.gz
/jwcrypto-0.8.tar.gz
/jwcrypto-0.9.1.tar.gz
/jwcrypto-1.4.tar.gz
/jwcrypto-1.4.1.tar.gz
/jwcrypto-1.4.2.tar.gz
/jwcrypto-1.5.6.tar.gz

View File

@ -1 +0,0 @@
8eccc6fbeeee2fedc602998a7c7a97b8bd550e59 SOURCES/jwcrypto-0.5.0.tar.gz

View File

@ -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

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
# recipients: abokovoy, frenaud, kaleem, ftrivino, cheimes
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -5,7 +5,7 @@
%bcond_with python3
%endif
%if 0%{?rhel} > 7
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
# Disable python2 build by default
%bcond_with python2
%else
@ -15,32 +15,36 @@
%global srcname jwcrypto
Name: python-%{srcname}
Version: 0.5.0
Release: 1.1%{?dist}
Version: 1.5.6
Release: %autorelease
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
Patch1: 0001-ignore-deprecated-annotation.patch
BuildArch: noarch
%if %{with python2}
%if 0%{?with_python2}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-cryptography >= 1.5
BuildRequires: python2-pytest
%endif
%if %{with python3}
%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
%description
Implements JWK, JWS, JWE specifications using python-cryptography
%if %{with python2}
%if 0%{?with_python2}
%package -n python2-%{srcname}
Summary: Implements JWK,JWS,JWE specifications using python-cryptography
Requires: python2-cryptography >= 1.5
@ -50,7 +54,8 @@ Requires: python2-cryptography >= 1.5
Implements JWK, JWS, JWE specifications using python-cryptography
%endif
%if %{with python3}
%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
@ -64,39 +69,45 @@ Implements JWK, JWS, JWE specifications using python-cryptography
%prep
%setup -q -n %{srcname}-%{version}
%autopatch -p 1
%build
%if %{with python2}
%if 0%{?with_python2}
%py2_build
%endif
%if %{with python3}
%if 0%{?with_python3}
%py3_build
%endif
%check
%if %{with python2}
%if 0%{?with_python2}
%{__python2} -bb -m pytest %{srcname}/test*.py
%endif
%if %{with python3}
%if 0%{?with_python3}
%{__python3} -bb -m pytest %{srcname}/test*.py
%endif
%install
%if %{with python2}
%if 0%{?with_python2}
%py2_install
%endif
%if 0%{?with_python3}
%py3_install
%endif
rm -rf %{buildroot}%{_docdir}/%{srcname}
%if 0%{?with_python2}
rm -rf %{buildroot}%{python2_sitelib}/%{srcname}/tests{,-cookbook}.py*
%endif
%if %{with python3}
%py3_install
%if 0%{?with_python3}
rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/tests{,-cookbook}.py*
rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*.py*
%endif
rm -rf %{buildroot}/usr/share/doc/jwcrypto
%if %{with python2}
%if 0%{?with_python2}
%files -n python2-%{srcname}
%doc README.md
%license LICENSE
@ -104,7 +115,7 @@ rm -rf %{buildroot}/usr/share/doc/jwcrypto
%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
%endif
%if %{with python3}
%if 0%{?with_python3}
%files -n python%{python3_pkgversion}-%{srcname}
%doc README.md
%license LICENSE
@ -114,18 +125,69 @@ rm -rf %{buildroot}/usr/share/doc/jwcrypto
%changelog
* Fri Jun 17 2022 Christian Heimes <cheimes@redhat.com> - 0.5.0-1.1
- Bump dist to solve version sorting issue, fixes RHBZ#2097800
* Tue Jun 18 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-1
- Rebase to version 1.5.6
Resolve: RHEL-34809
* Thu Jun 28 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
* 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
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 01 2020 Simo Sorce <simo@redhat.com> - 0.8-1
- Sync with upstream release 0.8
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-8
- Rebuilt for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-6
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Thu Aug 29 2019 Christian Heimes <cheimes@redhat.com> - 0.6.0-5
- Remove Python 2 subpackages from F32+
- Resolves: RHBZ #1746760
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 05 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-1
- New upstream release 0.6.0
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-2
- Rebuilt for Python 3.7
* Wed Jun 27 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
- New upstream release 0.5.0
- Fixes Coverity scan issue
* Mon Apr 16 2018 Christian Heimes <cheimes@redhat.com> - 0.4.2-5
- Drop Python 2 subpackages from RHEL 8, fixes RHBZ#1567152
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-5
- Rebuilt for Python 3.7
* Thu Nov 23 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-4
- Build Python 3 package on RHEL > 7, fixes RHBZ#1516813
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-3
- Run tests with bytes warning

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (jwcrypto-1.5.6.tar.gz) = 1db62cf247bc006f1737c4603b80e5ca87e1a3db3b3dc37183a9725a8b3cae4baba706b2ec596119877130ab4d56525a01fb9d7efca07e59811d78021aa7ebf5

26
tests/tests.yml Normal file
View File

@ -0,0 +1,26 @@
---
- hosts: localhost
tags:
- classic
pre_tasks:
- name: Enable CRB for python3-pytest on 1minutetip
ini_file:
path: /etc/yum.repos.d/rhel.repo
section: rhel-CRB
option: enabled
value: "1"
create: no
ignore_errors: yes
roles:
- role: standard-test-source
- role: standard-test-basic
required_packages:
- python3-jwcrypto
- python3-pytest
tests:
- unittests:
dir: "source"
# remove jwcrypto Python files to run tests with packages code
run: >-
rm -rf jwcrypto/j*.py jwcrypto/__init__.py jwcrypto/__pycache__ &&
python3 -m pytest jwcrypto/test*.py