mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
stunnel: upgrade 5.77 -> 5.78
License-Update: Copyright year updated to 2026 fix-openssl-no-des.patch refreshed for 5.78 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From e08b9760d319d0334f2aad02d32d791c8ebd8564 Mon Sep 17 00:00:00 2001
|
||||
From 08b1bf417be039b097fae25708861fe8184c739c 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
|
||||
@@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/common.h b/src/common.h
|
||||
index c2229d0..5eaee8c 100644
|
||||
index ada7ff7..8484144 100644
|
||||
--- a/src/common.h
|
||||
+++ b/src/common.h
|
||||
@@ -497,7 +497,9 @@ extern char *sys_errlist[];
|
||||
@@ -489,7 +489,9 @@ extern char *sys_errlist[];
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
#include <openssl/md4.h>
|
||||
#endif /* !defined(OPENSSL_NO_MD4) */
|
||||
@@ -29,9 +29,9 @@ index c2229d0..5eaee8c 100644
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_DH
|
||||
#include <openssl/dh.h>
|
||||
#if OPENSSL_VERSION_NUMBER<0x10100000L
|
||||
#endif /* !defined(OPENSSL_NO_DH) */
|
||||
diff --git a/src/protocol.c b/src/protocol.c
|
||||
index c390a6f..7aca745 100644
|
||||
index cddc381..ae0f374 100644
|
||||
--- a/src/protocol.c
|
||||
+++ b/src/protocol.c
|
||||
@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
|
||||
@@ -43,7 +43,7 @@ index c390a6f..7aca745 100644
|
||||
NOEXPORT void ntlm(CLI *);
|
||||
NOEXPORT char *ntlm1(void);
|
||||
NOEXPORT char *ntlm3(char *, char *, char *, char *);
|
||||
@@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
|
||||
@@ -1392,7 +1392,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 c390a6f..7aca745 100644
|
||||
ntlm(c);
|
||||
#else
|
||||
s_log(LOG_ERR, "NTLM authentication is not available");
|
||||
@@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
|
||||
@@ -1435,7 +1435,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
|
||||
str_free(line);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta
|
||||
HOMEPAGE = "https://www.stunnel.org/"
|
||||
SECTION = "net"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.md;md5=df2a0f88c5d5e3ebce922682a7b598ec"
|
||||
|
||||
DEPENDS = "autoconf-archive libnsl2 openssl"
|
||||
|
||||
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
|
||||
file://fix-openssl-no-des.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263"
|
||||
SRC_URI[sha256sum] = "8727e53bb8b7528f850327a2a149158422c02183bc120d1d733cc65b1e2c349d"
|
||||
|
||||
inherit autotools bash-completion pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user