summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2015-07-20 21:35:12 -0700
committerArmin Kuster <akuster808@gmail.com>2015-10-08 07:08:19 -0700
commite3f2b3ba8c5cae73add868ba81bf9a7fc48d37fe (patch)
tree26c0127bd763a576663047903e85358fdcf4a8c4
parent6cdf3402bed3f017f6ce063078b776a62a862592 (diff)
downloadmeta-security-e3f2b3ba8c5cae73add868ba81bf9a7fc48d37fe.tar.gz
samhain-client: update to 4.0.0
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/samhain/files/add_aarch64_to_configure.patch34
-rw-r--r--recipes-security/samhain/samhain-client_4.0.0.bb (renamed from recipes-security/samhain/samhain-client_3.1.5.bb)0
-rw-r--r--recipes-security/samhain/samhain-server_4.0.0.bb (renamed from recipes-security/samhain/samhain-server_3.1.5.bb)2
-rw-r--r--recipes-security/samhain/samhain.inc5
4 files changed, 3 insertions, 38 deletions
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 @@
1Index: samhain-3.1.3/config.sub
2===================================================================
3--- samhain-3.1.3.orig/config.sub
4+++ samhain-3.1.3/config.sub
5@@ -250,6 +250,7 @@ case $basic_machine in
6 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
7 | am33_2.0 \
8 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
9+ | aarch64 | aarch64be \
10 | bfin \
11 | c4x | clipper \
12 | d10v | d30v | dlx | dsp16xx \
13@@ -332,6 +333,7 @@ case $basic_machine in
14 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
15 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
16 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
17+ | aarch64-* | aarch64be-* \
18 | avr-* | avr32-* \
19 | bfin-* | bs2000-* \
20 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
21Index: samhain-3.1.3/config.guess
22===================================================================
23--- samhain-3.1.3.orig/config.guess
24+++ samhain-3.1.3/config.guess
25@@ -882,6 +882,9 @@ EOF
26 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
27 fi
28 exit ;;
29+ aarch64*:Linux:*:*)
30+ echo ${UNAME_MACHINE}-unknown-linux-gnu
31+ exit ;;
32 avr32*:Linux:*:*)
33 echo ${UNAME_MACHINE}-unknown-linux-gnu
34 exit ;;
diff --git a/recipes-security/samhain/samhain-client_3.1.5.bb b/recipes-security/samhain/samhain-client_4.0.0.bb
index c671b48..c671b48 100644
--- a/recipes-security/samhain/samhain-client_3.1.5.bb
+++ b/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
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 += " \
47 ${sbindir}/.debug/* \ 47 ${sbindir}/.debug/* \
48 " 48 "
49 49
50RDEPENDS_${PN} += "gmp bash" 50RDEPENDS_${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"
7SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ 7SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
8 file://${INITSCRIPT_NAME}.init \ 8 file://${INITSCRIPT_NAME}.init \
9 file://${INITSCRIPT_NAME}.default \ 9 file://${INITSCRIPT_NAME}.default \
10 file://add_aarch64_to_configure.patch \
11 " 10 "
12 11
13SRC_URI[md5sum] = "b72b526c6ee504317981e6dba1673b9d" 12SRC_URI[md5sum] = "2144383cc5452b9b80c7e4e4c991ad4a"
14SRC_URI[sha256sum] = "2d7d93992d1737b72ff7c835b4c90a2d4d46e448d9265c0c3341544f6b1ffcdb" 13SRC_URI[sha256sum] = "5a841708f78c6d9b4731970fa39151dff366885de08ecddc382e8c45a2c1b4e2"
15 14
16S = "${WORKDIR}/samhain-${PV}" 15S = "${WORKDIR}/samhain-${PV}"
17 16