From d49df5e37c9f3c72cbfdb95bea771d888969d31d Mon Sep 17 00:00:00 2001 From: Wang Xin Date: Mon, 19 Sep 2016 03:33:14 -0400 Subject: samhain: 4.1.4 -> 4.1.5 1) Upgrade samhain from 4.1.4 to 4.1.5. 2) Add TARGET_CC_ARCH.Fix error. ERROR: samhain-server-4.1.5-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/yocto/work001/fnst/wangx/poky/build/tmp/work/i586-poky-linux/samhain-server/4.1.5-r0/packages-split/samhain-server/usr/sbin/yule_setpwd' No GNU_HASH in the elf binary: '/yocto/work001/fnst/wangx/poky/build/tmp/work/i586-poky-linux/samhain-server/4.1.5-r0/packages-split/samhain-server/usr/sbin/yulectl' [ldflags] Signed-off-by: Wang Xin Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain-client_4.1.4.bb | 22 ---------- recipes-security/samhain/samhain-client_4.1.5.bb | 22 ++++++++++ recipes-security/samhain/samhain-server_4.1.4.bb | 52 ----------------------- recipes-security/samhain/samhain-server_4.1.5.bb | 54 ++++++++++++++++++++++++ recipes-security/samhain/samhain.inc | 4 +- 5 files changed, 78 insertions(+), 76 deletions(-) delete mode 100644 recipes-security/samhain/samhain-client_4.1.4.bb create mode 100644 recipes-security/samhain/samhain-client_4.1.5.bb delete mode 100644 recipes-security/samhain/samhain-server_4.1.4.bb create mode 100644 recipes-security/samhain/samhain-server_4.1.5.bb (limited to 'recipes-security') diff --git a/recipes-security/samhain/samhain-client_4.1.4.bb b/recipes-security/samhain/samhain-client_4.1.4.bb deleted file mode 100644 index bb47449..0000000 --- a/recipes-security/samhain/samhain-client_4.1.4.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.5.bb b/recipes-security/samhain/samhain-client_4.1.5.bb new file mode 100644 index 0000000..bb47449 --- /dev/null +++ b/recipes-security/samhain/samhain-client_4.1.5.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.4.bb b/recipes-security/samhain/samhain-server_4.1.4.bb deleted file mode 100644 index df78f63..0000000 --- a/recipes-security/samhain/samhain-server_4.1.4.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.5.bb b/recipes-security/samhain/samhain-server_4.1.5.bb new file mode 100644 index 0000000..0d76b9a --- /dev/null +++ b/recipes-security/samhain/samhain-server_4.1.5.bb @@ -0,0 +1,54 @@ +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" + +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 +} + +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 907f431..5bf2ee7 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] = "1ab697b7000d0a272d9ade05bb1bc6e0" -SRC_URI[sha256sum] = "32ee7477af11d9f2f64f30b9cb316c351897c1c994c7b98b0ef17fc0ca5e1d1a" +SRC_URI[md5sum] = "bdb6d2653d706f3180e37ef3d95c824d" +SRC_URI[sha256sum] = "4ff4c38765c942abbaac2577df4c8c4940482a1bffc4a719f181c4fca6f173a7" S = "${WORKDIR}/samhain-${PV}" -- cgit v1.2.3-54-g00ecf