summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch34
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch37
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch88
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch49
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch41
-rw-r--r--meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb (renamed from meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb)8
6 files changed, 1 insertions, 256 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch
deleted file mode 100644
index 10e2b564cc..0000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 6d575d98565ce3119a14359eecb11ccdff92a303 Mon Sep 17 00:00:00 2001
2From: Yash Shinde <53660251+Yashinde145@users.noreply.github.com>
3Date: Thu, 29 Jun 2023 18:10:15 +0530
4Subject: [PATCH] Fix function inline errors in debug optimization (-Og)
5
6Compiler does not inline any functions when using debug optimization (-Og).
7Hence, remove -Winline flag when compiling with debug optimization.
8
9Signed-off-by: Nicolas Marguet <nicolas.marguet@windriver.com>
10---
11Upstream-Status: Backport [https://github.com/rsyslog/librelp/commit/6d575d9]
12
13 configure.ac | 6 ++++++
14 1 file changed, 6 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
17index 21c1fde..1204c4e 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -230,6 +230,12 @@ if test "$enable_debug" = "no"; then
21 AC_DEFINE(NDEBUG, 1, [Defined if debug mode is disabled.])
22 fi
23
24+#Compiler does not inline any functions when not optimizing(-Og).
25+#Hence, remove -Winline flag when DEBUG is enabled.
26+#ifdef DEBUG
27+WARN_CFLAGS="$(echo "$WARN_CFLAGS" | sed s/-Winline//g)"
28+#endif
29+
30 # valgrind
31 AC_ARG_ENABLE(valgrind,
32 [AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=yes@:>@])],
33--
342.39.0
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch
deleted file mode 100644
index cf4f4080a6..0000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From baf992f82aa987c608731866876adb856847ea45 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 May 2024 18:03:40 -0700
4Subject: [PATCH] relp: fix build against upcoming `gcc-14`
5 (`-Werror=calloc-transposed-args`)
6
7`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
8 detected minor infelicity in `calloc()` API usage
9
10Fixes
11../../git/src/relp.c: In function 'addToEpollSet':
12../../git/src/relp.c:101:39: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
13 101 | CHKmalloc(epd = calloc(sizeof(epolld_t), 1));
14 | ^~~~~~~~
15
16Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/264]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/relp.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/src/relp.c b/src/relp.c
23index eadda36..6268f1d 100644
24--- a/src/relp.c
25+++ b/src/relp.c
26@@ -98,7 +98,7 @@ addToEpollSet(relpEngine_t *const pThis, epolld_type_t typ, void *ptr, int sock,
27 epolld_t *epd = NULL;
28 ENTER_RELPFUNC;
29
30- CHKmalloc(epd = calloc(sizeof(epolld_t), 1));
31+ CHKmalloc(epd = calloc(1, sizeof(epolld_t)));
32 epd->typ = typ;
33 epd->ptr = ptr;
34 epd->sock = sock;
35--
362.45.0
37
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch
deleted file mode 100644
index 3ce5926333..0000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch
+++ /dev/null
@@ -1,88 +0,0 @@
1From 6e9b27f04132287463c89d3be0ce4f506944920d Mon Sep 17 00:00:00 2001
2From: Patrick Williams <patrick@stwcx.xyz>
3Date: Fri, 3 Feb 2023 16:11:29 -0600
4Subject: [PATCH] tcp: fix some compiler warnings with enable-tls-openssl
5
6When --enable-tls=no and --enable-tls-openssl=yes, the following
7compiler errors are reported:
8
9```
10| ../../git/src/tcp.c:3765:1: error: no previous declaration for 'relpTcpGetRtryDirection_gtls' [-Werror=missing-declarations]
11| 3765 | relpTcpGetRtryDirection_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis)
12| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
13| ../../git/src/tcp.c:3583:1: error: 'relpTcpChkPeerName' defined but not used [-Werror=unused-function]
14| 3583 | relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert)
15| | ^~~~~~~~~~~~~~~~~~
16```
17
18Fix these by:
19 1. Add static on the openssl path for relpTcpGetRtryDirection_gtls.
20 2. Move the relpTcpChkPeerName forward declaration to another ifdef
21 leg.
22 3. Wrap relpTcpChkPeerName in gnutls-based ifdef.
23 4. Remove relpTcpChkPeerName_gtls from openssl path.
24
25Upstream-Status: Backport [https://github.com/rsyslog/librelp/pull/255]
26Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
27---
28 src/tcp.c | 11 ++++-------
29 1 file changed, 4 insertions(+), 7 deletions(-)
30
31diff --git a/src/tcp.c b/src/tcp.c
32index 7a75cc4..18cffda 100644
33--- a/src/tcp.c
34+++ b/src/tcp.c
35@@ -132,12 +132,12 @@ callOnErr(const relpTcp_t *__restrict__ const pThis,
36 static int LIBRELP_ATTR_NONNULL() relpTcpGetCN(char *const namebuf, const size_t lenNamebuf, const char *const szDN);
37 #ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
38 static int relpTcpVerifyCertificateCallback(gnutls_session_t session);
39+static int relpTcpChkPeerName(relpTcp_t *const pThis, void* cert);
40 #endif /* #ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION */
41 #if defined(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION) || defined(ENABLE_TLS_OPENSSL)
42 static void relpTcpChkOnePeerName(relpTcp_t *const pThis, char *peername, int *pbFoundPositiveMatch);
43 static int relpTcpAddToCertNamesBuffer(relpTcp_t *const pThis, char *const buf,
44 const size_t buflen, int *p_currIdx, const char *const certName);
45-static int relpTcpChkPeerName(relpTcp_t *const pThis, void* cert);
46 #endif /* defined(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION) || defined(ENABLE_TLS_OPENSSL) */
47
48
49@@ -2820,11 +2820,6 @@ relpTcpLstnInitTLS_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis)
50 {
51 return RELP_RET_ERR_INTERNAL;
52 }
53-static int
54-relpTcpChkPeerName_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis, LIBRELP_ATTR_UNUSED void *vcert)
55-{
56- return RELP_RET_ERR_INTERNAL;
57-}
58 #endif /* defined(ENABLE_TLS)*/
59
60
61@@ -3579,6 +3574,7 @@ finalize_it:
62
63 }
64
65+#ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
66 static int
67 relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert)
68 {
69@@ -3592,6 +3588,7 @@ relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert)
70 #endif /* #ifdef WITH_TLS*/
71 LEAVE_RELPFUNC;
72 }
73+#endif
74
75 static relpRetVal LIBRELP_ATTR_NONNULL()
76 relpTcpAcceptConnReqInitTLS(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED relpSrv_t *const pSrv)
77@@ -3761,7 +3758,7 @@ relpTcpGetRtryDirection_gtls(relpTcp_t *const pThis)
78 return gnutls_record_get_direction(pThis->session);
79 }
80 #else /* #ifdef ENABLE_TLS */
81-relpRetVal LIBRELP_ATTR_NONNULL()
82+static relpRetVal LIBRELP_ATTR_NONNULL()
83 relpTcpGetRtryDirection_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis)
84 {
85 return RELP_RET_ERR_INTERNAL;
86--
872.41.0
88
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch
deleted file mode 100644
index ba081926e1..0000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 2a7e26510cf9276b7e640ca8282cc1c5e46075d0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Aug 2023 11:59:40 -0700
4Subject: [PATCH] tests: Fix callback prototype
5
6clang errors about it
7
8| ../../git/tests/receive.c:71:34: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
9| 71 | hdlr_enable(int sig, void (*hdlr)())
10| | ^
11| | void
12| 1 error generated.
13
14Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/260]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 tests/receive.c | 2 +-
18 tests/send.c | 2 +-
19 2 files changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/tests/receive.c b/tests/receive.c
22index f376cb4..c12e911 100644
23--- a/tests/receive.c
24+++ b/tests/receive.c
25@@ -68,7 +68,7 @@ doSleep(int iSeconds, const int iuSeconds)
26 }
27
28 static void
29-hdlr_enable(int sig, void (*hdlr)())
30+hdlr_enable(int sig, void (*hdlr)(const int))
31 {
32 struct sigaction sigAct;
33 memset(&sigAct, 0, sizeof (sigAct));
34diff --git a/tests/send.c b/tests/send.c
35index d7e90f0..1b1df4f 100644
36--- a/tests/send.c
37+++ b/tests/send.c
38@@ -57,7 +57,7 @@ struct usrdata { /* used for testing user pointer pass-back */
39 struct usrdata *userdata = NULL;
40
41 static void
42-hdlr_enable(int sig, void (*hdlr)())
43+hdlr_enable(int sig, void (*hdlr)(const int))
44 {
45 struct sigaction sigAct;
46 memset(&sigAct, 0, sizeof (sigAct));
47--
482.41.0
49
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch
deleted file mode 100644
index 6fed23c1d1..0000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 5c32487a9c127f37141488d416cdb5d5bec6aca1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 19 Aug 2023 10:24:40 -0700
4Subject: [PATCH] tests: Include missing sys/time.h
5
6This is found when building for musl C library systems where sys/time.h
7is not included indirectly and select() and timeval structs are used
8
9Fixes
10
11../../git/tests/receive.c:64:17: error: variable has incomplete type 'struct timeval'
12 64 | struct timeval tvSelectTimeout;
13 | ^
14../../git/tests/receive.c:64:9: note: forward declaration of 'struct timeval'
15 64 | struct timeval tvSelectTimeout;
16 | ^
17../../git/tests/receive.c:67:2: error: call to undeclared function 'select'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
18 67 | select(0, NULL, NULL, NULL, &tvSelectTimeout);
19 | ^
20
21Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/261]
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 tests/receive.c | 3 ++-
25 1 file changed, 2 insertions(+), 1 deletion(-)
26
27diff --git a/tests/receive.c b/tests/receive.c
28index f376cb4..e20861e 100644
29--- a/tests/receive.c
30+++ b/tests/receive.c
31@@ -33,6 +33,7 @@
32 #include <limits.h>
33 #include <errno.h>
34 #include <signal.h>
35+#include <sys/time.h>
36 #include "librelp.h"
37
38 #define TRY(f) { const int TRY_r = f; if(TRY_r != RELP_RET_OK) { \
39--
402.41.0
41
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb
index 3ccb87a9c5..6bad112e5a 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb
@@ -7,16 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
7DEPENDS = "gmp libidn zlib" 7DEPENDS = "gmp libidn zlib"
8 8
9SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \ 9SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \
10 file://0001-Fix-function-inline-errors-in-debug-optimization-Og.patch \
11 file://0001-tests-Fix-callback-prototype.patch \
12 file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \
13 file://0001-tests-Include-missing-sys-time.h.patch \
14 file://0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch \
15 file://run-ptest \ 10 file://run-ptest \
16" 11"
17 12
18SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396" 13SRCREV = "dab30db5108ef4bb5b6f9135e0428b57be7c4085"
19
20 14
21CVE_PRODUCT = "rsyslog:librelp" 15CVE_PRODUCT = "rsyslog:librelp"
22 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-01 16:03:42 +0000