aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Xin <wangxin2015.fnst@cn.fujitsu.com>2016-09-19 03:33:14 -0400
committerArmin Kuster <akuster808@gmail.com>2016-10-11 01:39:11 -0700
commitd49df5e37c9f3c72cbfdb95bea771d888969d31d (patch)
tree00677c3a1f5c2ed4b87057a6d2611dd5b1e7a262
parent98d705a3bc2d36a094515b9168c22d82c0431424 (diff)
downloadmeta-security-d49df5e37c9f3c72cbfdb95bea771d888969d31d.tar.gz
meta-security-d49df5e37c9f3c72cbfdb95bea771d888969d31d.tar.bz2
meta-security-d49df5e37c9f3c72cbfdb95bea771d888969d31d.zip
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 <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/samhain/samhain-client_4.1.5.bb (renamed from recipes-security/samhain/samhain-client_4.1.4.bb)0
-rw-r--r--recipes-security/samhain/samhain-server_4.1.5.bb (renamed from recipes-security/samhain/samhain-server_4.1.4.bb)2
-rw-r--r--recipes-security/samhain/samhain.inc4
3 files changed, 4 insertions, 2 deletions
diff --git a/recipes-security/samhain/samhain-client_4.1.4.bb b/recipes-security/samhain/samhain-client_4.1.5.bb
index bb47449..bb47449 100644
--- a/recipes-security/samhain/samhain-client_4.1.4.bb
+++ b/recipes-security/samhain/samhain-client_4.1.5.bb
diff --git a/recipes-security/samhain/samhain-server_4.1.4.bb b/recipes-security/samhain/samhain-server_4.1.5.bb
index df78f63..0d76b9a 100644
--- a/recipes-security/samhain/samhain-server_4.1.4.bb
+++ b/recipes-security/samhain/samhain-server_4.1.5.bb
@@ -21,6 +21,8 @@ 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 \
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}"