已合并
Remove stunnel-5.76-system-ciphers.patch #21
wk333创建于 8月18日
Remove stunnel-5.76-system-ciphers.patch #21
已合并
共 2 个文件变更+9-40
| @@ -1,38 +0,0 @@ | |||
| 1 | -From 6c8c4c8c85204943223b251d09ca1e93571a437a Mon Sep 17 00:00:00 2001 | ||
| 2 | -From: Sahana Prasad <sprasad@localhost.localdomain> | ||
| 3 | -Date: Mon, 12 Sep 2022 11:07:38 +0200 | ||
| 4 | -Subject: [PATCH 3/7] Use cipher configuration from crypto-policies | ||
| 5 | - | ||
| 6 | -On Fedora, CentOS and RHEL, the system's crypto policies are the best | ||
| 7 | -source to determine which cipher suites to accept in TLS. On these | ||
| 8 | -platforms, OpenSSL supports the PROFILE=SYSTEM setting to use those | ||
| 9 | -policies. Change stunnel to default to this setting. | ||
| 10 | - | ||
| 11 | -Co-Authored-by: Sahana Prasad <shebburn@redhat.com> | ||
| 12 | -Patch-name: stunnel-5.69-system-ciphers.patch | ||
| 13 | -Patch-id: 3 | ||
| 14 | -From-dist-git-commit: 70b3076eb09912b3a11f371b8c523303114fffa3 | ||
| 15 | ---- | ||
| 16 | - src/options.c | 4 ++-- | ||
| 17 | - 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 18 | - | ||
| 19 | -diff --git a/src/options.c b/src/options.c | ||
| 20 | -index 319166d..0a8ee1d 100644 | ||
| 21 | ---- a/src/options.c | ||
| 22 | -+++ b/src/options.c | ||
| 23 | -@@ -332,10 +332,10 @@ static const char *option_not_found= | ||
| 24 | - "Specified option name is not valid here"; | ||
| 25 | - | ||
| 26 | - static const char *stunnel_cipher_list= | ||
| 27 | -- "HIGH:!aNULL:!SSLv2:!DH:!kDHEPSK"; | ||
| 28 | -+ "PROFILE=SYSTEM"; | ||
| 29 | - #ifdef USE_FIPS | ||
| 30 | - static const char *fips_cipher_list= | ||
| 31 | -- "FIPS:!DH:!kDHEPSK"; | ||
| 32 | -+ "PROFILE=SYSTEM"; | ||
| 33 | - #endif /* USE_FIPS */ | ||
| 34 | - | ||
| 35 | - #ifndef OPENSSL_NO_TLS1_3 | ||
| 36 | --- | ||
| 37 | -2.39.2 | ||
| 38 | - | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Name: stunnel | 1 | Name: stunnel |
| 2 | Version: 5.76 | 2 | Version: 5.76 |
| 3 | -Release: 1 | 3 | +Release: 2 |
| 4 | Summary: Secure traffic running between a TCP client and server | 4 | Summary: Secure traffic running between a TCP client and server |
| 5 | License: GPL-2.0-or-later OR MIT | 5 | License: GPL-2.0-or-later OR MIT |
| 6 | URL: https://www.stunnel.org/ | 6 | URL: https://www.stunnel.org/ |
| @@ -16,7 +16,11 @@ Patch1: stunnel-5.61-systemd-service.patch | |||
| 16 | # source to determine which cipher suites to accept in TLS. On these | 16 | # source to determine which cipher suites to accept in TLS. On these |
| 17 | # platforms, OpenSSL supports the PROFILE=SYSTEM setting to use those | 17 | # platforms, OpenSSL supports the PROFILE=SYSTEM setting to use those |
| 18 | # policies. Change stunnel to default to this setting. | 18 | # policies. Change stunnel to default to this setting. |
| 19 | -Patch3: stunnel-5.76-system-ciphers.patch | 19 | +# Patch3: stunnel-5.76-system-ciphers.patch |
| 20 | +# Do not apply stunnel-5.76-system-ciphers.patch, as it prevents | ||
| 21 | +# the stunnel service from starting. | ||
| 22 | +# https://atomgit.com/src-openeuler/stunnel/issues/10 | ||
| 23 | + | ||
| 20 | # Use TLS version f/crypto-policies unless specified | 24 | # Use TLS version f/crypto-policies unless specified |
| 21 | # | 25 | # |
| 22 | # Do not explicitly set the TLS version and rely on the defaults from | 26 | # Do not explicitly set the TLS version and rely on the defaults from |
| @@ -93,6 +97,9 @@ rm -fr %{buildroot}%{_datadir}/doc/stunnel | |||
| 93 | %lang(pl) %{_mandir}/pl/man8/stunnel.8* | 97 | %lang(pl) %{_mandir}/pl/man8/stunnel.8* |
| 94 | 98 | ||
| 95 | %changelog | 99 | %changelog |
| 100 | +* Tue Aug 18 2026 wangkai <13474090681@163.com> - 5.76-2 | ||
| 101 | +- Remove stunnel-5.76-system-ciphers.patch | ||
| 102 | + | ||
| 96 | * Sun Oct 19 2025 Funda Wang <fundawang@yeah.net> - 5.76-1 | 103 | * Sun Oct 19 2025 Funda Wang <fundawang@yeah.net> - 5.76-1 |
| 97 | - update to 5.76 | 104 | - update to 5.76 |
| 98 | 105 | ||