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>
Add PACKAGECONFIG for imjournal, and add corresponding configuration
to /etc/rsyslog.d/imjournal.conf when it's enabled. Default to disable it.
This patch also enables rsyslog.conf to include configuration files
/etc/rsyslog.d/*.conf.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
I've met the following compilation error.
| ../git/json_object.c:415:3: error: jump skips variable initialization [-Werror=jump-misses-init]
Backport a patch to fix it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The logrotate.rsyslog file uses 'cat /var/run/rsyslogd.pid' to
determine the pid of rsyslogd daemon. This is incorrect, because
rsyslogd may start in a way that does not create rsyslog.pid file.
Failing to send HUP signal to rsyslogd daemon will result in
unexpected behaviour. e.g. rsyslogd is writing to /var/log/messages-xxxx
instead of /var/log/messages.
We should really use pkill to send HUP signal to rsyslogd to ensure
correct behaviour.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
If libgcry.la is built later than lmcry_gcry.la, there is a failure:
[snip]
|../aarch64-wrs-linux-libtool --tag=CC --mode=link aarch64-wrs-linux-gcc
-o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt
|aarch64-wrs-linux-libtool: error: cannot find the library 'libgcry.la'
or unhandled argument 'libgcry.la'
|Makefile:1049: recipe for target 'lmcry_gcry.la' failed
|make[2]: *** [lmcry_gcry.la] Error 1
[snip]
The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la
to lmcry_gcry.la's DEPENDENCIES.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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>
Drop two patches:
CVE-2017-12588.patch
0001-core-bugfix-segfault-after-configuration-errors.patch
since they are included in 8.29.
Update the testbench configuration flags.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Previously we used update-alternatives to manage this configuration file,
creating link under /etc/logrotate.d/ directory.
However, we later dropped the update-alternatives approach and explicitly
setting rsyslog to conflict with other syslog providers.
So we need to install the logrotate configuration file under /etc/logrotate.d
to make things right.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Backport a patch to fix CVE-2017-12588.
The zmq3 input and output modules in rsyslog before 8.28.0 interpreted
description fields as format strings, possibly allowing a format string
attack with unspecified impact.
Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-12588
CVE: CVE-2017-12588
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
- struct timeval is defined in sys/time.h with a musl libc.
- GLOB_BRACE is not defined in posix and thus not implemented in musl libc.
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
rsyslog uses a small program to check if compiler has atomic builtins
or not. This does not work when cross compiling, resulting in potential
race issue. In fact, when running ptest on intel-x86-64 board, we have
met the race problem.
As our compiler gcc, has atomic builtins, we force ap_cv_atomic_builtins
to be 'yes' so that rsyslog could make use of the atomic builtins and avoid
the race issue.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
enable_tls_ptests.patch is removed as the problem has been fixed in new version.
fix_build_with_musl.patch is removed as it's no longer suitable.
The file it fixes is not even there any more.
Several necessary runtime dependencies are added to rsyslog-ptest.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This is a project under rsyslog. Add its recipe as it's needed by
the new version of rsyslog.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This is a project under rsyslog. Add its recipe as it's needed
by new version of rsyslog.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* fix CVEs CVE-2014-3634, CVE-2014-3683
* rebase the patch use-pkgconfig-to-check-libgcrypt.patch
* backport fixes for build error:
lexer.l:34:14: error: expected identifier or '(' before '__extension__'
* replace the old configure option '--enable-cached-man-pages' with
'--disable-generate-man-pages'
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
After rsyslog updated to 7.6.1, ptest fails to build & run since the
serial-tests config patch was dropped:
- rsyslog-use-serial-tests-config-needed-by-ptest.patch
This patch involved serial test harness:
+ AM_INIT_AUTOMAKE([serial-tests])
Which is deprecated in favour of parallel test harness. Automake
generated a parallel test harness by default. It features automatic
collection of the test scripts output in .log files ...
More details please refer to:
http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html
To enable the ptest with new changes, we should:
* add target 'buildtest-TESTS' for building test components;
* fix 'top_srcdir' and install required script 'test-driver';
* run testcases with target 'check-TESTS'.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1. remove two backport patch: 0001-bugfix-potential-abort-during-HUP.patch
and 0001-remove-memleak-introduced-by-GenerateLocalHostName-H.patch
2. update the patch json-0.12-fix.patch
3. remove a obsolete patch rsyslog-use-serial-tests-config-needed-by-ptest.patch
4. update the Dependence
5. update the checksum
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Backport <commit 9a775051f7373176c6e54bee1110965342dd41ad> and
<commit 17e1ee2539cea6bac16832b488afd52b20a348ac> from rsyslog
upstream <https://github.com/rsyslog/rsyslog> to solve issue:
rsyslog segmentation fault when heavy load.
Solve the race condition in GenerateLocalHostNameProperty between the
prop.Destruct(&propLocalHostName) and prop.Construct(&propLocalHostName).
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
All the other syslogd implementations use 'syslogd' as update alternatives
group name. So rsyslogd should use this too.
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Send HUP signal instead of calling the reload command
of init script in logrotate configure file, so that it
also works when the init system is systemd.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
We use the default file permission root:adm for syslog-ng,
so set the same for rsyslog.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Changed:
- add a patch to use serial-tests config needed by ptest
- add a patch to fix rsyslog test cases don't finish issue
- add run-ptest, do_compile_ptest and do_install_ptest
- add dependency for rsyslog-ptest
- add PACKAGECONFIG for valgrind
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Use ALTERNATIVE mechanism in OE to manage the syslog service to
avoid conflicts with other syslog implementations like sysklogd
or busybox.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Use syslog as the default symlink and INITSCRIPT_NAME
just as sysklogd and syslog-ng did.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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: Martin Jansa <Martin.Jansa@gmail.com>
Vincent Prince
Randy MacLeod
Mingli Yu
Brad Bishop
Chen Qi
Hongxu Jia
Khem Raj
changqing.li@windriver.com
Yi Zhao
Ovidiu Panait
Ming Liu
Peter Kjellerstedt
Markus Lehtonen
Joshua Lock
Wenzong Fan
Ross Burton
Tudor Florea
Martin Jansa
Roy Li
Yue Tao
Li Zhou
Steffen Sledz
Jackie Huang