rsyslog: upgrade 8.2506.0 -> 8.2510.0

Full Changelog:
   https://github.com/rsyslog/rsyslog/blob/v8-stable/ChangeLog

Avoid buildpath error:
   QA Issue: File /usr/lib/rsyslog/ptest/tests/.deps/liboverride_getaddrinfo_la-override_getaddrinfo.Plo
These .deps directories are created at configure time and mainly used
in an interactive development environment. Remove test/.deps to eliminate
the error.

Drop: use-pkgconfig-to-check-libgcrypt.patch
since it's implemented upstream by:
   85e03c0e8 Replace libgcrypt-config with pkg-config
   8ba35bf6c Add missing libraries to pkg-config call
as per: https://github.com/rsyslog/rsyslog/pull/5406/commits

For musl, drop: 0001-Include-sys-time-h.patch
which oddly doesn't seem to be required to build any of: qemux86-64, qemuarm64,
and qemuarm.

Rebase other patches as needed.

ptest results for qemux86-64/kvm with extra FS space and 2 GB RAM:

   Version | Total | Passed | Failed | Skipped
   8.2506  |   485 |    479 |      0 |       6
   8.2510  |   497 |    491 |      0 |       6

rsyslog works when built with musl but there are lots of ptest failures:

   Version | Total | Passed | Failed | Skipped
   8.2506  |   485 |    306 |    172 |       7
   8.2510  |   497 |    310 |    180 |       7

Note that with this update the results are similarily bad. If someone is
interested and has time, they can work on improving the musl ptest results.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 16 insertions, 90 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
deleted file mode 100644
index 6ce8b7a9c8..0000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
index a506b7a6dc..728cdace0c 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
@@ -23,19 +23,19 @@ diff --git a/tests/diag.sh b/tests/diag.sh
 index a9c2a75..0b017c5 100755
 --- a/tests/diag.sh
 +++ b/tests/diag.sh
-@@ -2979,7 +2979,7 @@ case $1 in
+@@ -3683,7 +3683,7 @@
                 fi
                 ;;
-        'check-inotify') # Check for inotify/fen support 
+        'check-inotify') # Check for inotify/fen support
 -               if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then
 +               if true; then
                         echo [inotify mode]
                 elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
                         grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
-@@ -2994,7 +2994,7 @@ case $1 in
+@@ -3698,7 +3698,7 @@
                 fi
                 ;;
-        'check-inotify-only') # Check for ONLY inotify support 
+        'check-inotify-only') # Check for ONLY inotify support
 -               if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then
 +               if true; then
                         echo [inotify mode]
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
index 884086bfc3..76749877b6 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
@@ -21,12 +21,12 @@ diff --git a/tests/tcpflood.c b/tests/tcpflood.c
 index 5e6f13a..09cedbb 100644
 --- a/tests/tcpflood.c
 +++ b/tests/tcpflood.c
-@@ -836,7 +836,7 @@ int sendMessages(struct instdata *inst)
-                        }
-                        lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
-                } else if(transport == TP_UDP) {
--                       lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
-+                       lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr));
-                        error_number = errno;
-                } else if(transport == TP_TLS) {
-                        if(sockArray[socknum] == -1) {
+@@ -865,7 +865,7 @@
+             }
+             lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
+         } else if (transport == TP_UDP) {
+-            lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
++            lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr));
+             error_number = errno;
+         } else if (transport == TP_TLS) {
+             if (sockArray[socknum] == -1) {
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
deleted file mode 100644
index f5ae65fb58..0000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001
-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]
-
-libgcrypt does no longer provide libgcrypt-config, and provide
-*.pc, so we should use pkgconfig to check
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
----
- configure.ac | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8c0ac8..794bfb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt,
-         [enable_libgcrypt=yes]
- )
- if test "x$enable_libgcrypt" = "xyes"; then
--       AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
--        if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
--           AC_MSG_FAILURE([libgcrypt-config not found in PATH])
--        fi
--        AC_CHECK_LIB(
--               [gcrypt],
--               [gcry_cipher_open],
--               [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
--               LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
--               ],
--               [AC_MSG_FAILURE([libgcrypt is missing])],
--               [`${LIBGCRYPT_CONFIG} --libs --cflags`]
--               )
--       AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present])
-+       PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
- fi
- AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
- AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2506.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2510.0.bb
index bcac76a231..c92c11d8f3 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2506.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2510.0.bb
@@ -22,17 +22,15 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
            file://rsyslog.conf \
            file://rsyslog.logrotate \
            file://rsyslog.service \
-           file://use-pkgconfig-to-check-libgcrypt.patch \
            file://run-ptest \
            file://0001-tests-disable-the-check-for-inotify.patch \
            file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \
 "
 
 SRC_URI:append:libc-musl = " \
-    file://0001-Include-sys-time-h.patch \
     file://disable-omfile-outchannel.patch \
 "
-SRC_URI[sha256sum] = "6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b"
+SRC_URI[sha256sum] = "a70a9834186859539a6a4d1c7b3f68c23897e805829b764a45e92cb0cc95e66a"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -92,6 +90,8 @@ TESTDIR = "tests"
 do_compile_ptest() {
     echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
     oe_runmake -C ${TESTDIR} buildtest-TESTS
+    # buildpaths: remove .deps/*, an unneeded compile dependency automake artifact.
+    rm -rf ${B}/${TESTDIR}/.deps
 }
 
 do_install_ptest() {