Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jun 2023 19:16:35 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 761e1abcc6cc - main - audio/murmur: Fix build with OpenSSL 3
Message-ID:  <202306111916.35BJGZY5052533@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=761e1abcc6cc2418af9ee941c2c35d6f51b21760

commit 761e1abcc6cc2418af9ee941c2c35d6f51b21760
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-11 17:53:50 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-11 19:16:22 +0000

    audio/murmur: Fix build with OpenSSL 3
    
    - Refresh patches
    
    Approved by:    portmgr (blanket)
---
 audio/murmur/files/patch-scripts_murmur.ini            |  4 ++--
 audio/murmur/files/patch-src_SelfSignedCertificate.cpp | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/audio/murmur/files/patch-scripts_murmur.ini b/audio/murmur/files/patch-scripts_murmur.ini
index cce298933ad9..af12a75bf106 100644
--- a/audio/murmur/files/patch-scripts_murmur.ini
+++ b/audio/murmur/files/patch-scripts_murmur.ini
@@ -1,6 +1,6 @@
---- scripts/murmur.ini.orig	2019-10-22 15:01:53 UTC
+--- scripts/murmur.ini.orig	2020-09-04 21:33:39 UTC
 +++ scripts/murmur.ini
-@@ -102,13 +102,13 @@ icesecretwrite=
+@@ -93,13 +93,13 @@ icesecretwrite=
  ; logs to the file 'murmur.log'. If you leave this field blank
  ; on Unix-like systems, Murmur will force itself into foreground
  ; mode which logs to the console.
diff --git a/audio/murmur/files/patch-src_SelfSignedCertificate.cpp b/audio/murmur/files/patch-src_SelfSignedCertificate.cpp
new file mode 100644
index 000000000000..b5725633ae9d
--- /dev/null
+++ b/audio/murmur/files/patch-src_SelfSignedCertificate.cpp
@@ -0,0 +1,15 @@
+--- src/SelfSignedCertificate.cpp.orig	2023-06-11 17:43:07 UTC
++++ src/SelfSignedCertificate.cpp
+@@ -45,10 +45,12 @@ bool SelfSignedCertificate::generate(CertificateType c
+ 	QString commonName;
+ 	bool isServerCert = certificateType == CertificateTypeServerCertificate;
+ 
++#ifdef CRYPTO_MEM_CHECK_ON
+ 	if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
+ 		ok = false;
+ 		goto out;
+ 	}
++#endif
+ 
+ 	x509 = X509_new();
+ 	if (x509 == NULL) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306111916.35BJGZY5052533>