From 25982e886040ba8855d6a12b8c1896f34501fd09 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 4 Jul 2022 17:46:02 +0300 Subject: [PATCH] Libevent: Remove double free and update library to master --- .../libevent-openipc/0001-libevent-mbedtls.patch | 16 ---------------- .../package/libevent-openipc/libevent-openipc.mk | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/general/package/libevent-openipc/0001-libevent-mbedtls.patch b/general/package/libevent-openipc/0001-libevent-mbedtls.patch index 08e49d3b..6bffa930 100644 --- a/general/package/libevent-openipc/0001-libevent-mbedtls.patch +++ b/general/package/libevent-openipc/0001-libevent-mbedtls.patch @@ -11,19 +11,3 @@ index 822d97a5..646763b4 100644 PROT_READ, #ifdef MAP_NOCACHE MAP_NOCACHE | /* ??? */ -diff --git a/bufferevent_mbedtls.c b/bufferevent_mbedtls.c -index f42da2ae..61f448a2 100644 ---- a/bufferevent_mbedtls.c -+++ b/bufferevent_mbedtls.c -@@ -57,8 +57,10 @@ static void - mbedtls_context_free(void *ssl, int flags) - { - struct mbedtls_context *ctx = ssl; -- if (flags & BEV_OPT_CLOSE_ON_FREE) -+ if (flags & BEV_OPT_CLOSE_ON_FREE) { - mbedtls_ssl_free(ctx->ssl); -+ free(ctx->ssl); -+ } - mm_free(ctx); - } - static int diff --git a/general/package/libevent-openipc/libevent-openipc.mk b/general/package/libevent-openipc/libevent-openipc.mk index de106814..402638f1 100644 --- a/general/package/libevent-openipc/libevent-openipc.mk +++ b/general/package/libevent-openipc/libevent-openipc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVENT_OPENIPC_VERSION = 2db55e43cffd2fb6a34b5c997f2b8d043ca0ece5 +LIBEVENT_OPENIPC_VERSION = bf3ce77f6cf113839defa70b30e183d471a0dab5 LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION)) LIBEVENT_OPENIPC_INSTALL_STAGING = YES LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD @@ -54,7 +54,7 @@ endif ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y) LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc -LIBEVENT_OPENIPC_CONF_OPTS += --enable-embedtls +LIBEVENT_OPENIPC_CONF_OPTS += --enable-mbedtls else LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls endif