From 2ff4249b027c8ecb76f7ca627f16653a29ef7630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Laz=C3=ADk?= Date: Mon, 15 Jun 2026 15:19:11 +0200 Subject: [PATCH] Automatically use system openssl configuration on rpm builds --- .../foreman-proxy-use-crypto-policies.patch | 25 +++++++++++++++++++ .../foreman/foreman-proxy/foreman-proxy.spec | 9 +++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 packages/foreman/foreman-proxy/foreman-proxy-use-crypto-policies.patch diff --git a/packages/foreman/foreman-proxy/foreman-proxy-use-crypto-policies.patch b/packages/foreman/foreman-proxy/foreman-proxy-use-crypto-policies.patch new file mode 100644 index 0000000000..7cdb8f48d8 --- /dev/null +++ b/packages/foreman/foreman-proxy/foreman-proxy-use-crypto-policies.patch @@ -0,0 +1,25 @@ +--- a/lib/launcher.rb ++++ b/lib/launcher.rb +@@ -5,7 +5,6 @@ + require 'proxy/log_buffer/trace_decorator' + require 'sd_notify' + +-CRYPTO_POLICIES_CONFIG = '/etc/crypto-policies/back-ends/opensslcnf.config'.freeze + TLS_MIN_VERSION_MAP = { + '1.0' => OpenSSL::SSL::TLS1_VERSION, + '1.1' => OpenSSL::SSL::TLS1_1_VERSION, +@@ -117,13 +116,7 @@ + return nil if configured&.empty? + return configured unless configured.nil? + +- if File.exist?(CRYPTO_POLICIES_CONFIG) +- logger.info "Crypto-policies detected, using PROFILE=SYSTEM for TLS ciphers." +- 'PROFILE=SYSTEM' +- else +- logger.debug "No crypto-policies detected, using HIGH cipher string as default." +- 'HIGH' +- end ++ 'PROFILE=SYSTEM' + end + + def validate_tls_ciphers!(ciphers) diff --git a/packages/foreman/foreman-proxy/foreman-proxy.spec b/packages/foreman/foreman-proxy/foreman-proxy.spec index 31ec5e0148..fea0c57844 100644 --- a/packages/foreman/foreman-proxy/foreman-proxy.spec +++ b/packages/foreman/foreman-proxy/foreman-proxy.spec @@ -1,7 +1,7 @@ %global homedir %{_datadir}/%{name} %global confdir config -%global release 1 +%global release 2 %global prereleasesource develop %global prerelease %{?prereleasesource} @@ -17,6 +17,8 @@ Source0: https://downloads.theforeman.org/%{name}/%{name}-%{version}%{?pr Source1: %{name}.tmpfiles Source2: logrotate.conf +Patch0: %{name}-use-crypto-policies.patch + BuildArch: noarch BuildRequires: /usr/bin/rename BuildRequires: asciidoc @@ -83,7 +85,7 @@ Manages DNS, DHCP, TFTP and puppet settings though HTTP Restful API Mainly used by the foreman project (https://theforeman.org) %prep -%setup -q -n %{name}-%{version}%{?prerelease:-}%{?prerelease} +%autosetup -p1 -n %{name}-%{version}%{?prerelease:-}%{?prerelease} %build #build man pages @@ -239,6 +241,9 @@ exit 0 %changelog +* Mon Jun 15 2026 Adam Lazik - 5.0.0-0.2.develop +- Apply crypto-policies patch for tls_ciphers and tls_min_version + * Wed May 20 2026 Zach Huntington-Meath - 5.0.0-0.1.develop - Bump version to 5.0-develop