mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 00:20:38 -09:00
package/stunnel: bump version to 5.78
https://github.com/mtrojnar/stunnel/blob/stunnel-5.78/NEWS.md Removed patch which is included in this commit:1c06022093 (diff-0134ab37004b3e923ee2e697976e032c32b114839ca0a697b01111d1381e8d08)Updated license hash due to copyright year bump:4c8a77e374Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
d9d2a12b45
commit
45d056e7bf
@@ -1,45 +0,0 @@
|
||||
From 93e5cdd68b13cc3161d9b0094b0f331bdaf07cbc Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 6 Jan 2024 17:28:20 +0100
|
||||
Subject: [PATCH] src/ocsp.c: fix build with OPENSSL_NO_PSK
|
||||
|
||||
Fix the following build failure with OPENSSL_NO_PSK:
|
||||
|
||||
ocsp.c: In function 'ocsp_init':
|
||||
ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys'
|
||||
112 | if(!section->psk_keys) {
|
||||
| ^~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Upstream: https://github.com/mtrojnar/stunnel/pull/18
|
||||
---
|
||||
src/ocsp.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/ocsp.c b/src/ocsp.c
|
||||
index 5073ded..12792af 100644
|
||||
--- a/src/ocsp.c
|
||||
+++ b/src/ocsp.c
|
||||
@@ -109,12 +109,16 @@ int ocsp_init(SERVICE_OPTIONS *section) {
|
||||
s_log(LOG_DEBUG, "OCSP: Client OCSP stapling enabled");
|
||||
} else {
|
||||
#if OPENSSL_VERSION_NUMBER>=0x10002000L
|
||||
+#ifndef OPENSSL_NO_PSK
|
||||
if(!section->psk_keys) {
|
||||
+#endif
|
||||
if(SSL_CTX_set_tlsext_status_cb(section->ctx, ocsp_server_cb)==TLSEXT_STATUSTYPE_ocsp)
|
||||
s_log(LOG_DEBUG, "OCSP: Server OCSP stapling enabled");
|
||||
+#ifndef OPENSSL_NO_PSK
|
||||
} else {
|
||||
s_log(LOG_NOTICE, "OCSP: Server OCSP stapling is incompatible with PSK");
|
||||
}
|
||||
+#endif
|
||||
#else /* OpenSSL version 1.0.2 or later */
|
||||
s_log(LOG_NOTICE, "OCSP: Server OCSP stapling not supported");
|
||||
#endif /* OpenSSL version 1.0.2 or later */
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.stunnel.org/downloads/stunnel-5.71.tar.gz.sha256
|
||||
sha256 f023aae837c2d32deb920831a5ee1081e11c78a5d57340f8e6f0829f031017f5 stunnel-5.71.tar.gz
|
||||
# From http://www.usenix.org.uk/mirrors/stunnel/stunnel-5.78.tar.gz.sha256
|
||||
sha256 8727e53bb8b7528f850327a2a149158422c02183bc120d1d733cc65b1e2c349d stunnel-5.78.tar.gz
|
||||
# Locally calculated
|
||||
sha256 c172514e95e387eb4c77cdfbb55b635bf96e2dfcb85d785d993f64c40c4f89c4 COPYING.md
|
||||
sha256 716f18b10eac3f1875ea2205418dd1b0084bd210bd17d615df6b180cfc4d65b6 COPYING.md
|
||||
sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
STUNNEL_VERSION_MAJOR = 5
|
||||
STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).71
|
||||
STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).78
|
||||
STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x
|
||||
STUNNEL_DEPENDENCIES = host-pkgconf openssl
|
||||
STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
|
||||
|
||||
Reference in New Issue
Block a user