Re: [yocto] [meta-security][PATCH v2] samhain: 4.1.4 -> 4.1.5

[akuster808]

merged.

thanks,

Armin

On 09/21/2016 06:52 PM, Wang, Xin wrote:

ping

-----Original Message-----
From: Wang, Xin/王 鑫
Sent: Monday, September 19, 2016 3:33 PM
To: yocto@yoctoproject.org
Cc: Wang, Xin/王 鑫
Subject: [yocto][meta-security][PATCH v2] 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.f...@cn.fujitsu.com>
---
  .../samhain/{samhain-client_4.1.4.bb => samhain-client_4.1.5.bb}      | 0
  .../samhain/{samhain-server_4.1.4.bb => samhain-server_4.1.5.bb}      | 2 ++
  recipes-security/samhain/samhain.inc                                  | 4 ++--
  3 files changed, 4 insertions(+), 2 deletions(-)  rename 
recipes-security/samhain/{samhain-client_4.1.4.bb => samhain-client_4.1.5.bb} 
(100%)  rename recipes-security/samhain/{samhain-server_4.1.4.bb => 
samhain-server_4.1.5.bb} (97%)

diff --git a/recipes-security/samhain/samhain-client_4.1.4.bb 
b/recipes-security/samhain/samhain-client_4.1.5.bb
similarity index 100%
rename from recipes-security/samhain/samhain-client_4.1.4.bb
rename to 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
similarity index 97%
rename from recipes-security/samhain/samhain-server_4.1.4.bb
rename to 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}" --

2.7.4

--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto