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 | |
parent | 2731baf1ea81e6e6d97a0d6d86aab870c28d9b52 (diff) | |
download | meta-openembedded-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>
-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 @@ | |||
1 | From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001 | 1 | From 7baf35b88d742032a2dc456c396843e17e866f8e Mon Sep 17 00:00:00 2001 |
2 | From: Ming Liu <peter.x.liu@external.atlascopco.com> | 2 | From: Ming Liu <peter.x.liu@external.atlascopco.com> |
3 | Date: Sun, 26 Feb 2017 14:10:21 +0100 | 3 | Date: Wed, 27 Jun 2018 14:04:57 +0800 |
4 | Subject: [PATCH] Include sys/time.h | 4 | Subject: [PATCH] Include sys/time.h |
5 | 5 | ||
6 | struct timeval is defined in sys/time.h with a musl libc. | 6 | 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. | |||
8 | Upstream-Status: Inappropriate [musl libc specific] | 8 | Upstream-Status: Inappropriate [musl libc specific] |
9 | 9 | ||
10 | Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> | 10 | Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> |
11 | 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | |
12 | --- | 12 | --- |
13 | tests/msleep.c | 4 ---- | 13 | tests/msleep.c | 4 ---- |
14 | 1 file changed, 4 deletions(-) | 14 | 1 file changed, 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/tests/msleep.c b/tests/msleep.c | 16 | diff --git a/tests/msleep.c b/tests/msleep.c |
17 | index 26a8206..ca818be 100644 | 17 | index 98dbece..96f6950 100644 |
18 | --- a/tests/msleep.c | 18 | --- a/tests/msleep.c |
19 | +++ b/tests/msleep.c | 19 | +++ b/tests/msleep.c |
20 | @@ -26,11 +26,7 @@ | 20 | @@ -26,11 +26,7 @@ |
@@ -26,6 +26,7 @@ index 26a8206..ca818be 100644 | |||
26 | -#else | 26 | -#else |
27 | -#include <time.h> | 27 | -#include <time.h> |
28 | -#endif | 28 | -#endif |
29 | 29 | #if defined(HAVE_SYS_SELECT_H) | |
30 | int main(int argc, char *argv[]) | 30 | #include <sys/select.h> |
31 | { | 31 | #endif |
32 | 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> | |||
3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 | 3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 |
4 | Subject: [PATCH] use pkgconfig to check libgcrypt | 4 | Subject: [PATCH] use pkgconfig to check libgcrypt |
5 | 5 | ||
6 | Upstream-status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
7 | 7 | ||
8 | libgcrypt does no longer provide libgcrypt-config, and provide | 8 | libgcrypt does no longer provide libgcrypt-config, and provide |
9 | *.pc, so we should use pkgconfig to check | 9 | *.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,\ | |||
9 | encryption protected syslog relay chains while at the same time being\ | 9 | encryption protected syslog relay chains while at the same time being\ |
10 | very easy to setup for the novice user." | 10 | very easy to setup for the novice user." |
11 | 11 | ||
12 | DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging" | 12 | DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging curl" |
13 | HOMEPAGE = "http://www.rsyslog.com/" | 13 | HOMEPAGE = "http://www.rsyslog.com/" |
14 | LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" | 14 | LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ |
@@ -30,8 +30,8 @@ SRC_URI_append_libc-musl = " \ | |||
30 | file://0001-Include-sys-time-h.patch \ | 30 | file://0001-Include-sys-time-h.patch \ |
31 | " | 31 | " |
32 | 32 | ||
33 | SRC_URI[md5sum] = "3805617f65a4b4bea34606487a5255a0" | 33 | SRC_URI[md5sum] = "6846bb6d37af3ce067988dd2460d3a5d" |
34 | SRC_URI[sha256sum] = "220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738" | 34 | SRC_URI[sha256sum] = "8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70" |
35 | 35 | ||
36 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 36 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" |
37 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 37 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |