diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
19 files changed, 355 insertions, 202 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch deleted file mode 100644 index e9eed24b3..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 62fa9bceb15a9d160dd5d624a6d46907c1019c5c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 17:02:55 -0700 -Subject: [PATCH] fluent-bit-shared: Link with -lpthread - -This fixes a reference to pthread_atfork in libfluent-bit.so -otherwise we get undefined reference to the symbols in binaries -which are linked with libfluent-bit.so - -Fixes errors like -arm-bec-linux-gnueabi-ld: ../../bin/hello_world: hidden symbol `pthread_atfork' in /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/fluentbit/0.12.1-r0/recipe-sysroot/usr/lib/libpthread_nonshared.a(pthread_atfork.oS) is referenced by DSO - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 425a246..1264e59 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -168,7 +168,7 @@ set(FLB_DEPS - # Shared Library - if(NOT FLB_WITHOUT_SHARED_LIB) - add_library(fluent-bit-shared SHARED ${src}) -- target_link_libraries(fluent-bit-shared ${FLB_DEPS}) -+ target_link_libraries(fluent-bit-shared ${FLB_DEPS} -lpthread) - set_target_properties(fluent-bit-shared - PROPERTIES OUTPUT_NAME fluent-bit) - --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb index 99f680f9a..e50aa71a9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb @@ -4,10 +4,9 @@ BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ file://jemalloc.patch \ - file://0001-fluent-bit-shared-Link-with-lpthread.patch \ " -SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827" -SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b" +SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" +SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" S = "${WORKDIR}/fluent-bit-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch new file mode 100644 index 000000000..357d77d83 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch @@ -0,0 +1,67 @@ +From 27bda5ee884e79d6d0e76955124d2b0c5798d6cf Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 25 Feb 2019 00:34:17 -0800 +Subject: [PATCH] Makefile.am: remove regression dir + +Remove regression dir to fix below do_compile +error: +| Making all in regression +| /bin/sh: line 20: cd: regression: No such file or directory +| Makefile:451: recipe for target 'all-recursive' failed + +BTW, it should be safe not to cover regression dir +as there is no Makefile.in under ${S}/regression +and the content of ${S}/regression/Makefile as below. +------------------------------------- +all: + +install: + +check: + ./TEST + +distclean: clean + +maintainer-clean: clean + +distdir: + +clean: + @rm -rf output + +.PHONY: all install +------------------------------------- + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.am | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ba37a42..548fea7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + AUTOMAKE_OPTIONS = no-texinfo.tex + +-SUBDIRS = intl src doc po man regression ++SUBDIRS = intl src doc po man + + BUILT_SOURCES = + +@@ -13,8 +13,7 @@ EXTRA_DIST = README.md \ + aclocal/UTIMBUF.m4 \ + miscel/Makefile.mingw32 \ + miscel/README.vc++ \ +- bootstrap \ +- regression ++ bootstrap + + DISTCLEANFILES=config/config.cache config/config.log config.h + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch new file mode 100644 index 000000000..7df7ecb38 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch @@ -0,0 +1,40 @@ +From 75369ce004ec0f5e46a432fa1dac8cfc7ae1ef8d Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Sun, 24 Feb 2019 22:35:08 -0800 +Subject: [PATCH] src/indent.c: correct the check for locale.h + +Adjust to check HAVE_LC_MESSAGES or HAVE_LOCALE_H +to determine whether include locale.h or not to +fix below issue: + +| ../../indent-2.2.12/src/indent.c: In function 'main': +| ../../indent-2.2.12/src/indent.c:1062:5: error: implicit declaration of function 'setlocale'; did you mean 'setstate'? [-Werror=implicit-function-declaration] +| setlocale(LC_ALL, ""); +| ^~~~~~~~~ +| setstate +| ../../indent-2.2.12/src/indent.c:1062:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] +| ../../indent-2.2.12/src/indent.c:1062:15: error: 'LC_ALL' undeclared (first use in this function) + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/indent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/indent.c b/src/indent.c +index 4d666e2..0c2780b 100644 +--- a/src/indent.c ++++ b/src/indent.c +@@ -71,7 +71,7 @@ + #include <string.h> + #include <ctype.h> + #include <stdlib.h> +-#ifdef HAVE_LOCALE_H ++#if defined(HAVE_LC_MESSAGES) || defined(HAVE_LOCALE_H) + #include <locale.h> + #endif + #include "indent.h" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb index d25e8e317..f2891df50 100644 --- a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -11,12 +11,17 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "virtual/gettext" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "be35ea62705733859fbf8caf816d8959" -SRC_URI[sha256sum] = "8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://0001-src-indent.c-correct-the-check-for-locale.h.patch \ + file://0001-Makefile.am-remove-regression-dir.patch \ +" +SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14" +SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b" inherit autotools gettext +CFLAGS_class-native += " -Wno-error=unused-value" + FILES_${PN}-doc += "/usr/doc/indent/indent.html" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch b/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch deleted file mode 100644 index ec1f5d0d5..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 16e8c072709572ccefa6c7f835136db01f031323 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Fri, 28 Sep 2018 16:56:14 +0200 -Subject: [PATCH] Explicitly use python3 in pyCecClient - -Upstream-Status: Submitted [https://github.com/Pulse-Eight/libcec/pull/433] - ---- - src/pyCecClient/pyCecClient.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py -index 6d47857..d0504ac 100755 ---- a/src/pyCecClient/pyCecClient.py -+++ b/src/pyCecClient/pyCecClient.py -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#! /usr/bin/python3 - ## demo of the python-libcec API - - # This file is part of the libCEC(R) library. --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb index 4ad49971a..26664255d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -9,11 +9,11 @@ DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -PV = "4.0.2+gitr${SRCPV}" +PV = "4.0.4" -SRCREV = "0a97062dd4b196ceeb003ec41841c7a7edc36dd1" +SRCREV = "3bbd4321618503d14008387a72fabb6743878831" SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ - file://0001-Explicitly-use-python3-in-pyCecClient.patch" +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc index a01659a72..b502177aa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc @@ -10,4 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://libmodbus.org/releases/${BP}.tar.gz" +PACKAGECONFIG ??= "" +PACKAGECONFIG[documentation] = "--with-documentation,--without-documentation,asciidoc-native xmlto-native" + inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb index d857344e3..b205186e0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" inherit autotools pkgconfig -PV .= "+git${SRCPV}" - -# v1.0.3 -SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ +# v1.0.5 +SRCREV = "d08dbcf08b0da418bce9b5427dfd89522916322a" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=version_1 \ file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch new file mode 100644 index 000000000..3bbd10a17 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch @@ -0,0 +1,28 @@ +From 9afb0e4d3b9209ea198052cea0401bef7ee25ad8 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Thu, 9 May 2019 12:23:40 +0900 +Subject: [PATCH] To fix build error on arm32BE. + +error: #error Target architecture was not detected as supported by Double-Conversion. + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + mfbt/double-conversion/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +index 4f37218..93575cb 100644 +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -53,7 +53,7 @@ + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || \ ++ defined(__arm__) || defined(__avr32__) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb index 92d15724f..5e67eeea7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb @@ -16,6 +16,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.o file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ file://format-overflow.patch \ file://JS_PUBLIC_API.patch \ + file://0001-To-fix-build-error-on-arm32BE.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Adjust-for-CURLE_SSL_CACERT-deprecation-in-curl-7.62.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Adjust-for-CURLE_SSL_CACERT-deprecation-in-curl-7.62.patch deleted file mode 100644 index 4dcd10800..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Adjust-for-CURLE_SSL_CACERT-deprecation-in-curl-7.62.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f2c37fab5dbaffa06c1268ee1309596306c9a4df Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 20 Nov 2018 12:23:47 -0800 -Subject: [PATCH] Adjust for CURLE_SSL_CACERT deprecation in curl >= 7.62 - -Use CURLE_PEER_FAILED_VERIFICATION instead - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lib/wsman-curl-client-transport.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c -index d0a3829b..92727f4f 100644 ---- a/src/lib/wsman-curl-client-transport.c -+++ b/src/lib/wsman-curl-client-transport.c -@@ -186,16 +186,23 @@ convert_to_last_error(CURLcode r) - return WS_LASTERR_SSL_CONNECT_ERROR; - case CURLE_BAD_FUNCTION_ARGUMENT: - return WS_LASTERR_CURL_BAD_FUNCTION_ARG; -+#if LIBCURL_VERSION_NUM < 0x073E00 - case CURLE_SSL_PEER_CERTIFICATE: - return WS_LASTERR_SSL_PEER_CERTIFICATE; -+#endif - case CURLE_SSL_ENGINE_NOTFOUND: - return WS_LASTERR_SSL_ENGINE_NOTFOUND; - case CURLE_SSL_ENGINE_SETFAILED: - return WS_LASTERR_SSL_ENGINE_SETFAILED; - case CURLE_SSL_CERTPROBLEM: - return WS_LASTERR_SSL_CERTPROBLEM; -+#if LIBCURL_VERSION_NUM < 0x073E00 - case CURLE_SSL_CACERT: - return WS_LASTERR_SSL_CACERT; -+#else -+ case CURLE_PEER_FAILED_VERIFICATION: -+ return WS_LASTERR_SSL_PEER_CERTIFICATE; -+#endif - #if LIBCURL_VERSION_NUM > 0x70C01 - case CURLE_SSL_ENGINE_INITFAILED: - return WS_LASTERR_SSL_ENGINE_INITFAILED; diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-openSSL-1.1.0-API-fixes.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-openSSL-1.1.0-API-fixes.patch deleted file mode 100644 index 8d230ba6d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-openSSL-1.1.0-API-fixes.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 634b95157e1823672a2c95fac0cecf079b5967e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> -Date: Mon, 19 Nov 2018 15:31:27 +0100 -Subject: [PATCH] openSSL 1.1.0 API fixes - ---- - src/server/shttpd/io_ssl.c | 5 +++++ - src/server/shttpd/shttpd.c | 11 ++++++++++- - src/server/shttpd/ssl.h | 3 +++ - 3 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/server/shttpd/io_ssl.c b/src/server/shttpd/io_ssl.c -index 6de0db2a..ece610ef 100644 ---- a/src/server/shttpd/io_ssl.c -+++ b/src/server/shttpd/io_ssl.c -@@ -21,8 +21,13 @@ struct ssl_func ssl_sw[] = { - {"SSL_set_fd", {0}}, - {"SSL_new", {0}}, - {"SSL_CTX_new", {0}}, -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - {"SSLv23_server_method", {0}}, - {"SSL_library_init", {0}}, -+#else -+ {"TLS_server_method", {0}}, -+ {"OPENSSL_init_ssl", {0}}, -+#endif - {"SSL_CTX_use_PrivateKey_file", {0}}, - {"SSL_CTX_use_certificate_file",{0}}, - {NULL, {0}} -diff --git a/src/server/shttpd/shttpd.c b/src/server/shttpd/shttpd.c -index f0f3fbd8..652aea17 100644 ---- a/src/server/shttpd/shttpd.c -+++ b/src/server/shttpd/shttpd.c -@@ -1489,9 +1489,14 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) - } - - /* Initialize SSL crap */ -- SSL_library_init(); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ SSL_library_init(); - if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL) -+#else -+ OPENSSL_init_ssl(); -+ if ((CTX = SSL_CTX_new(TLS_server_method())) == NULL) -+#endif - _shttpd_elog(E_LOG, NULL, "SSL_CTX_new error"); - else if (SSL_CTX_use_certificate_file(CTX, wsmand_options_get_ssl_cert_file(), SSL_FILETYPE_PEM) != 1) - _shttpd_elog(E_LOG, NULL, "cannot open certificate file %s", pem); -@@ -1552,6 +1557,10 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) - if (rc != 1) { - _shttpd_elog(E_LOG, NULL, "Failed to set SSL cipher list \"%s\"", ssl_cipher_list); - } -+ else if ((*ssl_cipher_list == 0) || (*ssl_cipher_list == ' ')) { -+ _shttpd_elog(E_LOG, NULL, "Empty 'ssl_cipher_list' defaults to 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'."); -+ _shttpd_elog(E_LOG, NULL, "Check openSSL documentation."); -+ } - } - ctx->ssl_ctx = CTX; - -diff --git a/src/server/shttpd/ssl.h b/src/server/shttpd/ssl.h -index 2304b70a..89a73c49 100644 ---- a/src/server/shttpd/ssl.h -+++ b/src/server/shttpd/ssl.h -@@ -56,6 +56,9 @@ extern struct ssl_func ssl_sw[]; - #if OPENSSL_VERSION_NUMBER < 0x10100000L - #define SSLv23_server_method() (* (SSL_METHOD * (*)(void)) FUNC(9))() - #define SSL_library_init() (* (int (*)(void)) FUNC(10))() -+#else -+#define TLS_server_method() (* (SSL_METHOD * (*)(void)) FUNC(9))() -+#define OPENSSL_init_ssl() (* (int (*)(void)) FUNC(10))() - #endif - #define SSL_CTX_use_PrivateKey_file(x,y,z) (* (int (*)(SSL_CTX *, \ - const char *, int)) FUNC(11))((x), (y), (z)) --- -2.19.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.8.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb index f04ff01d9..e5bb0765f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb @@ -15,15 +15,13 @@ DEPENDS = "curl libxml2 openssl libpam" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -# v2.6.8 -SRCREV = "b9cd0b72534854abb6dd834c8c11e02111b4c8d7" +# v2.6.9 +SRCREV = "5efb1545dbac7e6d1e0a992f3e84ca12cea1c18e" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ - file://0001-openSSL-1.1.0-API-fixes.patch \ - file://0001-Adjust-for-CURLE_SSL_CACERT-deprecation-in-curl-7.62.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.12.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index f09d226cc..63ab44b6a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://redis.io" SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" -DEPENDS = "" +DEPENDS = "readline lua ncurses" SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://hiredis-use-default-CC-if-it-is-set.patch \ @@ -19,8 +19,8 @@ SRC_URI_append_mips = " file://remove-atomics.patch" SRC_URI_append_arm = " file://remove-atomics.patch" SRC_URI_append_powerpc = " file://remove-atomics.patch" -SRC_URI[md5sum] = "48f240fd2d96b1b579300b866398edbc" -SRC_URI[sha256sum] = "6447259d2eed426a949c9c13f8fdb2d91fb66d9dc915dd50db13b87f46d93162" +SRC_URI[md5sum] = "96ae20ffd68b9daee24b702b754d89f3" +SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7" inherit autotools-brokensep update-rc.d systemd useradd @@ -32,7 +32,7 @@ GROUPADD_PARAM_${PN} = "--system redis" REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" do_compile_prepend() { - (cd deps && oe_runmake hiredis lua jemalloc linenoise) + (cd deps && oe_runmake hiredis lua linenoise) } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch new file mode 100644 index 000000000..701ab2c5b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch @@ -0,0 +1,45 @@ +From 35aae13a34728e14150706b2a4b1a57fabe00e98 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 4 Feb 2019 16:25:06 +0100 +Subject: [PATCH 1/3] add missing etc/rrdcached-default-lsb.in to tarball - + fixes #956 + +Add missing etc/rrdcached-default-lsb.in to tarball - fixes #956 + +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/35aae13a34728e14150706b2a4b1a57fabe00e98] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5a15db6c..6bec092e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \ ++ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +diff --git a/Makefile.in b/Makefile.in +index 607193c1..c9b1939f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -432,7 +432,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \ ++ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch new file mode 100644 index 000000000..0385ae6d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch @@ -0,0 +1,93 @@ +From 3e469b4c4b5c219469b0be299ce75c4fac09afc9 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 4 Feb 2019 17:17:25 +0100 +Subject: [PATCH 2/3] properly add etc files via EXTRA_DIST - fixes #956 some more + +Add etc files via EXTRA_DIST - fixes #956 some more + +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/3e469b4c4b5c219469b0be299ce75c4fac09afc9] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.am | 3 +-- + Makefile.in | 5 ++--- + etc/Makefile.am | 3 +++ + etc/Makefile.in | 3 +++ + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 6bec092e..c3e2c303 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh + + # build the following subdirectories + +-SUBDIRS = po src bindings tests ++SUBDIRS = po src bindings tests etc + + if BUILD_DOCS + SUBDIRS += doc +@@ -20,7 +20,6 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +diff --git a/Makefile.in b/Makefile.in +index c9b1939f..6a1280e4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -168,7 +168,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = po src bindings tests doc examples ++DIST_SUBDIRS = po src bindings tests etc doc examples + am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/conftools/compile \ + $(top_srcdir)/conftools/config.guess \ +@@ -427,12 +427,11 @@ top_srcdir = @top_srcdir@ + RSYNC = rsync --rsh=ssh + + # build the following subdirectories +-SUBDIRS = po src bindings tests $(am__append_1) $(am__append_2) ++SUBDIRS = po src bindings tests etc $(am__append_1) $(am__append_2) + EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ + rrdtool.spec favicon.ico bootstrap \ + libtool \ + m4/snprintf.m4 \ +- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \ + win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ + win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index f5503f0c..ab763dc8 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -1,3 +1,6 @@ ++EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \ ++ rrdcached.socket.in rrdcached.service.in ++ + if HAVE_SYSTEMD + systemdsystemunit_DATA = \ + etc/rrdcached.socket \ +diff --git a/etc/Makefile.in b/etc/Makefile.in +index c67f9214..74b914b9 100644 +--- a/etc/Makefile.in ++++ b/etc/Makefile.in +@@ -364,6 +364,9 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ ++EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \ ++ rrdcached.socket.in rrdcached.service.in ++ + @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ + @HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \ + @HAVE_SYSTEMD_TRUE@ etc/rrdcached.service +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch new file mode 100644 index 000000000..b929e31f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch @@ -0,0 +1,51 @@ +From 865a9bade72f93cf72ca59954c6df01e8c48915d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> +Date: Tue, 5 Feb 2019 15:04:34 +0100 +Subject: [PATCH 3/3] Fixed 'No rule to make target 'etc/rrdcached.socket' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixed 'No rule to make target 'etc/rrdcached.socket' + +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/865a9bade72f93cf72ca59954c6df01e8c48915d] + +Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + etc/Makefile.am | 4 ++-- + etc/Makefile.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/etc/Makefile.am b/etc/Makefile.am +index ab763dc8..7d18178a 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls + + if HAVE_SYSTEMD + systemdsystemunit_DATA = \ +- etc/rrdcached.socket \ +- etc/rrdcached.service ++ rrdcached.socket \ ++ rrdcached.service + endif +\ No newline at end of file +diff --git a/etc/Makefile.in b/etc/Makefile.in +index 74b914b9..d512fd59 100644 +--- a/etc/Makefile.in ++++ b/etc/Makefile.in +@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls + rrdcached.socket.in rrdcached.service.in + + @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \ +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service ++@HAVE_SYSTEMD_TRUE@ rrdcached.socket \ ++@HAVE_SYSTEMD_TRUE@ rrdcached.service + + all: all-am + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb index 4a6c44669..63cdb7aee 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb @@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d" DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native python-setuptools-native" -SRCREV = "bfc82d5242855628b826018479df00e0ec4e8360" -PV = "1.7.0" +SRCREV = "34e6ff6218bb0372eb545f886dec96dd3d20be47" +PV = "1.7.1" SRC_URI = "\ git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ + file://0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch \ + file://0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch \ + file://0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch \ " S = "${WORKDIR}/git" |