mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-16 07:15:43 +01:00
stunnel: upgrade 5.58 -> 5.59
Refresh the following patch: fix-openssl-no-des.patch Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
5bd0f88c77
commit
83c8e6bcc0
|
|
@ -11,7 +11,7 @@ diff --git a/src/common.h b/src/common.h
|
||||||
index f7d38b0..bf485af 100644
|
index f7d38b0..bf485af 100644
|
||||||
--- a/src/common.h
|
--- a/src/common.h
|
||||||
+++ b/src/common.h
|
+++ b/src/common.h
|
||||||
@@ -471,7 +471,9 @@ extern char *sys_errlist[];
|
@@ -478,7 +478,9 @@ extern char *sys_errlist[];
|
||||||
#ifndef OPENSSL_NO_MD4
|
#ifndef OPENSSL_NO_MD4
|
||||||
#include <openssl/md4.h>
|
#include <openssl/md4.h>
|
||||||
#endif /* !defined(OPENSSL_NO_MD4) */
|
#endif /* !defined(OPENSSL_NO_MD4) */
|
||||||
|
|
@ -25,8 +25,8 @@ diff --git a/src/protocol.c b/src/protocol.c
|
||||||
index 587df09..8198eb6 100644
|
index 587df09..8198eb6 100644
|
||||||
--- a/src/protocol.c
|
--- a/src/protocol.c
|
||||||
+++ b/src/protocol.c
|
+++ b/src/protocol.c
|
||||||
@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
|
@@ -67,7 +67,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||||
NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
NOEXPORT char *ldap_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||||
NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
|
NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||||
NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||||
-#ifndef OPENSSL_NO_MD4
|
-#ifndef OPENSSL_NO_MD4
|
||||||
|
|
@ -34,7 +34,7 @@ index 587df09..8198eb6 100644
|
||||||
NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
|
NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
|
||||||
NOEXPORT char *ntlm1();
|
NOEXPORT char *ntlm1();
|
||||||
NOEXPORT char *ntlm3(char *, char *, char *, char *);
|
NOEXPORT char *ntlm3(char *, char *, char *, char *);
|
||||||
@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
@@ -1332,7 +1332,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
||||||
fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
|
fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
|
||||||
if(opt->protocol_username && opt->protocol_password) {
|
if(opt->protocol_username && opt->protocol_password) {
|
||||||
if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
|
if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
|
||||||
|
|
@ -43,7 +43,7 @@ index 587df09..8198eb6 100644
|
||||||
ntlm(c, opt);
|
ntlm(c, opt);
|
||||||
#else
|
#else
|
||||||
s_log(LOG_ERR, "NTLM authentication is not available");
|
s_log(LOG_ERR, "NTLM authentication is not available");
|
||||||
@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
@@ -1376,7 +1376,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \
|
||||||
file://fix-openssl-no-des.patch \
|
file://fix-openssl-no-des.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79"
|
SRC_URI[sha256sum] = "137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f"
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user