swtpm/libtpm: update to latest master

index f9624f6..b29ec6b 100644
@@ -2,11 +2,9 @@ SUMMARY = "LIBPM - Software TPM Library"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=97e5eea8d700d76b3ddfd35c4c96485f"
 
-SRCREV = "ad44846dda5a96e269ad2f78a532e01e9a2f02a1"
+SRCREV = "3388d45082bdc588c6fc0672f44d6d7d0aaa86ff"
 SRC_URI = " \
 	git://github.com/stefanberger/libtpms.git \
-	file://Convert-another-vdprintf-to-dprintf.patch \
-	file://Use-format-s-for-call-to-dprintf.patch \
 	"
 
 S = "${WORKDIR}/git"

index e844045..3d16431 100644
@@ -1,4 +1,7 @@
-logging: Fix musl build issue with fcntl
+From 8750a6c3f0b4d9e7e45b4079150d29eb44774e9c Mon Sep 17 00:00:00 2001
+From: Armin Kuster <[email protected]>
+Date: Tue, 14 Mar 2017 22:59:36 -0700
+Subject: [PATCH 2/4] logging: Fix musl build issue with fcntl
 
  error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
  #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.

@@ -6,16 +9,23 @@ logging: Fix musl build issue with fcntl
 Upstream-Status: Pending
 Signed-off-by: Armin Kuster <[email protected]>
 
-Index: git/src/swtpm/logging.c
-===================================================================
---- git.orig/src/swtpm/logging.c
-+++ git/src/swtpm/logging.c
-@@ -43,7 +43,7 @@
+---
+ src/swtpm/logging.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/swtpm/logging.c b/src/swtpm/logging.c
+index f16cab6..7da8606 100644
+--- a/src/swtpm/logging.c
++++ b/src/swtpm/logging.c
+@@ -45,7 +45,7 @@
  #include <errno.h>
  #include <string.h>
  #include <sys/types.h>
 -#include <sys/fcntl.h>
 +#include <fcntl.h>
+ #include <sys/stat.h>
  #include <stdio.h>
  #include <stdlib.h>
- #include <stdarg.h>
+-- 
+2.11.0
+

index 28aca4a..60958f7 100644
@@ -1,7 +1,7 @@
-From 85706ceb6877ade3b589d3c390abf5b3492bb718 Mon Sep 17 00:00:00 2001
+From 672bb4ee625da3141ba6cecb0601c7563de4c483 Mon Sep 17 00:00:00 2001
 From: Armin Kuster <[email protected]>
 Date: Thu, 13 Oct 2016 02:03:56 -0700
-Subject: [PATCH] swtpm: add new package
+Subject: [PATCH 1/4] swtpm: add new package
 
 Upstream-Status: Inappropriate [OE config]
 

@@ -12,20 +12,21 @@ Rebased to current tip.
 Signed-off-by: Patrick Ohly <[email protected]>
 
 ---
- configure.ac | 32 ++++++++++----------------------
- 1 file changed, 10 insertions(+), 22 deletions(-)
+ configure.ac | 34 ++++++++++------------------------
+ 1 file changed, 10 insertions(+), 24 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c4a9c6d..6267f64 100644
+index abf5be1..85ed6ac 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -395,29 +395,17 @@ CFLAGS="$CFLAGS -Wformat -Wformat-security"
+@@ -395,31 +395,17 @@ CFLAGS="$CFLAGS -Wformat -Wformat-security"
  dnl We have to make sure libtpms is using the same crypto library
  dnl to avoid problems
  AC_MSG_CHECKING([the crypto library libtpms is using])
 -dirs=$($CC $CFLAGS -Xlinker --verbose 2>/dev/null | \
 -       sed -n '/SEARCH_DIR/p' | \
--       sed 's/SEARCH_DIR("=\?\(@<:@^"@:>@\+\)"); */\1\n/g')
+-       sed 's/SEARCH_DIR("\(@<:@^"@:>@*\)"); */\1 /g' | \
+-       sed 's|=/|/|g')
 -for dir in $dirs $LIBRARY_PATH; do
 -  if test -r $dir/libtpms.so; then
 -    if test -n "`ldd $dir/libtpms.so | grep libcrypto.so`"; then

@@ -43,12 +44,13 @@ index c4a9c6d..6267f64 100644
 +    break
    fi
 -  case $host_os in
--  cygwin)
+-  cygwin|openbsd*)
 -    if test -r $dir/libtpms.a; then
 -      if test -n "$(nm $dir/libtpms.a | grep "U AES_encrypt")"; then
 -        libtpms_cryptolib="openssl"
 -      fi
 -    fi
+-    ;;
 -  esac
 -done
 +  if test -n "`ldd $dir/libtpms.so | grep libnss3.so`"; then

@@ -60,5 +62,5 @@ index c4a9c6d..6267f64 100644
  if test -z "$libtpms_cryptolib"; then
    AC_MSG_ERROR([Could not determine libtpms crypto library.])
 -- 
-2.1.4
+2.11.0
 

48 lines not on this page · raw message

index 952de1a..7476020 100644
@@ -10,14 +10,12 @@ DEPENDS = "libtasn1 expect socat glib-2.0 libtpm libtpm-native"
 DEPENDS += "tpm-tools-native expect-native socat-native"
 RDEPENDS_${PN} += "tpm-tools"
 
-SRCREV = "073e71f99eaa7a0ff9499339176af1af62c090b2"
-SRC_URI = " \
-	git://github.com/stefanberger/swtpm.git \
-	file://fix_signed_issue.patch \
-	file://fix_lib_search_path.patch \
-        file://fix_fcntl_h.patch \
-        file://ioctl_h.patch \
-	"
+SRCREV = "4f4f2f0a7e3195f6df8d235d58630a08e69403d8"
+SRC_URI = "git://github.com/stefanberger/swtpm.git \
+           file://fix_lib_search_path.patch \
+           file://fix_fcntl_h.patch \
+           file://ioctl_h.patch \
+           "
 
 S = "${WORKDIR}/git"