diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.14.bb (renamed from meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb (renamed from meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch | 24 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.65.bb (renamed from meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.64.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.1.bb (renamed from meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.0.bb) | 2 |
5 files changed, 21 insertions, 12 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.14.bb index 07870bb2c0..3f2107445e 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.14.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ " -SRCREV = "1c31e0e5397646ae3709b1fbfd9c3b47b904f254" +SRCREV = "35b42a161f3f3c7cf388e33dbaa5bd7082aac9d8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb index f5467794e6..6861314a0a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.remlab.net/ndisc6/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PV = "1.0.5" -SRCREV = "b706f5f01aa82aa0db678fffd15a1527f330c507" +SRCREV = "7e314b23329f9c24c4c097b8513673fed7e7158a" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ " 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 index aeb0bece97..0840cbbd8b 100644 --- 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 @@ -1,3 +1,8 @@ +From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce 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 + Upstream-Status: Pending When openssl disable des support with configure option 'no-des', it doesn't @@ -6,12 +11,17 @@ 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> + --- + src/common.h | 2 ++ + src/protocol.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + diff --git a/src/common.h b/src/common.h -index f7d38b0..bf485af 100644 +index bc37eb5..03ee3e5 100644 --- a/src/common.h +++ b/src/common.h -@@ -478,7 +478,9 @@ extern char *sys_errlist[]; +@@ -486,7 +486,9 @@ extern char *sys_errlist[]; #ifndef OPENSSL_NO_MD4 #include <openssl/md4.h> #endif /* !defined(OPENSSL_NO_MD4) */ @@ -22,19 +32,19 @@ index f7d38b0..bf485af 100644 #include <openssl/dh.h> #if OPENSSL_VERSION_NUMBER<0x10100000L diff --git a/src/protocol.c b/src/protocol.c -index 587df09..8198eb6 100644 +index 804f115..d9b2b50 100644 --- a/src/protocol.c +++ b/src/protocol.c -@@ -67,7 +67,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE); +@@ -66,7 +66,7 @@ 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_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 *ntlm1(void); NOEXPORT char *ntlm3(char *, char *, char *, char *); -@@ -1332,7 +1332,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { +@@ -1351,7 +1351,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")) { @@ -43,7 +53,7 @@ index 587df09..8198eb6 100644 ntlm(c, opt); #else s_log(LOG_ERR, "NTLM authentication is not available"); -@@ -1376,7 +1376,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { +@@ -1395,7 +1395,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { return NULL; } diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.64.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.65.bb index 13ecd5c5bf..ab7ff43223 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.64.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.65.bb @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" +SRC_URI[sha256sum] = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc" inherit autotools bash-completion pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.1.bb index cf59d29180..5eb9ec1bfc 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.16.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master;protocol=https \ file://0001-contrib-add-yocto-compatible-init-script.patch \ " -SRCREV = "edc1d07718fb0ecabf9ddd3cf65503de1810834c" +SRCREV = "903538c76e1d8eb30d0814bb55c3ef1ea28164e8" inherit autotools pkgconfig systemd update-rc.d |