From 8a862870263690da4045936bbd4188f6ca9b270c Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 11 Apr 2017 10:24:45 -0700 Subject: samhain: update to 4.2.1 remove patch integrated into update Signed-off-by: Armin Kuster --- recipes-security/samhain/files/c99_dnmalloc.patch | 18 -------- recipes-security/samhain/samhain-client_4.2.0.bb | 15 ------- recipes-security/samhain/samhain-client_4.2.1.bb | 15 +++++++ recipes-security/samhain/samhain-server_4.2.0.bb | 54 ----------------------- recipes-security/samhain/samhain-server_4.2.1.bb | 54 +++++++++++++++++++++++ recipes-security/samhain/samhain.inc | 5 +-- 6 files changed, 71 insertions(+), 90 deletions(-) delete mode 100644 recipes-security/samhain/files/c99_dnmalloc.patch delete mode 100644 recipes-security/samhain/samhain-client_4.2.0.bb create mode 100644 recipes-security/samhain/samhain-client_4.2.1.bb delete mode 100644 recipes-security/samhain/samhain-server_4.2.0.bb create mode 100644 recipes-security/samhain/samhain-server_4.2.1.bb diff --git a/recipes-security/samhain/files/c99_dnmalloc.patch b/recipes-security/samhain/files/c99_dnmalloc.patch deleted file mode 100644 index 2216564..0000000 --- a/recipes-security/samhain/files/c99_dnmalloc.patch +++ /dev/null @@ -1,18 +0,0 @@ -samhain: musl build fix c99 - -Upstream-Status: Submitted -Signed-off-by: Armin Kuster - -Index: samhain-4.2.0/src/dnmalloc.c -=================================================================== ---- samhain-4.2.0.orig/src/dnmalloc.c -+++ samhain-4.2.0/src/dnmalloc.c -@@ -5524,7 +5524,7 @@ arc4_stir(void) - struct { - struct timeval tv1; - struct timeval tv2; -- u_int rnd[(128 - 2*sizeof(struct timeval)) / sizeof(u_int)]; -+ unsigned char rnd[(128 - 2*sizeof(struct timeval)) / sizeof(unsigned char)]; - } rdat; - #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - ssize_t sz = 0; diff --git a/recipes-security/samhain/samhain-client_4.2.0.bb b/recipes-security/samhain/samhain-client_4.2.0.bb deleted file mode 100644 index 4b04326..0000000 --- a/recipes-security/samhain/samhain-client_4.2.0.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.1.bb b/recipes-security/samhain/samhain-client_4.2.1.bb new file mode 100644 index 0000000..4b04326 --- /dev/null +++ b/recipes-security/samhain/samhain-client_4.2.1.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.2.0.bb b/recipes-security/samhain/samhain-server_4.2.0.bb deleted file mode 100644 index 7ef84db..0000000 --- a/recipes-security/samhain/samhain-server_4.2.0.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, libselinux" -PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, 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.1.bb b/recipes-security/samhain/samhain-server_4.2.1.bb new file mode 100644 index 0000000..7ef84db --- /dev/null +++ b/recipes-security/samhain/samhain-server_4.2.1.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, libselinux" +PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, 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 d558e6b..007264d 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc @@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://${INITSCRIPT_NAME}.init \ file://${INITSCRIPT_NAME}.default \ - file://c99_dnmalloc.patch \ " -SRC_URI[md5sum] = "d98a55646b14f9419fcedde909d1bf02" -SRC_URI[sha256sum] = "6b2db91fc92b3a9fc2edcc6ee16438156753c05f69c114856289e9f25ba0e50a" +SRC_URI[md5sum] = "6de1060d6e79c4893d8d89d5cbd3c1b0" +SRC_URI[sha256sum] = "93beabb19ac68fb5336a3d8f6b5414de05a460ff6982c41a4e3fb2082e769791" S = "${WORKDIR}/samhain-${PV}" -- cgit v1.2.3-54-g00ecf