diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2026-04-14 18:38:44 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-14 08:59:36 -0700 |
| commit | 15a56e9d95d4ca4e17558e4dd1f4487232ef9246 (patch) | |
| tree | 71426b5b0d9f38db42e75d9c02b1bbff36e329d2 | |
| parent | 22854e60c4ac0a7441e70fb0fe5e2d8d7c7f8a86 (diff) | |
| download | meta-openembedded-15a56e9d95d4ca4e17558e4dd1f4487232ef9246.tar.gz | |
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>
| -rw-r--r-- | meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch | 14 | ||||
| -rw-r--r-- | meta-networking/recipes-support/stunnel/stunnel_5.78.bb (renamed from meta-networking/recipes-support/stunnel/stunnel_5.77.bb) | 4 |
2 files changed, 9 insertions, 9 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 3520bf429e..0e94a969c0 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 @@ | |||
| 1 | From e08b9760d319d0334f2aad02d32d791c8ebd8564 Mon Sep 17 00:00:00 2001 | 1 | From 08b1bf417be039b097fae25708861fe8184c739c Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 | 3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 |
| 4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support | 4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support |
| @@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
| 17 | 2 files changed, 5 insertions(+), 3 deletions(-) | 17 | 2 files changed, 5 insertions(+), 3 deletions(-) |
| 18 | 18 | ||
| 19 | diff --git a/src/common.h b/src/common.h | 19 | diff --git a/src/common.h b/src/common.h |
| 20 | index c2229d0..5eaee8c 100644 | 20 | index ada7ff7..8484144 100644 |
| 21 | --- a/src/common.h | 21 | --- a/src/common.h |
| 22 | +++ b/src/common.h | 22 | +++ b/src/common.h |
| 23 | @@ -497,7 +497,9 @@ extern char *sys_errlist[]; | 23 | @@ -489,7 +489,9 @@ extern char *sys_errlist[]; |
| 24 | #ifndef OPENSSL_NO_MD4 | 24 | #ifndef OPENSSL_NO_MD4 |
| 25 | #include <openssl/md4.h> | 25 | #include <openssl/md4.h> |
| 26 | #endif /* !defined(OPENSSL_NO_MD4) */ | 26 | #endif /* !defined(OPENSSL_NO_MD4) */ |
| @@ -29,9 +29,9 @@ index c2229d0..5eaee8c 100644 | |||
| 29 | +#endif | 29 | +#endif |
| 30 | #ifndef OPENSSL_NO_DH | 30 | #ifndef OPENSSL_NO_DH |
| 31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
| 32 | #if OPENSSL_VERSION_NUMBER<0x10100000L | 32 | #endif /* !defined(OPENSSL_NO_DH) */ |
| 33 | diff --git a/src/protocol.c b/src/protocol.c | 33 | diff --git a/src/protocol.c b/src/protocol.c |
| 34 | index c390a6f..7aca745 100644 | 34 | index cddc381..ae0f374 100644 |
| 35 | --- a/src/protocol.c | 35 | --- a/src/protocol.c |
| 36 | +++ b/src/protocol.c | 36 | +++ b/src/protocol.c |
| 37 | @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); | 37 | @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); |
| @@ -43,7 +43,7 @@ index c390a6f..7aca745 100644 | |||
| 43 | NOEXPORT void ntlm(CLI *); | 43 | NOEXPORT void ntlm(CLI *); |
| 44 | NOEXPORT char *ntlm1(void); | 44 | NOEXPORT char *ntlm1(void); |
| 45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); | 45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); |
| 46 | @@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 46 | @@ -1392,7 +1392,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
| 47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); | 47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); |
| 48 | if(c->opt->protocol_username && c->opt->protocol_password) { | 48 | if(c->opt->protocol_username && c->opt->protocol_password) { |
| 49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { | 49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { |
| @@ -52,7 +52,7 @@ index c390a6f..7aca745 100644 | |||
| 52 | ntlm(c); | 52 | ntlm(c); |
| 53 | #else | 53 | #else |
| 54 | s_log(LOG_ERR, "NTLM authentication is not available"); | 54 | s_log(LOG_ERR, "NTLM authentication is not available"); |
| 55 | @@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 55 | @@ -1435,7 +1435,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
| 56 | str_free(line); | 56 | str_free(line); |
| 57 | } | 57 | } |
| 58 | 58 | ||
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb index 954fa896ba..1740ad41f2 100644 --- a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb +++ b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb | |||
| @@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta | |||
| 3 | HOMEPAGE = "https://www.stunnel.org/" | 3 | HOMEPAGE = "https://www.stunnel.org/" |
| 4 | SECTION = "net" | 4 | SECTION = "net" |
| 5 | LICENSE = "GPL-2.0-or-later" | 5 | LICENSE = "GPL-2.0-or-later" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94" | 6 | LIC_FILES_CHKSUM = "file://COPYING.md;md5=df2a0f88c5d5e3ebce922682a7b598ec" |
| 7 | 7 | ||
| 8 | DEPENDS = "autoconf-archive libnsl2 openssl" | 8 | DEPENDS = "autoconf-archive libnsl2 openssl" |
| 9 | 9 | ||
| @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ | |||
| 11 | file://fix-openssl-no-des.patch \ | 11 | file://fix-openssl-no-des.patch \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263" | 14 | SRC_URI[sha256sum] = "8727e53bb8b7528f850327a2a149158422c02183bc120d1d733cc65b1e2c349d" |
| 15 | 15 | ||
| 16 | inherit autotools bash-completion pkgconfig | 16 | inherit autotools bash-completion pkgconfig |
| 17 | 17 | ||
