diff options
author | changqing.li@windriver.com <changqing.li@windriver.com> | 2018-07-02 10:07:59 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-03 17:42:25 -0700 |
commit | 771914f1371918ad7c3cd54bd3003f8ce2a25067 (patch) | |
tree | 76872de2235248c5a2022246965056a0e05d5092 /meta-oe/recipes-extended/rsyslog | |
parent | 2731baf1ea81e6e6d97a0d6d86aab870c28d9b52 (diff) | |
download | meta-openembedded-contrib-771914f1371918ad7c3cd54bd3003f8ce2a25067.tar.gz |
rsyslog: upgrade 8.29.0 -> 8.36.0
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch | 15 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb) | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch index ca88dd3f7e..6ce8b7a9c8 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch @@ -1,6 +1,6 @@ -From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001 +From 7baf35b88d742032a2dc456c396843e17e866f8e Mon Sep 17 00:00:00 2001 From: Ming Liu <peter.x.liu@external.atlascopco.com> -Date: Sun, 26 Feb 2017 14:10:21 +0100 +Date: Wed, 27 Jun 2018 14:04:57 +0800 Subject: [PATCH] Include sys/time.h struct timeval is defined in sys/time.h with a musl libc. @@ -8,13 +8,13 @@ struct timeval is defined in sys/time.h with a musl libc. Upstream-Status: Inappropriate [musl libc specific] Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> - +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- tests/msleep.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/msleep.c b/tests/msleep.c -index 26a8206..ca818be 100644 +index 98dbece..96f6950 100644 --- a/tests/msleep.c +++ b/tests/msleep.c @@ -26,11 +26,7 @@ @@ -26,6 +26,7 @@ index 26a8206..ca818be 100644 -#else -#include <time.h> -#endif - - int main(int argc, char *argv[]) - { + #if defined(HAVE_SYS_SELECT_H) + #include <sys/select.h> + #endif +2.7.4 diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 162d239a13..0352587268 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -3,7 +3,7 @@ From: Roy Li <rongqing.li@windriver.com> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt -Upstream-status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] libgcrypt does no longer provide libgcrypt-config, and provide *.pc, so we should use pkgconfig to check diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index 03f21c6190..d65a2be889 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb @@ -9,7 +9,7 @@ Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ encryption protected syslog relay chains while at the same time being\ very easy to setup for the novice user." -DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging" +DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging curl" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ @@ -30,8 +30,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "3805617f65a4b4bea34606487a5255a0" -SRC_URI[sha256sum] = "220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738" +SRC_URI[md5sum] = "6846bb6d37af3ce067988dd2460d3a5d" +SRC_URI[sha256sum] = "8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |