summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-04-19 15:00:59 +0800
committerArmin Kuster <akuster808@gmail.com>2018-05-01 18:17:01 -0700
commit82833c13b1f94c9b44a54fa02b862667ef531a9e (patch)
treea981773469b103d2343ca467484ec2c6af7723ac
parent1af8c23d5071ec75c77d4dcbc8c9ed904aca3dff (diff)
downloadmeta-openembedded-82833c13b1f94c9b44a54fa02b862667ef531a9e.tar.gz
rsyslog: refresh patches
Refresh patches with devtool command to fix do_patch warning. Drop 0001-Undefine-GLOB_BRACE.patch since it had been fixed upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch6
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch35
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch68
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch12
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb1
5 files changed, 52 insertions, 70 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 23c0f258f..ca88dd3f7 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,4 +1,4 @@
1From 3c3c21f4735eb215206273bc714c57c969926d3d Mon Sep 17 00:00:00 2001 1From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001
2From: Ming Liu <peter.x.liu@external.atlascopco.com> 2From: Ming Liu <peter.x.liu@external.atlascopco.com>
3Date: Sun, 26 Feb 2017 14:10:21 +0100 3Date: Sun, 26 Feb 2017 14:10:21 +0100
4Subject: [PATCH] Include sys/time.h 4Subject: [PATCH] Include sys/time.h
@@ -8,6 +8,7 @@ struct timeval is defined in sys/time.h with a musl libc.
8Upstream-Status: Inappropriate [musl libc specific] 8Upstream-Status: Inappropriate [musl libc specific]
9 9
10Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> 10Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
11
11--- 12---
12 tests/msleep.c | 4 ---- 13 tests/msleep.c | 4 ----
13 1 file changed, 4 deletions(-) 14 1 file changed, 4 deletions(-)
@@ -28,6 +29,3 @@ index 26a8206..ca818be 100644
28 29
29 int main(int argc, char *argv[]) 30 int main(int argc, char *argv[])
30 { 31 {
31--
321.9.1
33
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch
deleted file mode 100644
index 7903bb1cc..000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 6746e3a9615d1566bf228e9012d0841b15178810 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Sun, 26 Feb 2017 13:50:33 +0100
4Subject: [PATCH] Undefine GLOB_BRACE
5
6GLOB_BRACE is not defined in posix and thus not implemented in musl libc.
7
8Fixed by defining it to 0 if it is undefined.
9
10Upstream-Status: Inappropriate [musl libc specific]
11
12Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
13---
14 plugins/imfile/imfile.c | 5 +++++
15 1 file changed, 5 insertions(+)
16
17diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
18index d20471f..f9aff81 100644
19--- a/plugins/imfile/imfile.c
20+++ b/plugins/imfile/imfile.c
21@@ -85,6 +85,11 @@ static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config para
22
23 #define ADD_METADATA_UNSPECIFIED -1
24
25+/* fixes build with musl libc */
26+#ifndef GLOB_BRACE
27+#define GLOB_BRACE 0
28+#endif
29+
30 /* this structure is used in pure polling mode as well one of the support
31 * structures for inotify.
32 */
33--
341.9.1
35
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
index bdcb6e22a..a248f75e5 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
@@ -1,3 +1,8 @@
1From 07ad2a1905089b9124623324a9969e4522317110 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Fri, 12 Sep 2014 03:41:11 -0400
4Subject: [PATCH] rsyslog: update configure to fix ptest
5
1$MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then 6$MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then
2test cases fall into infinite loop with error message: 7test cases fall into infinite loop with error message:
3 8
@@ -6,13 +11,24 @@ test cases fall into infinite loop with error message:
6 11
7Update configure to fix it. 12Update configure to fix it.
8 13
9Upstream-Status: pending 14Upstream-Status: Pending
15
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
10 17
11Kai Kang <kai.kang@windriver.com>
12--- 18---
13diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf 19 tests/testsuites/complex1.conf | 2 +-
14--- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800 20 tests/testsuites/gzipwr_large.conf | 2 +-
15+++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800 21 tests/testsuites/gzipwr_large_dynfile.conf | 2 +-
22 tests/testsuites/imptcp_conndrop.conf | 2 +-
23 tests/testsuites/imptcp_large.conf | 2 +-
24 tests/testsuites/imtcp_conndrop.conf | 2 +-
25 tests/testsuites/wr_large.conf | 2 +-
26 7 files changed, 7 insertions(+), 7 deletions(-)
27
28diff --git a/tests/testsuites/complex1.conf b/tests/testsuites/complex1.conf
29index 9b6a9f3..e00caa4 100644
30--- a/tests/testsuites/complex1.conf
31+++ b/tests/testsuites/complex1.conf
16@@ -1,7 +1,7 @@ 32@@ -1,7 +1,7 @@
17 # complex test case with multiple actions in gzip mode 33 # complex test case with multiple actions in gzip mode
18 # rgerhards, 2009-05-22 34 # rgerhards, 2009-05-22
@@ -22,9 +38,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/t
22 38
23 $MainMsgQueueTimeoutEnqueue 5000 39 $MainMsgQueueTimeoutEnqueue 5000
24 40
25diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 41diff --git a/tests/testsuites/gzipwr_large.conf b/tests/testsuites/gzipwr_large.conf
26--- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800 42index 54ad3bb..e8247a9 100644
27+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800 43--- a/tests/testsuites/gzipwr_large.conf
44+++ b/tests/testsuites/gzipwr_large.conf
28@@ -1,7 +1,7 @@ 45@@ -1,7 +1,7 @@
29 # simple async writing test 46 # simple async writing test
30 # rgerhards, 2010-03-09 47 # rgerhards, 2010-03-09
@@ -34,9 +51,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tes
34 51
35 $ModLoad ../plugins/imtcp/.libs/imtcp 52 $ModLoad ../plugins/imtcp/.libs/imtcp
36 $MainMsgQueueTimeoutShutdown 10000 53 $MainMsgQueueTimeoutShutdown 10000
37diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 54diff --git a/tests/testsuites/gzipwr_large_dynfile.conf b/tests/testsuites/gzipwr_large_dynfile.conf
38--- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800 55index 3a1b255..297cb70 100644
39+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800 56--- a/tests/testsuites/gzipwr_large_dynfile.conf
57+++ b/tests/testsuites/gzipwr_large_dynfile.conf
40@@ -1,7 +1,7 @@ 58@@ -1,7 +1,7 @@
41 # simple async writing test 59 # simple async writing test
42 # rgerhards, 2010-03-09 60 # rgerhards, 2010-03-09
@@ -46,9 +64,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4
46 64
47 $ModLoad ../plugins/imtcp/.libs/imtcp 65 $ModLoad ../plugins/imtcp/.libs/imtcp
48 $MainMsgQueueTimeoutShutdown 10000 66 $MainMsgQueueTimeoutShutdown 10000
49diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 67diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf
50--- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800 68index 77a5d79..d9a14a8 100644
51+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 69--- a/tests/testsuites/imptcp_conndrop.conf
70+++ b/tests/testsuites/imptcp_conndrop.conf
52@@ -1,7 +1,7 @@ 71@@ -1,7 +1,7 @@
53 # simple async writing test 72 # simple async writing test
54 # rgerhards, 2010-03-09 73 # rgerhards, 2010-03-09
@@ -58,9 +77,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/
58 77
59 $ModLoad ../plugins/imptcp/.libs/imptcp 78 $ModLoad ../plugins/imptcp/.libs/imptcp
60 $MainMsgQueueTimeoutShutdown 10000 79 $MainMsgQueueTimeoutShutdown 10000
61diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 80diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf
62--- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800 81index 77a5d79..d9a14a8 100644
63+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800 82--- a/tests/testsuites/imptcp_large.conf
83+++ b/tests/testsuites/imptcp_large.conf
64@@ -1,7 +1,7 @@ 84@@ -1,7 +1,7 @@
65 # simple async writing test 85 # simple async writing test
66 # rgerhards, 2010-03-09 86 # rgerhards, 2010-03-09
@@ -70,9 +90,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tes
70 90
71 $ModLoad ../plugins/imptcp/.libs/imptcp 91 $ModLoad ../plugins/imptcp/.libs/imptcp
72 $MainMsgQueueTimeoutShutdown 10000 92 $MainMsgQueueTimeoutShutdown 10000
73diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 93diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf
74--- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800 94index de41bc4..7844dc7 100644
75+++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 95--- a/tests/testsuites/imtcp_conndrop.conf
96+++ b/tests/testsuites/imtcp_conndrop.conf
76@@ -1,7 +1,7 @@ 97@@ -1,7 +1,7 @@
77 # simple async writing test 98 # simple async writing test
78 # rgerhards, 2010-03-09 99 # rgerhards, 2010-03-09
@@ -82,9 +103,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/t
82 103
83 $ModLoad ../plugins/imtcp/.libs/imtcp 104 $ModLoad ../plugins/imtcp/.libs/imtcp
84 $MainMsgQueueTimeoutShutdown 10000 105 $MainMsgQueueTimeoutShutdown 10000
85diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 106diff --git a/tests/testsuites/wr_large.conf b/tests/testsuites/wr_large.conf
86--- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800 107index b64f132..b0ae264 100644
87+++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800 108--- a/tests/testsuites/wr_large.conf
109+++ b/tests/testsuites/wr_large.conf
88@@ -1,7 +1,7 @@ 110@@ -1,7 +1,7 @@
89 # simple async writing test 111 # simple async writing test
90 # rgerhards, 2010-03-09 112 # rgerhards, 2010-03-09
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 46eddd604..162d239a1 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
@@ -1,5 +1,5 @@
1From 5c3ba79177f7d1763db33c4358af2af60ff214b7 Mon Sep 17 00:00:00 2001 1From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com> 2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 18 Jun 2014 13:46:52 +0800 3Date: Wed, 18 Jun 2014 13:46:52 +0800
4Subject: [PATCH] use pkgconfig to check libgcrypt 4Subject: [PATCH] use pkgconfig to check libgcrypt
5 5
@@ -10,15 +10,16 @@ libgcrypt does no longer provide libgcrypt-config, and provide
10 10
11Signed-off-by: Roy Li <rongqing.li@windriver.com> 11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13
13--- 14---
14 configure.ac | 15 +-------------- 15 configure.ac | 15 +--------------
15 1 file changed, 1 insertion(+), 14 deletions(-) 16 1 file changed, 1 insertion(+), 14 deletions(-)
16 17
17diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
18index 0f31869..d35db42 100644 19index 62178c3..b56c9c7 100644
19--- a/configure.ac 20--- a/configure.ac
20+++ b/configure.ac 21+++ b/configure.ac
21@@ -777,20 +777,7 @@ AC_ARG_ENABLE(libgcrypt, 22@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt,
22 [enable_libgcrypt=yes] 23 [enable_libgcrypt=yes]
23 ) 24 )
24 if test "x$enable_libgcrypt" = "xyes"; then 25 if test "x$enable_libgcrypt" = "xyes"; then
@@ -40,6 +41,3 @@ index 0f31869..d35db42 100644
40 fi 41 fi
41 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) 42 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
42 AC_SUBST(LIBGCRYPT_CFLAGS) 43 AC_SUBST(LIBGCRYPT_CFLAGS)
43--
442.8.1
45
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
index 7056e1c6a..476540d0a 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
@@ -27,7 +27,6 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
27" 27"
28 28
29SRC_URI_append_libc-musl = " \ 29SRC_URI_append_libc-musl = " \
30 file://0001-Undefine-GLOB_BRACE.patch \
31 file://0001-Include-sys-time-h.patch \ 30 file://0001-Include-sys-time-h.patch \
32" 31"
33 32