diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-networking/recipes-support/stunnel | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/stunnel')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch | 54 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb | 24 |
2 files changed, 78 insertions, 0 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch new file mode 100644 index 000000000..209b0dd40 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch @@ -0,0 +1,54 @@ +Upstream-Status: Pending + +When openssl disable des support with configure option 'no-des', it doesn't +provide des related header file and functions. That causes stunnel compile +failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related +library conditionaly. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/src/common.h b/src/common.h +index f7d38b0..bf485af 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -471,7 +471,9 @@ extern char *sys_errlist[]; + #ifndef OPENSSL_NO_MD4 + #include <openssl/md4.h> + #endif /* !defined(OPENSSL_NO_MD4) */ ++#ifndef OPENSSL_NO_DES + #include <openssl/des.h> ++#endif + #ifndef OPENSSL_NO_DH + #include <openssl/dh.h> + #if OPENSSL_VERSION_NUMBER<0x10100000L +diff --git a/src/protocol.c b/src/protocol.c +index 587df09..8198eb6 100644 +--- a/src/protocol.c ++++ b/src/protocol.c +@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE); +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *); + NOEXPORT char *ntlm1(); + NOEXPORT char *ntlm3(char *, char *, char *, char *); +@@ -1175,7 +1175,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); + if(opt->protocol_username && opt->protocol_password) { + if(!strcasecmp(opt->protocol_authentication, "ntlm")) { +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + ntlm(c, opt); + #else + 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) { + return NULL; + } + +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + + /* + * NTLM code is based on the following documentation: diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb new file mode 100644 index 000000000..ec8478d6b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb @@ -0,0 +1,24 @@ +SUMMARY = "Program for providing universal TLS/SSL tunneling service" +HOMEPAGE = "http://www.stunnel.org/" +DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server." +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=866cdc7459d91e092b174388fab8d283" +DEPENDS = "openssl zlib tcp-wrappers" + +RDEPENDS_${PN} += "perl" + +SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ + file://fix-openssl-no-des.patch \ +" + +SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a" +SRC_URI[sha256sum] = "ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d" + +inherit autotools + +EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)}" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |