Commit Graph

26 Commits

Author SHA1 Message Date
Martin Jansa
cd816688c5 k3s, kubernetes, nagios-nrpe: fix Upstream-Status formatting
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-05-08 18:41:38 -04:00
Bruce Ashfield
2119189361 treewide: bulk update patches with status field
While the insane.bbclass upstream-status check hasn't been made
default, users of meta-virtualization may have it enabled in their
distros .. so the effect is the same. We must have this tracking
tag in out patches.

This is a bulk update to add the tag and silence the QA message.

As packages get updated, the normal/routine process of checking
the patches will continue, and the status fields may (or may not)
get more useful.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-01-27 10:32:06 -05:00
Bruce Ashfield
108e089f7e global: update licence values to SPDX values
These changes are the result of running the convert-spdx-licenses.py
oe-core script.

There's no impact to the build, but we will avoid issues when
interacting with core QA by the alignment.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-02-18 13:07:10 -05:00
Bruce Ashfield
48c9b9a891 nagios: update to use SKIP_RECIPE
oe-core has remove PNBLACKLIST in favour of SKIP_RECIPE, so we update
our recipe accordingly to avoid warnings.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-02-04 12:21:32 -05:00
Bruce Ashfield
d876cfc5bf global: overrides syntax conversion
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.

This is pass one of updating the meta-virt recipes to use that
syntax.

This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions

Note: A recent bitbake is required:

    commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
    Author: Richard Purdie <richard.purdie@linuxfoundation.org>
    Date:   Sun Jul 18 12:59:15 2021 +0100

        bitbake: data_smart/parse: Allow ':' characters in variable/function names

        It is becomming increasingly clear we need to find a way to show what
        is/is not an override in our syntax. We need to do this in a way which
        is clear to users, readable and in a way we can transition to.

        The most effective way I've found to this is to use the ":" charater
        to directly replace "_" where an override is being specified. This
        includes "append", "prepend" and "remove" which are effectively special
        override directives.

        This patch simply adds the character to the parser so bitbake accepts
        the value but maps it back to "_" internally so there is no behaviour
        change.

        This change is simple enough it could potentially be backported to older
        version of bitbake meaning layers using the new syntax/markup could
        work with older releases. Even if other no other changes are accepted
        at this time and we don't backport, it does set us on a path where at
        some point in future we could
        require a more explict syntax.

        I've tested this patch by converting oe-core/meta-yocto to the new
        syntax for overrides (9000+ changes) and then seeing that builds
        continue to work with this patch.

        (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)

        Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-08-02 17:17:53 -04:00
hongxu
6459b6544b Revert "nagios-nsca: blacklist recipe due to unsupported libmcrypt"
The libmcrypt build issue has been fixed by oe

This reverts commit e7a0ea3e0f.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-07-07 15:42:17 -04:00
Martin Jansa
32267ea487 nagios-*: add conditional PNBLACKLIST, because of the dependency on meta-webserver
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-04-06 20:34:26 -04:00
Changqing Li
2238294987 nagios-core: update RDEPENDS
fix following error during do_rootfs:
nothing provides php needed by nagios-core-4.4.6-r0.corei7_64
(try to add '--skip-broken' to skip uninstallable packages)

Since commit c4ffcaa2 [php: split out phpdbg into a separate package],
package php is empty.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-03-09 22:35:41 -05:00
Yi Fan Yu
e7a0ea3e0f nagios-nsca: blacklist recipe due to unsupported libmcrypt
nagios-nsca depends on libmcrypt...
However, libmcrypt is considered as abandonware
The last release was in 2007.

libmcrypt might not be building properly with
the upgrade of autoconf to 2.71.

Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-02-07 08:48:39 -05:00
sakib.sajal@windriver.com
968e4116a8 nagios-core: fix do_install during cross builds
Upstream started stripping built binaries by default, using
HOSTTOOLS install to strip binaries that are different in
architecture from the host, raising errors:

strip: Unable to recognise the format of the input file
TOPDIR/tmp-glibc/hosttools/install: strip process terminated abnormally

Hence, build unstripped binaries and let oe build system
strip the binaries during do_package.

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-11-19 11:05:44 -05:00
sakib.sajal@windriver.com
af5ed18c97 nagios-core: uprev v4.4.3 -> v4.4.6
Minor upgrade including bug and CVE fixes namely CVE-2020-13977

Testing:
Built, booted and started nagios-core service without any errors.

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-11-03 16:29:42 -05:00
Chen Qi
d47e7143e0 nagios-core: use /run instead of /var/run in systemd service file
/var/run has been deprecated by systemd, so use /run instead,
as suggested by systemd.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-10-27 23:24:47 -04:00
Chen Qi
3f8f47e31e nagios-nsca: use /run instead of /var/run in systemd service file
/var/run has been deprecated by systemd, so use /run instead,
as suggested by systemd.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-10-27 23:24:47 -04:00
Chen Qi
4d7eadcf5b nagios-core: fix build failure for gcc-10
gcc-10 uses '-fno-common' by default, which results in build
error complaining multiple definition.

Use '-fcommon' to fix this problem.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-09-02 16:30:40 -04:00
sakib.sajal@windriver.com
22e3282ee2 nagios-nrpe: Fix CVE-2020-6581
Backport fix for CVE-2020-6581

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-05-02 11:04:48 -04:00
sakib.sajal@windriver.com
b24e0b8cda nagios-nrpe: uprev v3.2.1 => v4.0.2
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-04-15 15:26:54 -04:00
Kai Kang
30e3de60e7 nagios-nrpe: fix compile error when packageconfig ssl enabled
It fails to compile nagios-nrpe when packageconfig ssl enabled:

| ./nrpe.c:45:12: fatal error: ../include/dh.h: No such file or directory
|    45 | #  include "../include/dh.h"
|       |            ^~~~~~~~~~~~~~~~~
| compilation terminated.

Header file include/dh.h is created by native openssl called by
configure script. If no native openssl exists, no header file is
created. Add openssl-native to dependency for packageconfig ssl.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-12-29 22:09:03 -05:00
Changqing Li
91c23e6a9c nagios-core/nagios-nrpe: use update-alternatives for /var/nagios
fix below error:
Error: Transaction check error:
  file /var/nagios from install of nagios-core-4.4.3-r0.core2_64 conflicts with file from package nagios-nrpe-daemon-3.2.1-r0.core2_64

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-08-06 23:13:58 -04:00
Changqing Li
39443a1f93 nagios-nrpe: fix systemd service start failed
Jun 06 01:44:51 qemux86 systemd[1]: Started Nagios nrpe plugin.
Jun 06 01:44:51 qemux86 nrpe[1263]: Starting up daemon
Jun 06 01:44:51 qemux86 nrpe[1263]: Cannot write to pidfile '/var/nagios/nrpe.pid' - check your privileges.
Jun 06 01:44:51 qemux86 systemd[1]: nagios-nrpe.service: Main process exited, code=exited, status=2/INVALIDARGUMENT
Jun 06 01:44:51 qemux86 systemd[1]: nagios-nrpe.service: Failed with result 'exit-code'

In configuration file /etc/nagios/nrpe.cfg, the pidfile is under /var/nagios.

fix by stop rm the /var/nagios, and include it into daemon packages

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-06-10 09:55:27 -04:00
Chen Qi
3c80794f80 nagios-core: add CVE_PRODUCT
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-05-10 16:41:52 -04:00
Hongzhi.Song
2f600a9df3 nagios-core: uprev to v4.4.3
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-03-17 00:19:07 +00:00
Hongzhi.Song
b3e9a2b333 nagios-nsca: uprev to v2.9.2
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-03-17 00:19:07 +00:00
Chen Qi
f857b21163 nagios-plugins: add recipe with latest stable version 2.2.1
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2018-09-06 12:45:17 -04:00
Chen Qi
61a90af162 nagios-nsca: add recipe with latest stable version 2.9.1
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2018-09-06 12:45:17 -04:00
Chen Qi
a73f7b18bc nagios-nrpe: add recipe with latest stable version 3.2.1
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2018-09-06 12:45:17 -04:00
Chen Qi
7929c468f0 nagios-core: add recipe with latest stable version 4.4.2
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2018-09-06 12:45:17 -04:00