Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8902 from ja-pa/measurement-kit-0.10.3

Browse source 
measurement-kit: update to version 0.10.3
This commit is contained in:
Josef Schlehofer 2019-05-06 12:36:53 +02:00 committed by GitHub
commit 1ccfdcc5b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/measurement-kit/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=measurement-kit PKG_NAME:=measurement-kit
PKG_VERSION:=0.10.1 PKG_VERSION:=0.10.3
PKG_RELEASE=1 PKG_RELEASE=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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_SOURCE_URL:=https://codeload.github.com/measurement-kit/measurement-kit/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4caf856ebbb28633c7593a9b5b8ee79f0c0436d05ae7391cc59e8d72b260911a PKG_HASH:=04bc1832fbaa54a9fde4923e8f44a2f99610a862c228dd05977c36f54870d80f
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf

28
libs/measurement-kit/patches/003-fix-openssl-depredecated-api.patch Normal file
View file

@ -0,0 +1,28 @@
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;
}
});