samhain: update to 4.2.1
PATCH 1/2 samhain: update to 4.2.1
remove patch integrated into update
Signed-off-by Armin Kuster <[email protected]>
---
recipes-security/samhain/files/c99_dnmalloc.patch | 18 ------------------
...samhain-client_4.2.0.bb => samhain-client_4.2.1.bb} | 0
...samhain-server_4.2.0.bb => samhain-server_4.2.1.bb} | 0
recipes-security/samhain/samhain.inc | 5 ++---
4 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 recipes-security/samhain/files/c99_dnmalloc.patch
rename recipes-security/samhain/{samhain-client_4.2.0.bb => samhain-client_4.2.1.bb} (100%)
rename recipes-security/samhain/{samhain-server_4.2.0.bb => samhain-server_4.2.1.bb} (100%)recipes-security/samhain/files/c99_dnmalloc.patch deleted +0 -18
@@ -1,18 +0,0 @@ -samhain: musl build fix c99 - -Upstream-Status: Submitted -Signed-off-by: Armin Kuster <[email protected]> - -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;
recipes-security/samhain/samhain-client_4.2.1.bb renamed from recipes-security/samhain/samhain-client_4.2.0.bb +0 -0
recipes-security/samhain/samhain-server_4.2.1.bb renamed from recipes-security/samhain/samhain-server_4.2.0.bb +0 -0
recipes-security/samhain/samhain.inc +2 -3
@@ -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}"
Signature · 1 line
2.7.4
PATCH 2/2 tpm2.0-tss: update to tip.
remove merged patch now in tip
Signed-off-by Armin Kuster <[email protected]>
--- .../tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch | 27 ---------------------- recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch
recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Add missing header to avoid: - -../TPM2.0-TSS/tcti/tcti_socket.c: In function 'SocketReceiveTpmResponse': -| ../TPM2.0-TSS/tcti/tcti_socket.c:286:5: error: unknown type name 'fd_set' -| fd_set readFds; -| ^~~~~~ -| ../TPM2.0-TSS/tcti/tcti_socket.c:287:20: error: storage size of 'tv' isn't known -| struct timeval tv, *tvPtr; -| ^~ - -Upstream-Status: Submitted -tcti_socket: fix musl build issue do to missing header #393 - -Signed-off-by: Armin Kuster <[email protected]> - -Index: TPM2.0-TSS/tcti/tcti_socket.c -=================================================================== ---- TPM2.0-TSS.orig/tcti/tcti_socket.c -+++ TPM2.0-TSS/tcti/tcti_socket.c -@@ -27,6 +27,7 @@ - - #include <stdio.h> - #include <stdlib.h> // Needed for _wtoi -+#include <sys/time.h> - - #include "sapi/tpm20.h" - #include "sapi/marshal.h"
recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +1 -2
@@ -6,12 +6,11 @@ SECTION = "tpm" DEPENDS = "autoconf-archive pkgconfig" -SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001" +SRCREV = "30794affab01598bbacfe1f167be7c068a0c0476" SRC_URI = " \ git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ file://ax_pthread.m4 \ - file://musl_header_fix.patch \ " inherit autotools pkgconfig systemd
Signature · 1 line
2.7.4