measurement-kit: update to version 0.10.4

Remove openssl patch (merged into upstream)

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>

diff --git a/libs/measurement-kit/Makefile b/libs/measurement-kit/Makefile
index f78d24ec82b76f8522eaae49e8b93f4dffcc0d7c..dbb0d69a287aaa445709cd2562f3cc9054912612 100644 (file)
--- a/libs/measurement-kit/Makefile
+++ b/libs/measurement-kit/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=measurement-kit
-PKG_VERSION:=0.10.3
+PKG_VERSION:=0.10.4
 PKG_RELEASE=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/measurement-kit/measurement-kit/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=04bc1832fbaa54a9fde4923e8f44a2f99610a862c228dd05977c36f54870d80f
+PKG_HASH:=6ca0d9e7a9c1ff0ea8713bf59fde9f87365acdc4b784a5a4bb3f35a77bc4b775
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf

diff --git a/libs/measurement-kit/patches/003-fix-openssl-depredecated-api.patch b/libs/measurement-kit/patches/003-fix-openssl-depredecated-api.patch
deleted file mode 100644 (file)
index 9afc65e..0000000
--- a/libs/measurement-kit/patches/003-fix-openssl-depredecated-api.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 45904ae4548c848d053bea20e2f3e38189043c3a Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Fri, 3 May 2019 23:37:10 -0700
-Subject: [PATCH] Fix compilation without deprecated OpenSSL APIs (#1785)
-
-Initialization is deprecated and causes compile errors with OpenSSL 1.1 when
-deprecated APIs are disabled.
----
- src/libmeasurement_kit/net/libssl.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libmeasurement_kit/net/libssl.hpp b/src/libmeasurement_kit/net/libssl.hpp
-index eacee86ae..d1cecebbb 100644
---- a/src/libmeasurement_kit/net/libssl.hpp
-+++ b/src/libmeasurement_kit/net/libssl.hpp
-@@ -38,10 +38,12 @@ static inline void libssl_init_once(SharedPtr<Logger> logger) {
-         static bool initialized = false;
-         if (!initialized) {
-             logger->debug2("initializing libssl once");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-             SSL_library_init();
-             ERR_load_crypto_strings();
-             SSL_load_error_strings();
-             OpenSSL_add_all_algorithms();
-+#endif
-             initialized = true;
-         }
-     });