summaryrefslogtreecommitdiff
path: root/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
diff options
context:
space:
mode:
authorjeff <jhatch@multitech.com>2023-01-24 09:37:57 -0600
committerjeff <jhatch@multitech.com>2023-01-24 09:37:57 -0600
commitc94c9986362ebf4084734a3963415c5d894cf3a6 (patch)
tree1f5d79df115e23318d93bfc9e99dddecf9be8748 /recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
parent8400520cffdd3c133c684eac60ab438a7ecaa050 (diff)
parent2eaa3fd064097eb221b56d5df0e7136ba705a0cd (diff)
downloadmeta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.gz
meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.bz2
meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.zip
Merge branch 'md/cve-fixes2-squashed' into 6
Diffstat (limited to 'recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch')
-rw-r--r--recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
new file mode 100644
index 0000000..6ce8b7a
--- /dev/null
+++ b/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
@@ -0,0 +1,32 @@
+From 7baf35b88d742032a2dc456c396843e17e866f8e Mon Sep 17 00:00:00 2001
+From: Ming Liu <peter.x.liu@external.atlascopco.com>
+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.
+
+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 98dbece..96f6950 100644
+--- a/tests/msleep.c
++++ b/tests/msleep.c
+@@ -26,11 +26,7 @@
+ #include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if defined(__FreeBSD__)
+ #include <sys/time.h>
+-#else
+-#include <time.h>
+-#endif
+ #if defined(HAVE_SYS_SELECT_H)
+ #include <sys/select.h>
+ #endif
+2.7.4