Li Xin,
Master-next already has the 4.1.0 update. I have merged the additional
fixes to master-next.
thanks,
Armin
On 10/30/2015 02:37 AM, Li xin wrote:
> From: Li Xin <lixin.f...@cn.fujitsu.com>
>
> Also fix an error when "samhain -t check" is executed.
> The error is like this:
> 'ERROR: msg=<Record with bad version number in file signature database>,
> subroutine=<sh_dbIO_getdataent>, path=<(null)>'
>
> Signed-off-by: Li Xin <lixin.f...@cn.fujitsu.com>
> ---
> .../samhain/{samhain-client_4.0.0.bb => samhain-client_4.1.0.bb} | 3 ++-
> .../samhain/{samhain-server_4.0.0.bb => samhain-server_4.1.0.bb} | 0
> recipes-security/samhain/samhain.inc | 6
> +++---
> 3 files changed, 5 insertions(+), 4 deletions(-)
> rename recipes-security/samhain/{samhain-client_4.0.0.bb =>
> samhain-client_4.1.0.bb} (79%)
> rename recipes-security/samhain/{samhain-server_4.0.0.bb =>
> samhain-server_4.1.0.bb} (100%)
>
> diff --git a/recipes-security/samhain/samhain-client_4.0.0.bb
> b/recipes-security/samhain/samhain-client_4.1.0.bb
> similarity index 79%
> rename from recipes-security/samhain/samhain-client_4.0.0.bb
> rename to recipes-security/samhain/samhain-client_4.1.0.bb
> index c671b48..bb47449 100644
> --- a/recipes-security/samhain/samhain-client_4.0.0.bb
> +++ b/recipes-security/samhain/samhain-client_4.1.0.bb
> @@ -8,7 +8,8 @@ EXTRA_OECONF += " \
> --with-logserver=${SAMHAIN_SERVER} \
> --with-port=${SAMHAIN_PORT} \
> --with-config-file=/etc/samhainrc \
> - --with-data-file=/var/lib/samhain/samhain_file \
> + --with-data-file=/var/samhain/samhain.data \
> + --with-pid-file=/var/samhain/samhain.pid \
> "
>
>
> diff --git a/recipes-security/samhain/samhain-server_4.0.0.bb
> b/recipes-security/samhain/samhain-server_4.1.0.bb
> similarity index 100%
> rename from recipes-security/samhain/samhain-server_4.0.0.bb
> rename to recipes-security/samhain/samhain-server_4.1.0.bb
> diff --git a/recipes-security/samhain/samhain.inc
> b/recipes-security/samhain/samhain.inc
> index e33182f..dedcf76 100644
> --- a/recipes-security/samhain/samhain.inc
> +++ b/recipes-security/samhain/samhain.inc
> @@ -8,9 +8,8 @@ SRC_URI =
> "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
> file://${INITSCRIPT_NAME}.init \
> file://${INITSCRIPT_NAME}.default \
> "
> -
> -SRC_URI[md5sum] = "2144383cc5452b9b80c7e4e4c991ad4a"
> -SRC_URI[sha256sum] =
> "5a841708f78c6d9b4731970fa39151dff366885de08ecddc382e8c45a2c1b4e2"
> +SRC_URI[md5sum] = "fcb59c6c8a1d30cc6ffc21557a0046d3"
> +SRC_URI[sha256sum] =
> "a8e10454782a7f3bb5f709dd05cee695ffbd052afc709668a3e7c4b629771189"
>
> S = "${WORKDIR}/samhain-${PV}"
>
> @@ -87,4 +86,5 @@ do_install_append () {
> install -d ${D}${docdir}/${PN}
> cp -r docs/* ${D}${docdir}/${PN}
> cp -r scripts ${D}${docdir}/${PN}
> + install -d -m 755 ${D}/var/samhain
> }
>
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
