From 4bbc0d9d9423137eb826d292b6ac35644cac9744 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 20 Sep 2018 20:48:40 -0700 Subject: samhain: update to 4.3.0 Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain-client_4.2.4.bb | 11 -------- recipes-security/samhain/samhain-client_4.3.0.bb | 11 ++++++++ recipes-security/samhain/samhain-server_4.2.4.bb | 20 -------------- recipes-security/samhain/samhain-server_4.3.0.bb | 20 ++++++++++++++ .../samhain/samhain-standalone_4.2.4.bb | 31 ---------------------- .../samhain/samhain-standalone_4.3.0.bb | 31 ++++++++++++++++++++++ recipes-security/samhain/samhain.inc | 4 +-- 7 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 recipes-security/samhain/samhain-client_4.2.4.bb create mode 100644 recipes-security/samhain/samhain-client_4.3.0.bb delete mode 100644 recipes-security/samhain/samhain-server_4.2.4.bb create mode 100644 recipes-security/samhain/samhain-server_4.3.0.bb delete mode 100644 recipes-security/samhain/samhain-standalone_4.2.4.bb create mode 100644 recipes-security/samhain/samhain-standalone_4.3.0.bb diff --git a/recipes-security/samhain/samhain-client_4.2.4.bb b/recipes-security/samhain/samhain-client_4.2.4.bb deleted file mode 100644 index 812408e..0000000 --- a/recipes-security/samhain/samhain-client_4.2.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -INITSCRIPT_PARAMS = "defaults 15 85" - -require samhain.inc - -# Let the default Logserver be 127.0.0.1 -EXTRA_OECONF += " \ - --with-logserver=${SAMHAIN_SERVER} \ - --with-port=${SAMHAIN_PORT} \ - " - -RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-client_4.3.0.bb b/recipes-security/samhain/samhain-client_4.3.0.bb new file mode 100644 index 0000000..812408e --- /dev/null +++ b/recipes-security/samhain/samhain-client_4.3.0.bb @@ -0,0 +1,11 @@ +INITSCRIPT_PARAMS = "defaults 15 85" + +require samhain.inc + +# Let the default Logserver be 127.0.0.1 +EXTRA_OECONF += " \ + --with-logserver=${SAMHAIN_SERVER} \ + --with-port=${SAMHAIN_PORT} \ + " + +RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-server_4.2.4.bb b/recipes-security/samhain/samhain-server_4.2.4.bb deleted file mode 100644 index 9341d44..0000000 --- a/recipes-security/samhain/samhain-server_4.2.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -INITSCRIPT_PARAMS = "defaults 14 86" - -require samhain.inc - -DEPENDS = "gmp" - -SRC_URI += "file://samhain-server-volatiles" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/samhain-server-volatiles \ - ${D}${sysconfdir}/default/volatiles/samhain-server - - install -m 700 samhain-install.sh init/samhain.startLinux \ - init/samhain.startLSB ${D}/var/lib/samhain -} - -RDEPENDS_${PN} += "gmp bash perl" diff --git a/recipes-security/samhain/samhain-server_4.3.0.bb b/recipes-security/samhain/samhain-server_4.3.0.bb new file mode 100644 index 0000000..9341d44 --- /dev/null +++ b/recipes-security/samhain/samhain-server_4.3.0.bb @@ -0,0 +1,20 @@ +INITSCRIPT_PARAMS = "defaults 14 86" + +require samhain.inc + +DEPENDS = "gmp" + +SRC_URI += "file://samhain-server-volatiles" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/samhain-server-volatiles \ + ${D}${sysconfdir}/default/volatiles/samhain-server + + install -m 700 samhain-install.sh init/samhain.startLinux \ + init/samhain.startLSB ${D}/var/lib/samhain +} + +RDEPENDS_${PN} += "gmp bash perl" diff --git a/recipes-security/samhain/samhain-standalone_4.2.4.bb b/recipes-security/samhain/samhain-standalone_4.2.4.bb deleted file mode 100644 index 4fed9e9..0000000 --- a/recipes-security/samhain/samhain-standalone_4.2.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -require samhain.inc - -SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ - file://run-ptest \ -" - -PROVIDES += "samhain" - -SYSTEMD_SERVICE_${PN} = "samhain.service" - -inherit ptest - -do_compile() { - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'yes', 'no', d)}" = "yes" ]; then - oe_runmake cutest - rm -f ${S}*.o config_xor.h internal.h - fi - oe_runmake "$@" -} - -do_install_append() { - ln -sf ${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/samhain -} - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH} - install ${S}/cutest ${D}${PTEST_PATH} -} - -RPROVIDES_${PN} += "samhain" -RCONFLICTS_${PN} = "samhain-client samhain-server" diff --git a/recipes-security/samhain/samhain-standalone_4.3.0.bb b/recipes-security/samhain/samhain-standalone_4.3.0.bb new file mode 100644 index 0000000..4fed9e9 --- /dev/null +++ b/recipes-security/samhain/samhain-standalone_4.3.0.bb @@ -0,0 +1,31 @@ +require samhain.inc + +SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ + file://run-ptest \ +" + +PROVIDES += "samhain" + +SYSTEMD_SERVICE_${PN} = "samhain.service" + +inherit ptest + +do_compile() { + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'yes', 'no', d)}" = "yes" ]; then + oe_runmake cutest + rm -f ${S}*.o config_xor.h internal.h + fi + oe_runmake "$@" +} + +do_install_append() { + ln -sf ${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/samhain +} + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH} + install ${S}/cutest ${D}${PTEST_PATH} +} + +RPROVIDES_${PN} += "samhain" +RCONFLICTS_${PN} = "samhain-client samhain-server" diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index e127e91..944bf0d 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc @@ -19,8 +19,8 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://samhain.service \ " -SRC_URI[md5sum] = "08863fad583acc7293ef29b4528c837e" -SRC_URI[sha256sum] = "0cd779b3666264e1f370f7ec37891f680b4caa04895fab8c5aa9a52e41ec885d" +SRC_URI[md5sum] = "a00e99375675fc6e50cca3e208f5207e" +SRC_URI[sha256sum] = "8551dc3b0851889a2b979097e9c02309b40d48b4659f02efe7fe525ce8361a0d" UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html" UPSTREAM_CHECK_REGEX = "samhain_signed-(?P(\d+(\.\d+)+))\.tar" -- cgit v1.2.3-54-g00ecf