summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-04-09 01:17:18 +0800
committerKhem Raj <raj.khem@gmail.com>2021-04-08 09:25:54 -0700
commit83c8e6bcc0ad57628baac2ee15fac5f5b48ca7c2 (patch)
treee838b413f88e6b386b4a3f2c2ac6ab6031f86ab4
parent5bd0f88c775ea69db85e1589e833e50648932f22 (diff)
downloadmeta-openembedded-83c8e6bcc0ad57628baac2ee15fac5f5b48ca7c2.tar.gz
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>
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch10
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel_5.59.bb (renamed from meta-networking/recipes-support/stunnel/stunnel_5.58.bb)2
2 files changed, 6 insertions, 6 deletions
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 209b0dd40..aeb0bece9 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
@@ -11,7 +11,7 @@ diff --git a/src/common.h b/src/common.h
11index f7d38b0..bf485af 100644 11index f7d38b0..bf485af 100644
12--- a/src/common.h 12--- a/src/common.h
13+++ b/src/common.h 13+++ b/src/common.h
14@@ -471,7 +471,9 @@ extern char *sys_errlist[]; 14@@ -478,7 +478,9 @@ extern char *sys_errlist[];
15 #ifndef OPENSSL_NO_MD4 15 #ifndef OPENSSL_NO_MD4
16 #include <openssl/md4.h> 16 #include <openssl/md4.h>
17 #endif /* !defined(OPENSSL_NO_MD4) */ 17 #endif /* !defined(OPENSSL_NO_MD4) */
@@ -25,8 +25,8 @@ diff --git a/src/protocol.c b/src/protocol.c
25index 587df09..8198eb6 100644 25index 587df09..8198eb6 100644
26--- a/src/protocol.c 26--- a/src/protocol.c
27+++ b/src/protocol.c 27+++ b/src/protocol.c
28@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE); 28@@ -67,7 +67,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
29 NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE); 29 NOEXPORT char *ldap_client(CLI *, SERVICE_OPTIONS *, const PHASE);
30 NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE); 30 NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
31 NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE); 31 NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
32-#ifndef OPENSSL_NO_MD4 32-#ifndef OPENSSL_NO_MD4
@@ -34,7 +34,7 @@ index 587df09..8198eb6 100644
34 NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *); 34 NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
35 NOEXPORT char *ntlm1(); 35 NOEXPORT char *ntlm1();
36 NOEXPORT char *ntlm3(char *, char *, char *, char *); 36 NOEXPORT char *ntlm3(char *, char *, char *, char *);
37@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { 37@@ -1332,7 +1332,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
38 fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host); 38 fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
39 if(opt->protocol_username && opt->protocol_password) { 39 if(opt->protocol_username && opt->protocol_password) {
40 if(!strcasecmp(opt->protocol_authentication, "ntlm")) { 40 if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
@@ -43,7 +43,7 @@ index 587df09..8198eb6 100644
43 ntlm(c, opt); 43 ntlm(c, opt);
44 #else 44 #else
45 s_log(LOG_ERR, "NTLM authentication is not available"); 45 s_log(LOG_ERR, "NTLM authentication is not available");
46@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { 46@@ -1376,7 +1376,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
47 return NULL; 47 return NULL;
48 } 48 }
49 49
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.58.bb b/meta-networking/recipes-support/stunnel/stunnel_5.59.bb
index 1f1ca4e6b..e3704ae1d 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.58.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.59.bb
@@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \
14 file://fix-openssl-no-des.patch \ 14 file://fix-openssl-no-des.patch \
15" 15"
16 16
17SRC_URI[sha256sum] = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79" 17SRC_URI[sha256sum] = "137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f"
18 18
19inherit autotools 19inherit autotools
20 20