diff --git a/freeipa.spec b/freeipa.spec index 919a9c6b6dc94b0d454b199222eaec000815a70b..93a66a0131bd44ab6a2ef8bd6aa7e5d9ca91734c 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -94,7 +94,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 4 +Release: 5 Summary: The Identity, Policy and Audit system License: GPLv3+ @@ -103,6 +103,7 @@ Source0: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz Source1: openEuler-platform.tar.gz Patch0001: adapt-freeipa-to-openEuler.patch +Patch0002: modify-the-utils-interface.patch # For the timestamp trick in patch application BuildRequires: diffstat @@ -771,7 +772,6 @@ UpdateTimestamps() { %setup -n freeipa-%{version}%{?rc_version} -q tar -xvf %{SOURCE1} -C ipaplatform/ -%patch0001 -p1 # To allow proper application patches to the stripped po files, strip originals #pushd po @@ -781,10 +781,10 @@ tar -xvf %{SOURCE1} -C ipaplatform/ #done #popd -#for p in %patches ; do -# %__patch -p1 -i $p -# UpdateTimestamps -p1 $p -#done +for p in %patches ; do + %__patch -p1 -i $p + UpdateTimestamps -p1 $p +done %build # PATH is workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1005235 @@ -1525,6 +1525,9 @@ fi %changelog +* Wed Mar 08 2023 jiangxinyu - 4.9.3-5 +- Modify the utils interface + * Tue Sep 28 2021 wutao - 4.9.3-4 - disable server module and ipatests diff --git a/modify-the-utils-interface.patch b/modify-the-utils-interface.patch new file mode 100644 index 0000000000000000000000000000000000000000..a1e8430860337967d75e44ad21958974e91e5199 --- /dev/null +++ b/modify-the-utils-interface.patch @@ -0,0 +1,34 @@ +From 0705d401e503f7620d02affe49ce9a85cb0d6b5b Mon Sep 17 00:00:00 2001 +From: jxy_git +Date: Tue, 7 Mar 2023 17:50:41 +0800 +Subject: [PATCH] modify the utils interface + +--- + ipalib/x509.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ipalib/x509.py b/ipalib/x509.py +index 402e0e9..2d9b328 100644 +--- a/ipalib/x509.py ++++ b/ipalib/x509.py +@@ -41,7 +41,7 @@ import base64 + import re + + from cryptography import x509 as crypto_x509 +-from cryptography import utils as crypto_utils ++# from cryptography import utils as crypto_utils + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives import serialization + from cryptography.hazmat.primitives.serialization import ( +@@ -88,7 +88,7 @@ SAN_UPN = '1.3.6.1.4.1.311.20.2.3' + SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2' + + +-@crypto_utils.register_interface(crypto_x509.Certificate) ++# @crypto_utils.register_interface(crypto_x509.Certificate) + class IPACertificate: + """ + A proxy class wrapping a python-cryptography certificate representation for +-- +2.39.1 +