diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-09-14 13:35:35 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-09-15 08:01:07 -0700 |
commit | 738dad9d91b523bf56ba708f8ac214a7e85fa05a (patch) | |
tree | 1bfbf9944fab7534c1b99c83dd678b5a17713674 /recipes-security | |
parent | a35bcc9495cc78737741adbc09d9f96235044899 (diff) | |
download | meta-security-738dad9d91b523bf56ba708f8ac214a7e85fa05a.tar.gz |
samhain: fix QA issue for GNU_HASH
Add LDFLAGS variable to fix QA issue for GNU_HASH:
| ERROR: samhain-client-4.2.2-r0 do_package_qa: QA Issue:
No GNU_HASH in the elf binary: '/builddir/usr/sbin/samhain_setpwd' [ldflags]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security')
-rw-r--r-- | recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch | 28 | ||||
-rw-r--r-- | recipes-security/samhain/samhain.inc | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch b/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch new file mode 100644 index 0000000..088a938 --- /dev/null +++ b/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From ae79606a6745dbbd429d1d4671dfe3045d735057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Thu, 14 Sep 2017 13:26:55 +0800 | ||
4 | Subject: [PATCH] Add LDFLAGS variable for compiling samhain_setpwd | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
9 | --- | ||
10 | Makefile.in | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile.in b/Makefile.in | ||
14 | index 01de987..49356cf 100644 | ||
15 | --- a/Makefile.in | ||
16 | +++ b/Makefile.in | ||
17 | @@ -1128,7 +1128,7 @@ sh_tiger_i.o: $(srcsrc)/$(TIGER_SRC) Makefile config_xor.h | ||
18 | samhain_setpwd: encode config_xor.h $(srcsrc)/samhain_setpwd.c | ||
19 | @echo '$(COMPILE) -o samhain_setpwd $(srcsrc)/samhain_setpwd.c'; \ | ||
20 | ./encode $(XOR_CODE) $(srcsrc)/samhain_setpwd.c; \ | ||
21 | - $(COMPILE) -o samhain_setpwd x_samhain_setpwd.c; \ | ||
22 | + $(COMPILE) $(LDFLAGS) -o samhain_setpwd x_samhain_setpwd.c; \ | ||
23 | rm x_samhain_setpwd.c | ||
24 | |||
25 | samhain_stealth: encode config_xor.h $(srcsrc)/samhain_stealth.c | ||
26 | -- | ||
27 | 2.11.0 | ||
28 | |||
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index a11b7d8..db96264 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ | |||
13 | file://samhain-sha256-big-endian.patch \ | 13 | file://samhain-sha256-big-endian.patch \ |
14 | file://samhain-configure-add-option-for-ps.patch \ | 14 | file://samhain-configure-add-option-for-ps.patch \ |
15 | file://samhain-avoid-searching-host-for-postgresql.patch \ | 15 | file://samhain-avoid-searching-host-for-postgresql.patch \ |
16 | file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \ | ||
16 | file://${INITSCRIPT_NAME}.init \ | 17 | file://${INITSCRIPT_NAME}.init \ |
17 | file://${INITSCRIPT_NAME}.default \ | 18 | file://${INITSCRIPT_NAME}.default \ |
18 | file://samhain.service \ | 19 | file://samhain.service \ |