Signed-off-by: Armin Kuster <akuster808@...>
---
.../samhain/files/add_aarch64_to_configure.patch | 34 ----------------------
...ain-client_3.1.5.bb => samhain-client_4.0.0.bb} | 0
...ain-server_3.1.5.bb => samhain-server_4.0.0.bb} | 2 +-
recipes-security/samhain/samhain.inc | 5 ++--
4 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 recipes-security/samhain/files/add_aarch64_to_configure.patch
rename recipes-security/samhain/{samhain-client_3.1.5.bb => samhain-client_4.0.0.bb} (100%)
rename recipes-security/samhain/{samhain-server_3.1.5.bb => samhain-server_4.0.0.bb} (97%)

diff --git a/recipes-security/samhain/files/add_aarch64_to_configure.patch b/recipes-security/samhain/files/add_aarch64_to_configure.patch
deleted file mode 100644
index 05f4413..0000000
--- a/recipes-security/samhain/files/add_aarch64_to_configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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-client_3.1.5.bb b/recipes-security/samhain/samhain-client_4.0.0.bb
similarity index 100%
rename from recipes-security/samhain/samhain-client_3.1.5.bb
rename to recipes-security/samhain/samhain-client_4.0.0.bb
diff --git a/recipes-security/samhain/samhain-server_3.1.5.bb b/recipes-security/samhain/samhain-server_4.0.0.bb
similarity index 97%
rename from recipes-security/samhain/samhain-server_3.1.5.bb
rename to recipes-security/samhain/samhain-server_4.0.0.bb
index b8ea248..41646e6 100644
--- a/recipes-security/samhain/samhain-server_3.1.5.bb
+++ b/recipes-security/samhain/samhain-server_4.0.0.bb
@@ -47,4 +47,4 @@ FILES_${PN}-dbg += " \
${sbindir}/.debug/* \
"

-RDEPENDS_${PN} += "gmp bash"
+RDEPENDS_${PN} += "gmp bash perl"
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc
index 869e959..e33182f 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -7,11 +7,10 @@ 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] = "b72b526c6ee504317981e6dba1673b9d"
-SRC_URI[sha256sum] = "2d7d93992d1737b72ff7c835b4c90a2d4d46e448d9265c0c3341544f6b1ffcdb"
+SRC_URI[md5sum] = "2144383cc5452b9b80c7e4e4c991ad4a"
+SRC_URI[sha256sum] = "5a841708f78c6d9b4731970fa39151dff366885de08ecddc382e8c45a2c1b4e2"

S = "${WORKDIR}/samhain-${PV}"

--
2.3.5