[yocto] [meta-security][PATCH] samhain: fix aarch64 build issues

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../samhain/files/add_aarch64_to_configure.patch   | 34 ++++++++++++++++++++++
 recipes-security/samhain/samhain.inc               |  5 ++++
 2 files changed, 39 insertions(+)
 create mode 100644 recipes-security/samhain/files/add_aarch64_to_configure.patch

diff --git a/recipes-security/samhain/files/add_aarch64_to_configure.patch b/recipes-security/samhain/files/add_aarch64_to_configure.patch
new file mode 100644
index 0000000..05f4413
--- /dev/null
+++ b/recipes-security/samhain/files/add_aarch64_to_configure.patch
@@ -0,0 +1,34 @@
+Index: samhain-3.1.3/config.sub
+===================================================================
+--- samhain-3.1.3.orig/config.sub
++++ samhain-3.1.3/config.sub
+@@ -250,6 +250,7 @@ case $basic_machine in
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++    | aarch64 | aarch64be \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+@@ -332,6 +333,7 @@ case $basic_machine in
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++    | aarch64-* | aarch64be-* \
+ 	| avr-* | avr32-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+Index: samhain-3.1.3/config.guess
+===================================================================
+--- samhain-3.1.3.orig/config.guess
++++ samhain-3.1.3/config.guess
+@@ -882,6 +882,9 @@ EOF
+ 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ 	fi
+ 	exit ;;
++    aarch64*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc
index b914cb1..3c54c28 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
 SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
 	   file://${INITSCRIPT_NAME}.init \
 	   file://${INITSCRIPT_NAME}.default \
+       file://add_aarch64_to_configure.patch \
 	  "
 
 SRC_URI[md5sum] = "64572a4dbfdc8065d6e9f7ca0eab0a34"
@@ -41,6 +42,10 @@ do_configure_prepend_arm() {
     export sh_cv___va_copy=yes
 }
 
+do_configure_prepend_aarch64() {
+    export sh_cv___va_copy=yes
+}
+
 # If we use oe_runconf in do_configure() it will by default
 # use the prefix --oldincludedir=/usr/include which is not
 # recognized by Samhain's configure script and would invariably
-- 
1.9.1