From 55f0762f014d48a0653127e793965221f179a9e6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 17 Aug 2021 11:51:09 +0200 Subject: [PATCH] Resolves: rhbz#1994263 - Fix comparison of OID structure --- ...0.28-Fix-comparison-of-OID-structure.patch | 35 +++++++++++++++++++ gating.yaml | 6 ++++ perl-GSSAPI.spec | 8 ++++- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 GSSAPI-0.28-Fix-comparison-of-OID-structure.patch create mode 100644 gating.yaml diff --git a/GSSAPI-0.28-Fix-comparison-of-OID-structure.patch b/GSSAPI-0.28-Fix-comparison-of-OID-structure.patch new file mode 100644 index 0000000..f61af74 --- /dev/null +++ b/GSSAPI-0.28-Fix-comparison-of-OID-structure.patch @@ -0,0 +1,35 @@ +From 4b213b1f0c9681f74d12f991db008f1d891d7447 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= +Date: Mon, 16 Aug 2021 15:30:50 +0200 +Subject: [PATCH] Fix comparison of OID structure + +--- + xs/OID.xs | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/xs/OID.xs b/xs/OID.xs +index c805e45..7c2a4ba 100644 +--- a/xs/OID.xs ++++ b/xs/OID.xs +@@ -15,12 +15,12 @@ DESTROY(oid) + PPCODE: + #if !defined(HEIMDAL) + if (oid != NULL && +- oid != __KRB5_MECHTYPE_OID && +- oid != __KRB5_OLD_MECHTYPE_OID && +- oid != __GSS_KRB5_NT_USER_NAME && +- oid != __GSS_KRB5_NT_PRINCIPAL_NAME && +- oid != __SPNEGO_MECHTYPE_OID && +- oid != __gss_mech_krb5_v2 ) { ++ ! gss_oid_equal(oid, __KRB5_MECHTYPE_OID) && ++ ! gss_oid_equal(oid, __KRB5_OLD_MECHTYPE_OID) && ++ ! gss_oid_equal(oid, __GSS_KRB5_NT_USER_NAME) && ++ ! gss_oid_equal(oid, __GSS_KRB5_NT_PRINCIPAL_NAME) && ++ ! gss_oid_equal(oid, __SPNEGO_MECHTYPE_OID) && ++ ! gss_oid_equal(oid, __gss_mech_krb5_v2) ) { + (void)gss_release_oid(&minor, &oid); + } + #endif +-- +2.31.1 + diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..c190bde --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/perl-GSSAPI.spec b/perl-GSSAPI.spec index 045de8c..d9bd043 100644 --- a/perl-GSSAPI.spec +++ b/perl-GSSAPI.spec @@ -6,11 +6,13 @@ Name: perl-GSSAPI Version: 0.28 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library License: GPL+ or Artistic URL: https://metacpan.org/release/GSSAPI Source0: https://cpan.metacpan.org/authors/id/A/AG/AGROLMS/GSSAPI-%{version}.tar.gz +# Fix comparison of OID structure (rhbz #1994263) +Patch0: GSSAPI-0.28-Fix-comparison-of-OID-structure.patch BuildRequires: make BuildRequires: findutils BuildRequires: gcc @@ -37,6 +39,7 @@ distribution from MIT. %prep %setup -q -n GSSAPI-%{version} +%patch0 -p1 chmod -c a-x examples/*.pl %build @@ -59,6 +62,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete %{_mandir}/man3/* %changelog +* Mon Aug 16 2021 Jitka Plesnikova - 0.28-24 +- Resolves: rhbz#1994263 - Fix comparison of OID structure + * Mon Aug 09 2021 Mohan Boddu - 0.28-35 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688