diff mbox series

[meta-networking,15/17] stunnel: upgrade 5.73 -> 5.74

Message ID 1734426096-18300-15-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/17] ace: update 8.0.1 -> 8.0.2 | expand

Commit Message

Mingyu Wang (Fujitsu) Dec. 17, 2024, 9:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

fix-openssl-no-des.patch
refreshed for 5.74

* Bugfixes
  - Fixed a stapling cache deallocation crash.
  - Fixed "redirect" with protocol negotiation.
* Features
  - "protocolHost" support for "socks" protocol clients.
  - More detailed logs in OpenSSL 3.0 or later.

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 .../stunnel/stunnel/fix-openssl-no-des.patch              | 8 ++++----
 .../stunnel/{stunnel_5.73.bb => stunnel_5.74.bb}          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta-networking/recipes-support/stunnel/{stunnel_5.73.bb => stunnel_5.74.bb} (93%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
index 8c4ca55fbb..08edc254ae 100644
--- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -1,4 +1,4 @@ 
-From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001
+From 71751d30ca6bdae6c62e41b8bdd20eb69cecd556 Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Wed, 1 Nov 2017 09:23:41 -0400
 Subject: [PATCH] stunnel: fix compile error when openssl disable des support
@@ -31,7 +31,7 @@  index f112cf9..8d4be01 100644
  #include <openssl/dh.h>
  #if OPENSSL_VERSION_NUMBER<0x10100000L
 diff --git a/src/protocol.c b/src/protocol.c
-index c8c65ea..b071b06 100644
+index 616a65f..5ccbcb0 100644
 --- a/src/protocol.c
 +++ b/src/protocol.c
 @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
@@ -43,7 +43,7 @@  index c8c65ea..b071b06 100644
  NOEXPORT void ntlm(CLI *);
  NOEXPORT char *ntlm1(void);
  NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
      fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host);
      if(c->opt->protocol_username && c->opt->protocol_password) {
          if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) {
@@ -52,7 +52,7 @@  index c8c65ea..b071b06 100644
              ntlm(c);
  #else
              s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
      str_free(line);
  }
  
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.73.bb b/meta-networking/recipes-support/stunnel/stunnel_5.74.bb
similarity index 93%
rename from meta-networking/recipes-support/stunnel/stunnel_5.73.bb
rename to meta-networking/recipes-support/stunnel/stunnel_5.74.bb
index e13b7871ca..558eacd709 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.73.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.74.bb
@@ -11,7 +11,7 @@  SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
            file://fix-openssl-no-des.patch \
 "
 
-SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38"
+SRC_URI[sha256sum] = "9bef235ab5d24a2a8dff6485dfd782ed235f4407e9bc8716deb383fc80cd6230"
 
 inherit autotools bash-completion pkgconfig