Build with ouroboros 0.17, fixes rhbz#2214228 / RUSTSEC-2023-0042

This commit is contained in:
Christian Heimes 2023-08-14 07:24:10 +02:00
parent 7b18e1445d
commit c8cc5d4cdc
2 changed files with 20 additions and 2 deletions

13
ouroboros-0.17.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index 9dd060f8b..8004c7e76 100644
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -15,7 +15,7 @@ cryptography-cffi = { path = "cryptography-cffi" }
cryptography-x509 = { path = "cryptography-x509" }
cryptography-openssl = { path = "cryptography-openssl" }
pem = "1.1"
-ouroboros = "0.15"
+ouroboros = "0.17"
openssl = "0.10.54"
openssl-sys = "0.9.88"
foreign-types-shared = "0.1"

View File

@ -6,7 +6,7 @@
Name: python-%{srcname} Name: python-%{srcname}
Version: 41.0.3 Version: 41.0.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: PyCA's cryptography library Summary: PyCA's cryptography library
# cryptography is dual licensed under the Apache-2.0 and BSD-3-Clause, # cryptography is dual licensed under the Apache-2.0 and BSD-3-Clause,
@ -20,6 +20,7 @@ Source1: cryptography-%{version}-vendor.tar.bz2
Source2: conftest-skipper.py Source2: conftest-skipper.py
Patch1: pyo3-0.19.patch Patch1: pyo3-0.19.patch
Patch2: ouroboros-0.17.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
@ -73,8 +74,9 @@ recipes to Python developers.
%prep %prep
%autosetup -p1 -N -n %{srcname}-%{version} %autosetup -p1 -N -n %{srcname}-%{version}
%if 0%{?fedora} %if 0%{?fedora}
# patch pyo3 depedency # patch pyo3 and ouroboros depedency
%autopatch -p1 1 %autopatch -p1 1
%autopatch -p1 2
%cargo_prep %cargo_prep
rm src/rust/Cargo.lock rm src/rust/Cargo.lock
%else %else
@ -135,6 +137,9 @@ PYTHONPATH=${PWD}/vectors:%{buildroot}%{python3_sitearch} \
%{python3_sitearch}/%{srcname}-%{version}-py*.egg-info %{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
%changelog %changelog
* Mon Aug 14 2023 Christian Heimes <cheimes@redhat.com> - 41.0.3-2
- Build with ouroboros 0.17, fixes rhbz#2214228 / RUSTSEC-2023-0042
* Wed Aug 09 2023 Christian Heimes <cheimes@redhat.com> - 41.0.3-1 * Wed Aug 09 2023 Christian Heimes <cheimes@redhat.com> - 41.0.3-1
- Update to 41.0.3, resolves rhbz#2211237 - Update to 41.0.3, resolves rhbz#2211237
- Use pyo3 0.19 - Use pyo3 0.19