#14 [eln] Rebuild for java-21-openjdk, fix tests in ELN
Closed 2 months ago by yselkowitz. Opened 2 months ago by yselkowitz.
rpms/ yselkowitz/crypto-policies eln  into  eln

file modified
+7 -3
@@ -8,7 +8,7 @@ 

  %if 0%{?rhel} == 9

    # RHEL-9: must be RequiredRSASize in RHEL >= 9.2, Conflicts-enforced,

    %global MIN_RSA_NAME RequiredRSASize

- %elif 0%{?rhel} == 10

+ %elif 0%{?rhel} >= 10

    # ELN: RequiredRSASize for openssh >= 9.0p1-5, RSAMinSize for >= 9.0p1-2

    %if v"%(rpm -q openssh | head -n1)" >= v"openssh-9.0p1-5"

      %global MIN_RSA_NAME RequiredRSASize
@@ -28,7 +28,7 @@ 

  

  Name:           crypto-policies

  Version:        %{git_date}

- Release:        1.git%{git_commit_hash}%{?dist}

+ Release:        2.git%{git_commit_hash}%{?dist}

  Summary:        System-wide crypto policies

  

  License:        LGPL-2.1-or-later
@@ -95,7 +95,7 @@ 

    python/policygenerators/openssh.py

  grep "MIN_RSA_DEFAULT = '%{MIN_RSA_NAME}'" python/policygenerators/openssh.py

  

- %if 0%{?rhel} == 10

+ %if 0%{?rhel} >= 10

  # currently ELN 3.90-1 doesn't carry the TLS-REQUIRE-EMS patch

  sed -i "s/'NSS_NO_TLS_REQUIRE_EMS', '0'/'NSS_NO_TLS_REQUIRE_EMS', '1'/" \

    python/policygenerators/nss.py tests/nss.py
@@ -241,6 +241,10 @@ 

  %{_mandir}/man8/fips-finish-install.8*

  

  %changelog

+ * Tue Mar 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 20240202-2.git283706d

+ - Rebuilt for java-21-openjdk as system JDK

+ - Fix tests for ELN

+ 

  * Fri Feb 02 2024 Alexander Sosedkin <asosedkin@redhat.com> - 20240202-1.git283706d

  - fips-finish-install: make sure ostree is detected in chroot

  - fips-mode-setup: make sure ostree is detected in chroot

Rebuild is for https://fedoraproject.org/wiki/Changes/Java21

ELN now targets the future RHEL 11, but the same issues that affect RHEL 10 still apply (at least for now).

Pull-Request has been closed by yselkowitz

2 months ago
Metadata