From b8319ce072e1af291bb55adecaaa6c222499c3a5 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 4 Jun 2016 16:10:56 -0700 Subject: samhain: update to 4.1.4 4.1.4: - Fix for issues with re-evaluation of paths with wildcard patterns: - no re-evaluation if no match at process startup - if same pattern used for a file=.. and dir=.. directive, only one (the first in config file) is re-evaluated - Fix for issues with new directories created when inotify is used: - recursion depth is not properly set for new directory - directory gets watched even if recursion depth should be below zero 4.1.3: - Fix for a regression in DNS resolving if samhain is compiled with '--enable-static' - On Cygwin/Windows, the default for the 'AvoidBlock' option is now 'off' because of problems reported for this platform. Signed-off-by: Armin Kuster Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain-client_4.1.2.bb | 22 ---------- recipes-security/samhain/samhain-client_4.1.4.bb | 22 ++++++++++ recipes-security/samhain/samhain-server_4.1.2.bb | 52 ------------------------ recipes-security/samhain/samhain-server_4.1.4.bb | 52 ++++++++++++++++++++++++ recipes-security/samhain/samhain.inc | 4 +- 5 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 recipes-security/samhain/samhain-client_4.1.2.bb create mode 100644 recipes-security/samhain/samhain-client_4.1.4.bb delete mode 100644 recipes-security/samhain/samhain-server_4.1.2.bb create mode 100644 recipes-security/samhain/samhain-server_4.1.4.bb (limited to 'recipes-security/samhain') diff --git a/recipes-security/samhain/samhain-client_4.1.2.bb b/recipes-security/samhain/samhain-client_4.1.2.bb deleted file mode 100644 index bb47449..0000000 --- a/recipes-security/samhain/samhain-client_4.1.2.bb +++ /dev/null @@ -1,22 +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 \ - " - - -INSANE_SKIP_${PN} = "already-stripped" - -FILES_${PN} += "\ - /run \ - " - -RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-client_4.1.4.bb b/recipes-security/samhain/samhain-client_4.1.4.bb new file mode 100644 index 0000000..bb47449 --- /dev/null +++ b/recipes-security/samhain/samhain-client_4.1.4.bb @@ -0,0 +1,22 @@ +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 \ + " + + +INSANE_SKIP_${PN} = "already-stripped" + +FILES_${PN} += "\ + /run \ + " + +RDEPENDS_${PN} = "acl zlib attr bash" diff --git a/recipes-security/samhain/samhain-server_4.1.2.bb b/recipes-security/samhain/samhain-server_4.1.2.bb deleted file mode 100644 index df78f63..0000000 --- a/recipes-security/samhain/samhain-server_4.1.2.bb +++ /dev/null @@ -1,52 +0,0 @@ -SAMHAIN_MODE="server" -INITSCRIPT_PARAMS = "defaults 14 86" - -require samhain.inc - -DEPENDS = "gmp" - -EXTRA_OECONF += "--enable-network=${SAMHAIN_MODE} " - -# supports mysql|postgresql|oracle|odbc but postgresql is the only one available - -PACKAGECONFG ??= "postgresql" -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" - -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 -} - -INSANE_SKIP_${PN} = "already-stripped" - -PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" - -FILES_${PN} += " \ - ${sbindir}/* \ - /run \ - " - -FILES_${PN}-dbg += " \ - ${sbindir}/.debug/* \ - " - -RDEPENDS_${PN} += "gmp bash perl" diff --git a/recipes-security/samhain/samhain-server_4.1.4.bb b/recipes-security/samhain/samhain-server_4.1.4.bb new file mode 100644 index 0000000..df78f63 --- /dev/null +++ b/recipes-security/samhain/samhain-server_4.1.4.bb @@ -0,0 +1,52 @@ +SAMHAIN_MODE="server" +INITSCRIPT_PARAMS = "defaults 14 86" + +require samhain.inc + +DEPENDS = "gmp" + +EXTRA_OECONF += "--enable-network=${SAMHAIN_MODE} " + +# supports mysql|postgresql|oracle|odbc but postgresql is the only one available + +PACKAGECONFG ??= "postgresql" +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" + +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 +} + +INSANE_SKIP_${PN} = "already-stripped" + +PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" + +FILES_${PN} += " \ + ${sbindir}/* \ + /run \ + " + +FILES_${PN}-dbg += " \ + ${sbindir}/.debug/* \ + " + +RDEPENDS_${PN} += "gmp bash perl" diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index 5c0142b..907f431 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] = "9112612fe569a0c92c7479ed2ef3b6f0" -SRC_URI[sha256sum] = "bb32321b3dc8450351d99e90d25182a029bef1e46b9a0439ade1ca0a744eadb8" +SRC_URI[md5sum] = "1ab697b7000d0a272d9ade05bb1bc6e0" +SRC_URI[sha256sum] = "32ee7477af11d9f2f64f30b9cb316c351897c1c994c7b98b0ef17fc0ca5e1d1a" S = "${WORKDIR}/samhain-${PV}" -- cgit v1.2.3-54-g00ecf