meta-security: Convert to new override syntax

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-07-29 16:31:12 -07:00
parent d3a484abf8
commit 11a67b861a
49 changed files with 785 additions and 639 deletions
+3 -3
View File
@@ -25,7 +25,7 @@ PACKAGECONFIG[gcrypt] = "--with-gcrypt, --without-gcrypt, libgcrypt, libgcrypt"
PACKAGECONFIG[mhash] = "--with-mhash, --without-mhash, libmhash, libmhash"
PACKAGECONFIG[e2fsattrs] = "--with-e2fsattrs, --without-e2fsattrs, e2fsprogs, e2fsprogs"
do_install_append () {
do_install:append () {
install -d ${D}${libdir}/${PN}/logs
install -d ${D}${sysconfdir}
install ${WORKDIR}/aide.conf ${D}${sysconfdir}/
@@ -33,9 +33,9 @@ do_install_append () {
CONF_FILE = "${sysconfdir}/aide.conf"
FILES_${PN} += "${libdir}/${PN} ${sysconfdir}/aide.conf"
FILES:${PN} += "${libdir}/${PN} ${sysconfdir}/aide.conf"
pkg_postinst_ontarget_${PN} () {
pkg_postinst_ontarget:${PN} () {
/usr/bin/aide -i
}
RDPENDS_${PN} = "bison, libpcre"
+4 -4
View File
@@ -35,8 +35,8 @@ do_install_ () {
}
INSANE_SKIP_${PN} = "already-stripped"
INSANE_SKIP_${PN}-dev = "ldflags"
INSANE_SKIP:${PN} = "already-stripped"
INSANE_SKIP:${PN}-dev = "ldflags"
RDEPENDS_${PN} = "go"
RDEPENDS_${PN}-dev = "bash"
RDEPENDS:${PN} = "go"
RDEPENDS:${PN}-dev = "bash"
+5 -5
View File
@@ -44,7 +44,7 @@ do_install(){
install -m 640 ${D}/${sysconfdir}/ossec-init.conf ${D}/var/ossec/${sysconfdir}/ossec-init.conf
}
pkg_postinst_ontarget_${PN} () {
pkg_postinst_ontarget:${PN} () {
DIR="/var/ossec"
usermod -g ossec -G ossec -a root
@@ -157,9 +157,9 @@ pkg_postinst_ontarget_${PN} () {
}
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --home-dir /var/ossec -g ossec --shell /bin/false ossec"
GROUPADD_PARAM_${PN} = "--system ossec"
USERADD_PARAM:${PN} = "--system --home-dir /var/ossec -g ossec --shell /bin/false ossec"
GROUPADD_PARAM:${PN} = "--system ossec"
RDEPENDS_${PN} = "openssl bash"
RDEPENDS:${PN} = "openssl bash"
COMPATIBLE_HOST_libc-musl = "null"
COMPATIBLE_HOST:libc-musl = "null"
+2 -2
View File
@@ -8,5 +8,5 @@ EXTRA_OECONF += " \
--with-port=${SAMHAIN_PORT} \
"
RDEPENDS_${PN} = "acl zlib attr bash"
RCONFLICTS_${PN} = "samhain-standalone"
RDEPENDS:${PN} = "acl zlib attr bash"
RCONFLICTS:${PN} = "samhain-standalone"
+3 -3
View File
@@ -10,7 +10,7 @@ SRC_URI += "file://samhain-server-volatiles \
TARGET_CC_ARCH += "${LDFLAGS}"
do_install_append() {
do_install:append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/samhain-server-volatiles.conf \
@@ -25,5 +25,5 @@ do_install_append() {
init/samhain.startLSB ${D}/var/lib/samhain
}
RDEPENDS_${PN} += "gmp bash perl"
RCONFLICTS_${PN} = "samhain-standalone"
RDEPENDS:${PN} += "gmp bash perl"
RCONFLICTS:${PN} = "samhain-standalone"
+4 -4
View File
@@ -6,7 +6,7 @@ SRC_URI += "file://samhain-not-run-ptest-on-host.patch \
PROVIDES += "samhain"
SYSTEMD_SERVICE_${PN} = "samhain.service"
SYSTEMD_SERVICE:${PN} = "samhain.service"
inherit ptest
@@ -18,7 +18,7 @@ do_compile() {
oe_runmake "$@"
}
do_install_append() {
do_install:append() {
ln -sf ${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/samhain
}
@@ -27,5 +27,5 @@ do_install_ptest() {
install ${S}/cutest ${D}${PTEST_PATH}
}
RPROVIDES_${PN} += "samhain"
RCONFLICTS_${PN} = "samhain-client samhain-server"
RPROVIDES:${PN} += "samhain"
RCONFLICTS:${PN} = "samhain-client samhain-server"
+10 -10
View File
@@ -37,7 +37,7 @@ INITSCRIPT_NAME = "${BPN}"
INITSCRIPT_PARAMS ?= "defaults"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "${INITSCRIPT_NAME}.service"
SYSTEMD_SERVICE:${PN} = "${INITSCRIPT_NAME}.service"
SYSTEMD_AUTO_ENABLE = "disable"
# mode mapping:
@@ -67,23 +67,23 @@ PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl"
PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
EXTRA_OEMAKE:append:aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
EXTRA_OEMAKE:append:mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
do_unpack_samhain() {
cd ${WORKDIR}
tar -xzvf samhain-${PV}.tar.gz
}
python do_unpack_append() {
python do_unpack:append() {
bb.build.exec_func('do_unpack_samhain', d)
}
do_configure_prepend_arm() {
do_configure:prepend:arm() {
export sh_cv___va_copy=yes
}
do_configure_prepend_aarch64() {
do_configure:prepend:aarch64() {
export sh_cv___va_copy=yes
}
@@ -91,7 +91,7 @@ do_configure_prepend_aarch64() {
# use the prefix --oldincludedir=/usr/include which is not
# recognized by Samhain's configure script and would invariably
# throw back the error "unrecognized option: --oldincludedir=/usr/include"
do_configure_prepend () {
do_configure:prepend () {
cat << EOF > ${S}/config-site.${BP}
ssp_cv_lib=no
sh_cv_va_copy=yes
@@ -124,13 +124,13 @@ do_configure () {
${EXTRA_OECONF}
}
do_compile_prepend_libc-musl () {
do_compile:prepend:libc-musl () {
sed -i 's/^#define HAVE_MALLOC_H.*//' ${B}/config.h
}
# Install the init script, it's default file, and the extraneous
# documentation.
do_install_append () {
do_install:append () {
oe_runmake install DESTDIR='${D}' INSTALL=install-boot
install -D -m 755 ${WORKDIR}/${INITSCRIPT_NAME}.init \
@@ -165,4 +165,4 @@ do_install_append () {
rm -rf ${D}${localstatedir}/log
}
FILES_${PN} += "${systemd_system_unitdir}"
FILES:${PN} += "${systemd_system_unitdir}"
+7 -7
View File
@@ -60,18 +60,18 @@ do_install () {
install -m 0644 ${WORKDIR}/tripwire.txt ${D}${docdir}/${BPN}
}
do_install_ptest_append () {
do_install_ptest:append () {
install -d ${D}${PTEST_PATH}/tests
cp -a ${S}/src/test-harness/* ${D}${PTEST_PATH}
sed -i -e 's@../../../../bin@${sbindir}@' ${D}${PTEST_PATH}/twtools.pm
}
FILES_${PN} += "${libdir} ${docdir}/${PN}/*"
FILES_${PN}-dbg += "${sysconfdir}/${PN}/.debug"
FILES_${PN}-staticdev += "${localstatedir}/lib/${PN}/lib*.a"
FILES_${PN}-ptest += "${PTEST_PATH}/tests "
FILES:${PN} += "${libdir} ${docdir}/${PN}/*"
FILES:${PN}-dbg += "${sysconfdir}/${PN}/.debug"
FILES:${PN}-staticdev += "${localstatedir}/lib/${PN}/lib*.a"
FILES:${PN}-ptest += "${PTEST_PATH}/tests "
RDEPENDS_${PN} += " perl nano msmtp cronie"
RDEPENDS_${PN}-ptest = " perl lib-perl perl-modules "
RDEPENDS:${PN} += " perl nano msmtp cronie"
RDEPENDS:${PN}-ptest = " perl lib-perl perl-modules "
PNBLACKLIST[tripwire] ?= "Upsteram project appears to be abondoned, fails to build with gcc11"