samhain: update to 4.2.1

remove patch integrated into update

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2017-04-11 10:24:45 -07:00
parent 66d8abf643
commit 41936bb4cf
4 changed files with 2 additions and 21 deletions
@@ -1,18 +0,0 @@
samhain: musl build fix c99
Upstream-Status: Submitted
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: samhain-4.2.0/src/dnmalloc.c
===================================================================
--- samhain-4.2.0.orig/src/dnmalloc.c
+++ samhain-4.2.0/src/dnmalloc.c
@@ -5524,7 +5524,7 @@ arc4_stir(void)
struct {
struct timeval tv1;
struct timeval tv2;
- u_int rnd[(128 - 2*sizeof(struct timeval)) / sizeof(u_int)];
+ unsigned char rnd[(128 - 2*sizeof(struct timeval)) / sizeof(unsigned char)];
} rdat;
#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
ssize_t sz = 0;
+2 -3
View File
@@ -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://c99_dnmalloc.patch \
"
SRC_URI[md5sum] = "d98a55646b14f9419fcedde909d1bf02"
SRC_URI[sha256sum] = "6b2db91fc92b3a9fc2edcc6ee16438156753c05f69c114856289e9f25ba0e50a"
SRC_URI[md5sum] = "6de1060d6e79c4893d8d89d5cbd3c1b0"
SRC_URI[sha256sum] = "93beabb19ac68fb5336a3d8f6b5414de05a460ff6982c41a4e3fb2082e769791"
S = "${WORKDIR}/samhain-${PV}"