From 8a7b75905791ed6d51109c5de0a96e067f20d511 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 31 Oct 2016 17:40:00 -0700 Subject: samhain: update to 4.2.0 * Changes: - New option 'SetAuditdFlags = r|w|x|a' to (re-)define the flags supplied to auditd. - New option 'PortCheckDevice = device' for the port check module, to monitor a device regardless of the address assigned to it. - Fix for the case sensitivity of the arguments to the Severity/Class options. - Compiler warnings with gcc 6.2 and a few minor bugs have been fixed. Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain-client_4.1.5.bb | 15 ------- recipes-security/samhain/samhain-client_4.2.0.bb | 15 +++++++ recipes-security/samhain/samhain-server_4.1.5.bb | 54 ------------------------ recipes-security/samhain/samhain-server_4.2.0.bb | 54 ++++++++++++++++++++++++ recipes-security/samhain/samhain.inc | 4 +- 5 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 recipes-security/samhain/samhain-client_4.1.5.bb create mode 100644 recipes-security/samhain/samhain-client_4.2.0.bb delete mode 100644 recipes-security/samhain/samhain-server_4.1.5.bb create mode 100644 recipes-security/samhain/samhain-server_4.2.0.bb diff --git a/recipes-security/samhain/samhain-client_4.1.5.bb b/recipes-security/samhain/samhain-client_4.1.5.bb deleted file mode 100644 index 4b04326..0000000 --- a/recipes-security/samhain/samhain-client_4.1.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -SAMHAIN_MODE="client" -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} \ - --with-config-file=/etc/samhainrc \ - --with-data-file=/var/samhain/samhain.data \ - --with-pid-file=/var/samhain/samhain.pid \ - " - -RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-client_4.2.0.bb b/recipes-security/samhain/samhain-client_4.2.0.bb new file mode 100644 index 0000000..4b04326 --- /dev/null +++ b/recipes-security/samhain/samhain-client_4.2.0.bb @@ -0,0 +1,15 @@ +SAMHAIN_MODE="client" +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} \ + --with-config-file=/etc/samhainrc \ + --with-data-file=/var/samhain/samhain.data \ + --with-pid-file=/var/samhain/samhain.pid \ + " + +RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-server_4.1.5.bb b/recipes-security/samhain/samhain-server_4.1.5.bb deleted file mode 100644 index 35f8775..0000000 --- a/recipes-security/samhain/samhain-server_4.1.5.bb +++ /dev/null @@ -1,54 +0,0 @@ -SAMHAIN_MODE="server" -INITSCRIPT_PARAMS = "defaults 14 86" - -require samhain.inc - -DEPENDS = "gmp samhain-server-native" - -EXTRA_OECONF += "--enable-network=${SAMHAIN_MODE} " - -# supports mysql|postgresql|oracle|odbc but postgresql is the only one available - -PACKAGECONFIG ??= "postgresql" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" - -PACKAGECONFIG[postgres] = "--with-database=postgresql --enable-xml-log, "", postgresql" -PACKAGECONFIG[suidcheck] = "--enable-suidcheck","" , " -PACKAGECONFIG[logwatch] = "--enable-login-watch,"" , " -PACKAGECONFIG[mounts] = "--enable-mounts-check","" , " -PACKAGECONFIG[userfiles] = "--enable-userfiles","" , " -PACKAGECONFIG[ipv6] = "--enable-ipv6,"--disable-ipv6"," -PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux" -PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl" - -SRC_URI += "file://samhain-server-volatiles" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF += " \ - --with-config-file=REQ_FROM_SERVER/etc/samhainrc \ - --with-data-file=REQ_FROM_SERVER/var/lib/samhain/samhain_file \ - " - -do_install_append() { - cd ${S} - 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 -} - -PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" - -FILES_${PN} += "${sbindir}/*" - -FILES_${PN}-dbg += " \ - ${sbindir}/.debug/* \ - " - -RDEPENDS_${PN} += "gmp bash perl" -BBCLASSEXTEND = "native" diff --git a/recipes-security/samhain/samhain-server_4.2.0.bb b/recipes-security/samhain/samhain-server_4.2.0.bb new file mode 100644 index 0000000..35f8775 --- /dev/null +++ b/recipes-security/samhain/samhain-server_4.2.0.bb @@ -0,0 +1,54 @@ +SAMHAIN_MODE="server" +INITSCRIPT_PARAMS = "defaults 14 86" + +require samhain.inc + +DEPENDS = "gmp samhain-server-native" + +EXTRA_OECONF += "--enable-network=${SAMHAIN_MODE} " + +# supports mysql|postgresql|oracle|odbc but postgresql is the only one available + +PACKAGECONFIG ??= "postgresql" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" + +PACKAGECONFIG[postgres] = "--with-database=postgresql --enable-xml-log, "", postgresql" +PACKAGECONFIG[suidcheck] = "--enable-suidcheck","" , " +PACKAGECONFIG[logwatch] = "--enable-login-watch,"" , " +PACKAGECONFIG[mounts] = "--enable-mounts-check","" , " +PACKAGECONFIG[userfiles] = "--enable-userfiles","" , " +PACKAGECONFIG[ipv6] = "--enable-ipv6,"--disable-ipv6"," +PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux" +PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl" + +SRC_URI += "file://samhain-server-volatiles" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF += " \ + --with-config-file=REQ_FROM_SERVER/etc/samhainrc \ + --with-data-file=REQ_FROM_SERVER/var/lib/samhain/samhain_file \ + " + +do_install_append() { + cd ${S} + 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 +} + +PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" + +FILES_${PN} += "${sbindir}/*" + +FILES_${PN}-dbg += " \ + ${sbindir}/.debug/* \ + " + +RDEPENDS_${PN} += "gmp bash perl" +BBCLASSEXTEND = "native" diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index 7987886..789150b 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc @@ -9,8 +9,8 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://${INITSCRIPT_NAME}.default \ " -SRC_URI[md5sum] = "bdb6d2653d706f3180e37ef3d95c824d" -SRC_URI[sha256sum] = "4ff4c38765c942abbaac2577df4c8c4940482a1bffc4a719f181c4fca6f173a7" +SRC_URI[md5sum] = "d98a55646b14f9419fcedde909d1bf02" +SRC_URI[sha256sum] = "6b2db91fc92b3a9fc2edcc6ee16438156753c05f69c114856289e9f25ba0e50a" S = "${WORKDIR}/samhain-${PV}" -- cgit v1.2.3-54-g00ecf