With DEBUG_BUILD = "1", the following error occurs:
src/relpsess.c:95:1: error:
inlining failed in call to 'relpSessFreePermittedPeers': function not considered for inlining [-Werror=inline]
so use the compiler flag '-Wno-error=inline' for DEBUG_OPTIMIZATION only.
Tracked by upstream bug: https://github.com/rsyslog/librelp/issues/256
but it's looking like a toolchain bug.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Add PACKAGECONFIG to enable dropping capabilities but leave it as disabled
to follow upstream and avoid a systemd issue described below.
rsyslog-8.2302 added a configure option to drop capabilities from
full to:
chown, dac_override, setgid, setuid, setpcap, net_bind_service,
net_admin, ipc_lock, sys_chroot, sys_admin, sys_resource, lease,
syslog, block_suspend
This works fine and passes ptests with sysvinit however
there is a bug when using systemd that breaks some tests:
https://github.com/rsyslog/rsyslog/issues/5091
Therefore only add a non-default PACKAGECONFIG option in keeping
with the rsyslog upstream.
One can install libcap-ng-bin to run pscap to see the capabilities.
Without this option the ptest result with systemd as init is:
Version | Passed | Failed | Skipped
8.2302 | 473 | 0 | 3
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Changelog:
===========
- code cleanup
During the initial librelp implementation it was thought about an
auto-retry feature (whatever that means). Variable bAutoRetry was
created to control that behaviour. It's default was 0 (inactive).
Some code has been written to evaluate that variable and act
accordingly. However, no setter method for this variable was
created and it was also nowhere changed from the default value
of zero. As such, the code activated by it was never used.
This patch now removes both the variable and the few code lines
accessing it. This will have no effect, as the code was never
used.
- testbench: Fix commands in some openssl tests
Those commands were not correctly handeled on AIX, now they are.
- AIX: Changed ERRNO handling after connect in tcp.c
- AIX: Add handling for other ERRNO codes in tcp.c
- bugfix/TCP: relpTcpGetRtryDirection onyl needs to check direction if SSL is active.
- AIX: in relpTcpRcv we need to set RETRY_recv if errno is 0
On AIX 10.x, when a recv call fails with len -1 and errno 0
we can still go into relpTCP_RETRY_recv mode. Testbench on
rsyslog side appears to be finally working with this fix.
On AIX 10.x, same problem as above appear to happen with
connect() as well not setting errno to EINPROGRESS on failure.
rsyslog ptcp driver does not check errno value at all, which is
why we did not have this problem on AIX with rsyslog.
Reduce test message count in receiver-abort.sh to 50000,
because otherwise the test can timeout on very slow machines.
- openssl: fix openssl exit code avoid double free of ctx
When more than one librelp instance are used in the same process,
and the relpTcpExitTLS call was called a second time, the process
could freeze due a double free (See SSL_CTX_free call).
Thanks to David GOUARIN <david.gouarin@thalesgroup.com> for the
discovery and initial fix.
Also added an openssl instance counter to avoid freeing the SSL library
which could be still in use by another librelp instance
in the same process.
- librelp hardening: Fix multiple minor issues causing debugging trouble
- avoid invalid dbgprint calls
- avoid double free in relpTcpDestruct (if called twice).
- add debug output into relpTcpRcv
- OpenSSL: fix depreacted API issues for OpenSSL 3.x
- OpenSSL error strings are loaded automatically now
- Adapted Debug Callback for 3.x
- bugfix: compatiblity problem with openssl 1.1
There were undefined reference to CRYPTO_set_id_callback if system
use openssl 1.1, which lead to load and/or other erros.
- bugfix: Forward return code from relpEngineSetTLSLib to relpEngineSetTLSLibName
Previous situation: In case librelp is compiled without openssl
support but openssl is requested from the user side, then librelp
silently switches to the default tls driver(gnutls).
- bugfix: make relpEngineSetTLSLib debug safe
In case pThis == NULL condition is true at line
- bugfix: warnings reported by coverity scan
- testbench: Added compatiblity to run on AIX
- removed long options from receive send utilities (Not supported on AIX).
- added checks for existing commands in some tests.
- added msleep utility from rsyslog (sleep, timeout etc. not supported on AIX).
- github workflow: Disabled some unrelated tests from rsyslog testbench
- gnutls drvr bugfix: library called exit() under some circumstances
When relpTcpRcv ran into an error, it could call exit() and thus
terminate the calling process.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Package changes mainly include performance improvements to
template processing/json, imptcp, additional functions to openssl, bug fixes and additional/updated tests:
https://github.com/rsyslog/rsyslog/blob/master/ChangeLog
ptest results for qemux86-64 with kvm and increasing filesystem
space to 5GB using IMAGE_ROOTFS_EXTRA_SPACE :
Version | Passed | Failed | Skipped
8.2206 | 465 | 0 | 5
8.2208 | 465 | 1 | 5
The test imfile-statefile-delete.sh is failed because state file
still exists while it should be deleted. Already reported to
rsyslog developers.
Signed-off-by: Zheng Qiu <zheng.qiu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Package changes are mostly bug fixes, and additions to modules/tests:
https://github.com/rsyslog/rsyslog/blob/master/ChangeLog
I removed the md5sum line since it's obsolete.
ptest results for qemux86-64 with kvm and a timeout
of 1000 seconds to allow stress tests to complete:
Version | Passed | Failed | Skipped
8.2106 | 428 | 0 | 5
8.2202 | 456 | 0 | 5
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This patch updates SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls as generated by the conversion script
in OE-Core.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Run test as non-root 'tester'.
Add more rdepends for ptest.
Introduce a patch to skip checking for a libc header:
sys/inotify
Python scripts no longer called with ./script.
Remove the need to add the correct shebang.
Ptest results:
8.2102.0
===============
TOTAL: 424
PASS: 417
SKIP: 5
XFAIL: 0
FAIL: 2
XPASS: 0
ERROR: 0
Remaining failure related to relp:
* imrelp-tls-cfgcmd
* sndrcv_relp_tls-cfgcmd
the test expects an error "relp connect failed with return 10031",
but the connection seems to be established and working.
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
new version no longer includes rsyslog.service,
so I copied over the same from 8.2006.
(git version carries it now in ./platform)
referenced rsyslog (upstream) commit id:
cfd07503ba055100a84d75d1a78a5c6cceb9fdab
Ptest Results: (Timeout 800) (qemux86-64)
2006 2012
================
TOTAL: 411 424
PASS: 361 372
SKIP: 39 41
XFAIL: 0 0
FAIL: 11 11
XPASS: 0 0
ERROR: 0 0
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
0001-fix-jump-misses-init-gcc-8-warning.patch
Removed since this is included in 0.99.9.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The source configure.ac shows:
--enable-valgrind: Enable somes special code that rsyslog core developers
consider useful for testing.Do NOT use if you don't
exactly know what you are doing, except if told so
by rsyslog developers.
NOT to be used by distro maintainers for building regular
packages.
--without-valgrind-testbench:
Don't use valgrind in testbench
PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench'
And after this fix, the code which removes the valgrind depended
ptest cases for arm,mips is no longer needed.
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
since upstream rsyslog commit
7a671da74f
, Alias=syslog.service is removed from service file, which will make
systemctl restart syslog fail since Unit syslog.service not found when
we set rsyslog to default syslog.
And upstream have change the solution about pull 4317, so during next
upgrade, we need to add our own rsyslog.service, refer
83d5710f07
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Add some error handling to run-ptests.
Fix up the new set-envvars script to that 36 new tests pass.
On qemux86-64/kvm the ptest results with extra filesystem
space and a timeout of 800 seconds are:
1911 2002
TOTAL: 389 408
PASS: 339 357
SKIP: 39 39
XFAIL: 0 0
FAIL: 11 12
XPASS: 0 0
ERROR: 0 0
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is a bugfix release:
- bugfix: too late termination of relp Engine on shutdown
When librelp is instructed to shutdown, it processes messages
still present inside its receive buffers. It only terminates
when it needs to wait for new data to arrive.
Depending on RELP and TCP window size and message length,
this may cause many messages to be processed while in shutdown.
Even with default settings, up to 128 messages may be taken off
the wire and be processed.
This is a problem regarding the shutdown timing of a librelp
user (e.g. rsyslog). It may take unexpectedly long to shutdown
the RELP component and as such timeout may occur in the caller
code. This is especially the case if the caller does lengthy
processing when a RELP message is received. Note: It is
perfectly fine for a caller to do this. The problem is that
librelp continues to provide new data for a relatively long
and unexpected period.
This fix ensure that the relp engine shuts down much quicker
when shutdown is requested. It now also checks the shutdown
request while processing already received buffer data.
This problem was detected when working on
see also https://github.com/rsyslog/rsyslog/issues/3941
closes https://github.com/rsyslog/librelp/issues/175
- build system fix: invalid default in configure help text
closes https://github.com/rsyslog/librelp/issues/169
- error message on invalid TLS library request added
This way an invalid TLS library (name) can be detected and the
error presented to the user. So far, invalid library names were
hard to find.
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upgrade rsyslog to latest version for various
fixes including the following CVEs:
CVE: CVE-2019-17040
CVE: CVE-2019-17041
Backported patches for those fixes were removed since
they are contained in v8.1910.0.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Enable imfile-tests even if they take a while.
ptest results for qemux86-64 with kvm and a timeout
of 1000 seconds to allow stress tests to complete:
Recipe | Passed | Failed | Skipped | Time(s)
rsyslog-8.1907.0 | 365 | 4 | 2 | 2452
rsyslog-8.1908.0 | 379 | 4 | 2 | 2538
The failed tests for both 8.1907 and 8.1908 are:
FAIL: Test ./omfile-read-only-errmsg.sh (took 2 seconds)
FAIL: Test ./omfile-read-only.sh (took 2 seconds)
FAIL: Test ./privdropuser.sh (took 580 seconds)
FAIL: Test ./privdropuserid.sh (took 580 seconds)
They are not fixed in this update.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
After autoconf-archive was upgraded to 2019.01.06 it started to add
extra warning flags via WARN_CFLAGS along with -Werror which means that
now compiler could be stricter and break the build if any of the new
warnings are flagged
The difference is
old
WARN_CFLAGS='-fno-strict-aliasing -Wimplicit-function-declaration -Wold-style-definition -Wjump-misses-init -Werror -Wno-suggest-attribute=format -Wunused-parameter -Wmissing-field-initializers'
new
WARN_CFLAGS='-fno-strict-aliasing -Wimplicit-function-declaration -Wold-style-definition -Wjump-misses-init -Wall -Wextra -Wundef -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wreturn-type -Wswitch-enum -Wswitch-default -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -Wnull-dereference -Wdouble-promotion -pedantic -Wunused-parameter -Wmissing-field-initializers -Werror -Wno-suggest-attribute=format -Wunused-parameter -Wmissing-field-initializers'
Hence we started seing build failure like https://errors.yoctoproject.org/Errors/Details/252684/
This fix just turns off warnings-as-errors so build can still go on, if
we need to fix the warnings they still are present in log.do_compile
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Cc: Robert Yang <liezhi.yang@windriver.com>
Remove obsoleted fix-ptest-not-finish patch which is
no longer required after rsyslog commit:
a5b9fbc02 testbench: remove no longer needed .conf files
Add libgcc and python dependencies for ptest:
Testsuite summary for rsyslog 8.1903.0
========================================================================
# TOTAL: 351
# PASS: 309
# SKIP: 38
# XFAIL: 0
# FAIL: 4
# XPASS: 0
# ERROR: 0
for qemux86[-64] when run with ptest-runner -t 800 since some tests
are stress tests and take quite a while to complete.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
With all other configure options at their defaults, the dependency on
libcurl can be removed if fmhttp is configured out. Add an fmhttp
PACKAGECONFIG, still enabled by default, to enable this.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Correct the homepage
* Remove two backported patches
* Backport 0001-testbench-improvements.patch
to fix the below error:
| ../../git/src/tcp.c:3072:57: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1005 [-Werror=format-truncation=]
| snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr);
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Previously there is below logic in rsyslog-8.37.0/tests/Makefile
check-TESTS:
After below commit in automake,
8555e7b81 check: Make 'check-TESTS' target depend on test dependencies
the logic changes to the below:
check-TESTS: $(check_PROGRAMS)
It will result in compiling program on
target when run ptest on target, but
actually there is no need to rebuild the
program on target, so change it back to
"check-TESTS:" to avoid recompiling.
* Update the path of abs_top_builddir
to guarantee the test env is correct.
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
