Index: head/security/wolfssl/Makefile =================================================================== --- head/security/wolfssl/Makefile (revision 563254) +++ head/security/wolfssl/Makefile (revision 563255) @@ -1,48 +1,57 @@ # $FreeBSD$ PORTNAME= wolfssl PORTVERSION= 4.6.0 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= https://www.wolfssl.com/ \ LOCAL/fox + MAINTAINER= fox@FreeBSD.org COMMENT= Embedded SSL C-Library LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= libtool zip USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ + --enable-certgen \ + --enable-des3 \ --enable-dh \ --enable-dsa \ --enable-dtls \ --enable-ecc \ --enable-ipv6 \ --enable-keygen \ + --enable-opensslall \ --enable-opensslextra \ --enable-ripemd \ + --enable-sessioncerts \ --enable-sha512 \ --enable-shared \ --enable-sni \ --enable-ssh \ --enable-static \ --enable-tls13 \ --enable-tls13-draft18 TEST_TARGET= check +CFLAGS+= -DWOLFSSL_ALT_NAMES PORTDOCS= * -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DEBUG DOCS +DEBUG_CONFIGURE_ON= --enable-debug + post-configure: @${REINPLACE_CMD} \ -e 's|$${prefix}/cyassl/include|$${prefix}/include/cyassl|' \ -e 's|$${prefix}/cyassl/lib|$${prefix}/lib/cyassl|' \ -e '/^pkgconfigdir/s|(libdir)|&data|' \ ${WRKSRC}/Makefile -post-install: +post-install-DEBUG-off: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libwolfssl.so .include Index: head/security/wolfssl/files/patch-src-ssl.c =================================================================== --- head/security/wolfssl/files/patch-src-ssl.c (nonexistent) +++ head/security/wolfssl/files/patch-src-ssl.c (revision 563255) @@ -0,0 +1,31 @@ +From 0aead8cb868003a5dff2e81d6a7ffd7579652610 Mon Sep 17 00:00:00 2001 +From: Fabian Keil +Date: Sun, 17 Jan 2021 11:21:59 +0100 +Subject: [PATCH] wolfSSL_CertManagerFree(): free refMutex + +Fixes memory leaks like: + ==323== 96 bytes in 1 blocks are definitely lost in loss record 3 of 4 + ==323== at 0x4C291E1: calloc (in /usr/local/lib/valgrind/vgpreload_memcheck-amd64-freebsd.so) + ==323== by 0x585495F: pthread_mutex_init (in /lib/libthr.so.3) + ==323== by 0x4E7B5E8: wc_InitMutex (wc_port.c:1071) + ==323== by 0x4F09540: wolfSSL_CertManagerNew_ex (ssl.c:3596) + ==323== by 0x4EC6A81: InitSSL_Ctx (internal.c:1752) + ==323== by 0x4F0441E: wolfSSL_CTX_new_ex (ssl.c:394) + ==323== by 0x4F04658: wolfSSL_CTX_new (ssl.c:436) + ==323== by 0x400AA2: main (wolfssl-ctx-leak.c:9) + +This is a partial cherry-pick of upstream commit +9598c037168b73ce2f by Tesfa Mael. +--- src/ssl.c.orig 2020-12-23 02:15:20 UTC ++++ src/ssl.c +@@ -3663,7 +3663,9 @@ void wolfSSL_CertManagerFree(WOLFSSL_CERT_MANAGER* cm) + FreeTrustedPeerTable(cm->tpTable, TP_TABLE_SIZE, cm->heap); + wc_FreeMutex(&cm->tpLock); + #endif +- ++ if (wc_FreeMutex(&cm->refMutex) != 0) { ++ WOLFSSL_MSG("Couldn't free refMutex mutex"); ++ } + XFREE(cm, cm->heap, DYNAMIC_TYPE_CERT_MANAGER); + } + } Property changes on: head/security/wolfssl/files/patch-src-ssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property