diff --git a/.abf.yml b/.abf.yml index ba52299..5b07534 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - pycryptodomex-3.9.9.tar.gz: 65abfeefe564436aeda4b4bbd6462589ccf750b1 + pycryptodomex-3.15.0.tar.gz: 36dc2965d64e0a6311af2a330a9df6b9aab2a485 diff --git a/python-pycryptodomex-3.7.3-use_external_libtomcrypt.patch b/python-pycryptodomex-3.15.0-use_external_libtomcrypt.patch similarity index 50% rename from python-pycryptodomex-3.7.3-use_external_libtomcrypt.patch rename to python-pycryptodomex-3.15.0-use_external_libtomcrypt.patch index 97bd2e6..69b18c0 100644 --- a/python-pycryptodomex-3.7.3-use_external_libtomcrypt.patch +++ b/python-pycryptodomex-3.15.0-use_external_libtomcrypt.patch @@ -1,40 +1,40 @@ -diff -up ./setup.py.bak ./setup.py ---- ./setup.py.bak 2019-01-19 22:52:55.000000000 +0100 -+++ ./setup.py 2019-02-15 15:29:46.960976879 +0100 -@@ -367,11 +367,13 @@ ext_modules = [ - include_dirs=['src/'], - sources=["src/CAST.c"]), +diff -ruN a/setup.py b/setup.py +--- a/setup.py 2022-06-23 03:21:37.000000000 +0900 ++++ b/setup.py 2022-08-05 16:23:28.451466769 +0900 +@@ -367,13 +367,13 @@ + sources=["src/CAST.c"], + py_limited_api=True), Extension("Crypto.Cipher._raw_des", - include_dirs=['src/', 'src/libtom/'], -- sources=["src/DES.c"]), + include_dirs=['src/'], -+ sources=["src/DES.c"], + sources=["src/DES.c"], +- py_limited_api=True), + extra_link_args=["-ltomcrypt"]), Extension("Crypto.Cipher._raw_des3", - include_dirs=['src/', 'src/libtom/'], -- sources=["src/DES3.c"]), + include_dirs=['src/'], -+ sources=["src/DES3.c"], + sources=["src/DES3.c"], +- py_limited_api=True), + extra_link_args=["-ltomcrypt"]), Extension("Crypto.Util._cpuid_c", include_dirs=['src/'], - sources=['src/cpuid.c']), -@@ -400,8 +402,9 @@ ext_modules = [ - include_dirs=['src/'], - sources=["src/ARC4.c"]), + sources=['src/cpuid.c'], +@@ -415,9 +415,9 @@ + sources=["src/ARC4.c"], + py_limited_api=True), Extension("Crypto.Cipher._Salsa20", - include_dirs=['src/', 'src/libtom/'], -- sources=["src/Salsa20.c"]), + include_dirs=['src/'], -+ sources=["src/Salsa20.c"], + sources=["src/Salsa20.c"], +- py_limited_api=True), + extra_link_args=["-ltomcrypt"]), Extension("Crypto.Cipher._chacha20", include_dirs=['src/'], - sources=["src/chacha20.c"]), -diff -up ./src/DES.c.bak ./src/DES.c ---- ./src/DES.c.bak 2019-01-19 22:52:55.000000000 +0100 -+++ ./src/DES.c 2019-02-15 15:30:27.014967034 +0100 -@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3) + sources=["src/chacha20.c"], +diff -ruN a/src/DES.c b/src/DES.c +--- a/src/DES.c 2022-06-23 03:21:37.000000000 +0900 ++++ b/src/DES.c 2022-08-05 16:11:49.984484561 +0900 +@@ -39,7 +39,7 @@ /* Include the actial DES implementation */ #define LTC_NO_PROTOTYPES diff --git a/python-pycryptodomex-3.7.0-sphinx.patch b/python-pycryptodomex-3.7.0-sphinx.patch index bc83b2c..d8fa98c 100644 --- a/python-pycryptodomex-3.7.0-sphinx.patch +++ b/python-pycryptodomex-3.7.0-sphinx.patch @@ -1,6 +1,6 @@ -diff -up ./Doc/conf.py.bak ./Doc/conf.py ---- ./Doc/conf.py.bak 2018-10-27 23:08:03.000000000 +0200 -+++ ./Doc/conf.py 2018-11-17 15:34:58.392588884 +0100 +diff -up a/Doc/conf.py.bak b/Doc/conf.py +--- a/Doc/conf.py.bak 2018-10-27 23:08:03.000000000 +0200 ++++ b/Doc/conf.py 2018-11-17 15:34:58.392588884 +0100 @@ -20,6 +20,10 @@ print sys.path # Mock existence of native modules from Crypto.Util import _raw_api diff --git a/python-pycryptodomex.spec b/python-pycryptodomex.spec index d0a8e53..efc9be6 100644 --- a/python-pycryptodomex.spec +++ b/python-pycryptodomex.spec @@ -31,10 +31,10 @@ with the PyCrypto library. %global _with_tests 1 Name: python-%{srcname} -Version: 3.9.9 -Release: 1 +Version: 3.15.0 +Release: 1 Summary: A self-contained cryptographic library for Python -Group: Development/Python +Group: Development/Python # PyCrypto-based code is public domain, further PyCryptodome contributions are # BSD @@ -42,7 +42,7 @@ License: BSD and Public Domain URL: http://www.pycryptodome.org/ Source0: https://github.com/Legrandin/pycryptodome/archive/v%{version}/%{srcname}-%{version}.tar.gz # Use external libtomcrypt library -Patch0: %{name}-3.7.3-use_external_libtomcrypt.patch +Patch0: %{name}-3.15.0-use_external_libtomcrypt.patch # Fix documentation build with Sphinx <= 1.2, especially on EL Patch1: %{name}-3.7.0-sphinx.patch @@ -60,7 +60,7 @@ BuildRequires: python3-sphinx %description %{common_description} - +#------------------------------------------------ %if 0%{?_with_python2} %package -n %python2-%{srcname} %py2_migration_meta %python2-%{srcname} @@ -73,45 +73,68 @@ Requires: gmp%{?_isa} %description -n %python2-%{srcname} %{common_description} +%files -n %python2-%{srcname} +%doc AUTHORS.rst Changelog.rst README.rst +%license LICENSE.rst +%{python2_sitearch}/Cryptodome/ +%exclude %{python2_sitearch}/Cryptodome/SelfTest/ +%{python2_sitearch}/%{srcname}-*.egg-info/ +%{_mandir}/man1/pycryptodome.1.* + +#------------------------------------------------ %package -n %python2-%{srcname}-selftest Summary: PyCryptodome test suite module -Group: Development/Python +Group: Development/Python Requires: %python2-%{srcname}%{?_isa} -%{?python_provide:%python_provide %python2-%{srcname}} %description -n %python2-%{srcname}-selftest %{common_description} This package provides the PyCryptodome test suite module (Cryptodome.SelfTest). + +%files -n %python2-%{srcname}-selftest +%{python2_sitearch}/Cryptodome/SelfTest/ %endif +#------------------------------------------------ %package -n python3-%{srcname} Summary: %{summary} Group: Development/Python # GMP library is dl-opened Requires: gmp%{?_isa} -%{?python_provide:%python_provide python3-%{srcname}} %description -n python3-%{srcname} %{common_description} +%files -n python3-%{srcname} +%doc AUTHORS.rst Changelog.rst README.rst +%license LICENSE.rst +%{python3_sitearch}/Cryptodome/ +%exclude %{python3_sitearch}/Cryptodome/SelfTest/ +%{python3_sitearch}/%{srcname}-*.egg-info/ +%{_mandir}/man1/pycryptodome.1.* + +#------------------------------------------------ %package -n python3-%{srcname}-selftest Summary: PyCryptodome test suite module -Group: Development/Python +Group: Development/Python Requires: python3-%{srcname}%{?_isa} -%{?python_provide:%python_provide python3-%{srcname}-selftest} %description -n python3-%{srcname}-selftest %{common_description} This package provides the PyCryptodome test suite module (Cryptodome.SelfTest). +%files -n python3-%{srcname}-selftest +%{python3_sitearch}/Cryptodome/SelfTest/ + +#------------------------------------------------ %prep -%autosetup -n pycryptodome-%{version} -p0 +%autosetup -p1 -n pycryptodome-%{version} # Drop bundled libraries rm -r src/libtom/ @@ -141,14 +164,7 @@ touch .separate_namespace # Install man pages -install -Dpm 0644 Doc/_build/man/pycryptodome.1 $RPM_BUILD_ROOT%{_mandir}/man1/pycryptodome.1 - -# Fix permissions -%if 0%{_with_python2} -chmod 0755 $RPM_BUILD_ROOT%{python2_sitearch}/Cryptodome/SelfTest/PublicKey/test_vectors/ECC/gen_ecc_p256.sh -%endif -chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/Cryptodome/SelfTest/PublicKey/test_vectors/ECC/gen_ecc_p256.sh - +install -Dpm 0644 Doc/_build/man/pycryptodome.1 %{buildroot}%{_mandir}/man1/pycryptodome.1 %check %if 0%{?_with_tests} @@ -159,29 +175,5 @@ chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/Cryptodome/SelfTest/PublicKey/test %endif -%if 0%{?_with_python2} -%files -n %python2-%{srcname} -%doc AUTHORS.rst Changelog.rst README.rst -%license LICENSE.rst -%{python2_sitearch}/Cryptodome/ -%exclude %{python2_sitearch}/Cryptodome/SelfTest/ -%{python2_sitearch}/%{srcname}-*.egg-info/ -%{_mandir}/man1/pycryptodome.1.* -%files -n %python2-%{srcname}-selftest -%{python2_sitearch}/Cryptodome/SelfTest/ -%endif - - -%files -n python3-%{srcname} -%doc AUTHORS.rst Changelog.rst README.rst -%license LICENSE.rst -%{python3_sitearch}/Cryptodome/ -%exclude %{python3_sitearch}/Cryptodome/SelfTest/ -%{python3_sitearch}/%{srcname}-*.egg-info/ -%{_mandir}/man1/pycryptodome.1.* - - -%files -n python3-%{srcname}-selftest -%{python3_sitearch}/Cryptodome/SelfTest/