diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-04-11 10:24:45 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-04-25 18:14:19 -0700 |
commit | 41936bb4cf2764b44972893c53d4b52c1faf061f (patch) | |
tree | c30c771aaa840f1b1e9ca894ace9b9d9fdddceda /recipes-security/samhain | |
parent | 66d8abf64386f52ac8318399eb62ccd28271940d (diff) | |
download | meta-security-41936bb4cf2764b44972893c53d4b52c1faf061f.tar.gz |
samhain: update to 4.2.1
remove patch integrated into update
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security/samhain')
-rw-r--r-- | recipes-security/samhain/files/c99_dnmalloc.patch | 18 | ||||
-rw-r--r-- | recipes-security/samhain/samhain-client_4.2.1.bb (renamed from recipes-security/samhain/samhain-client_4.2.0.bb) | 0 | ||||
-rw-r--r-- | recipes-security/samhain/samhain-server_4.2.1.bb (renamed from recipes-security/samhain/samhain-server_4.2.0.bb) | 0 | ||||
-rw-r--r-- | recipes-security/samhain/samhain.inc | 5 |
4 files changed, 2 insertions, 21 deletions
diff --git a/recipes-security/samhain/files/c99_dnmalloc.patch b/recipes-security/samhain/files/c99_dnmalloc.patch deleted file mode 100644 index 2216564..0000000 --- a/recipes-security/samhain/files/c99_dnmalloc.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | samhain: musl build fix c99 | ||
2 | |||
3 | Upstream-Status: Submitted | ||
4 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
5 | |||
6 | Index: samhain-4.2.0/src/dnmalloc.c | ||
7 | =================================================================== | ||
8 | --- samhain-4.2.0.orig/src/dnmalloc.c | ||
9 | +++ samhain-4.2.0/src/dnmalloc.c | ||
10 | @@ -5524,7 +5524,7 @@ arc4_stir(void) | ||
11 | struct { | ||
12 | struct timeval tv1; | ||
13 | struct timeval tv2; | ||
14 | - u_int rnd[(128 - 2*sizeof(struct timeval)) / sizeof(u_int)]; | ||
15 | + unsigned char rnd[(128 - 2*sizeof(struct timeval)) / sizeof(unsigned char)]; | ||
16 | } rdat; | ||
17 | #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) | ||
18 | ssize_t sz = 0; | ||
diff --git a/recipes-security/samhain/samhain-client_4.2.0.bb b/recipes-security/samhain/samhain-client_4.2.1.bb index 4b04326..4b04326 100644 --- a/recipes-security/samhain/samhain-client_4.2.0.bb +++ b/recipes-security/samhain/samhain-client_4.2.1.bb | |||
diff --git a/recipes-security/samhain/samhain-server_4.2.0.bb b/recipes-security/samhain/samhain-server_4.2.1.bb index 7ef84db..7ef84db 100644 --- a/recipes-security/samhain/samhain-server_4.2.0.bb +++ b/recipes-security/samhain/samhain-server_4.2.1.bb | |||
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index d558e6b..007264d 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc | |||
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" | |||
7 | SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ | 7 | SRC_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://c99_dnmalloc.patch \ | ||
11 | " | 10 | " |
12 | 11 | ||
13 | SRC_URI[md5sum] = "d98a55646b14f9419fcedde909d1bf02" | 12 | SRC_URI[md5sum] = "6de1060d6e79c4893d8d89d5cbd3c1b0" |
14 | SRC_URI[sha256sum] = "6b2db91fc92b3a9fc2edcc6ee16438156753c05f69c114856289e9f25ba0e50a" | 13 | SRC_URI[sha256sum] = "93beabb19ac68fb5336a3d8f6b5414de05a460ff6982c41a4e3fb2082e769791" |
15 | 14 | ||
16 | S = "${WORKDIR}/samhain-${PV}" | 15 | S = "${WORKDIR}/samhain-${PV}" |
17 | 16 | ||