From nobody Sun Jun 11 19:16:35 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QfPgl58psz4cXFv; Sun, 11 Jun 2023 19:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QfPgl4mSQz4NSd; Sun, 11 Jun 2023 19:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686510995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Gy5m5Z5obma+IoyPEalgbF5a4Sl1a6ujdw7+oAqgCY=; b=IQMjEqeNZ3gOR2Nc4A3En7gF9jMf6Pe0UXhrw3GCblzBCxf6L9WZn3w6iy6wLY0XuJEUXQ 7z9SSfgKCOyj6XuJQCej/oMOdOiqYT4d6S8IRA6C4+anATNW0iBHr/2qYfkjQTOJUA1J1c VWMT4heuxQ2Bnb3Jfw5rVUH48L20IiREEjLFvvaH5k5MiOeTv/gPSIFQv96t7GCrmRYcC9 oqRe1OP7n6Tp2QLQ0u8aQihuUSzgvHMyZhqbK+ggW8B/P37PKFf5H+uFVlRPg+M+V37Wm7 4JdGf2KgLGkwef8+W3RXrU1xjo1Vh23CfpTI+0R7PmiBPTU0lM5Wtjrrho19TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686510995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Gy5m5Z5obma+IoyPEalgbF5a4Sl1a6ujdw7+oAqgCY=; b=PhILdeR3W1kfW0Hp22NrjKg7g+M5J3bSOX+AArtpJ357RehO/CAiOf9GgoUZlAKUObHLw4 BPfSbGDv5JEVVRLi3vLr82bRKl18FUBufM+LGuKhqDTaEkkOaWIabg9dldvVpHxOHSMC/Z syDqnV/ipJfy1vPg+ILoAVm8pMpd4w8O84KE4EDnb7CNQKGnYTZ0HPPGGBmL0jmDXnXBls HXgPdAVcd/kfFs3PNqjj/vob/pyHegTXrjNE7Sxh/h2oeOBjjZV6fq/vGc8UCOPNN+oJ91 yVdQplDSR4G1C4wZ7bqIXMMIgtCfK6KswhoMDLr/xUefY4LDJwvk5OK7naQrhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686510995; a=rsa-sha256; cv=none; b=qtU7o8CN181pb3BAX0WGYXpF3teLvE0Fb0DqEze+GRgfNXUm3InJtkwWG2MlJJacAGq92j MlcGeIBMQ21skglSQkpNhU0GrrxMTXJqZ4lbCoCYekrJIRoL4ULQ67FWiCdH2/and3h/cQ 8Qspw4oRiWZ6m59ok4YJwRLDiJe6n/bJS6SxH9UXAgJZdsCsOfcTa7X0Mjjin5Z8l2X7p1 /r/P5GH4nVlbsXJjsEbG2miK06OJvsThOTFMqMUqQQO+lD4JYiyhJQJUsCcwGNiK7b0Jrt /ZmlmTSpdk6gvid5MPs6I3eXUwFIksvi9lgpQQuVYtGbOiKGJ89S3zh6zCxn7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QfPgl3gpHz19Gc; Sun, 11 Jun 2023 19:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35BJGZKm052534; Sun, 11 Jun 2023 19:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BJGZY5052533; Sun, 11 Jun 2023 19:16:35 GMT (envelope-from git) Date: Sun, 11 Jun 2023 19:16:35 GMT Message-Id: <202306111916.35BJGZY5052533@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 761e1abcc6cc - main - audio/murmur: Fix build with OpenSSL 3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 761e1abcc6cc2418af9ee941c2c35d6f51b21760 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=761e1abcc6cc2418af9ee941c2c35d6f51b21760 commit 761e1abcc6cc2418af9ee941c2c35d6f51b21760 Author: Muhammad Moinur Rahman AuthorDate: 2023-06-11 17:53:50 +0000 Commit: Muhammad Moinur Rahman 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) {