From nobody Sun Oct 16 23:55:57 2022
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 4MrH7y21Csz4fB4b;
Sun, 16 Oct 2022 23:55:58 +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 4MrH7y1TsBz3g0n;
Sun, 16 Oct 2022 23:55:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1665964558;
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=HSpeZ5fREDOCCWkz3pjfQWCb+VnZA3ebiG7EQuSqzz4=;
b=S9p59MFbFTOD3ODw9moGZVuPSM2skhUEdy1O6dkf4uncc3bIhAr1MgiY7F8H8+A3L7bFj8
7TKzGDnGPWRsgXhJMG0+HkhsFqeibZgiFpisHRzAF91NJr5b3CU8zOrFNlcw7RLBEkMyEj
mHRp3n0bIZORlAgq+Os+AjbpejUGbndXeIt6RF8k6gj6ck8b0Iw7RSIyH9UMWtEecZ2ac6
/ocLDyyPiGGcX89DWGF9AuTBRbNqz7AO+/08+j3tYGNcPyoh38hdKnOGrRAIQnqTNe4dSz
UuB0xCiylic9J43Vh/a/7dXtrMUHVqHxXXXG1CmgPJIzzoeW+BeD++njf8jLAA==
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 4MrH7y0QwzzdHS;
Sun, 16 Oct 2022 23:55:58 +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 29GNtvmw034442;
Sun, 16 Oct 2022 23:55:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GNtvb7034441;
Sun, 16 Oct 2022 23:55:57 GMT
(envelope-from git)
Date: Sun, 16 Oct 2022 23:55:57 GMT
Message-Id: <202210162355.29GNtvb7034441@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Yuri Victorovich <yuri@FreeBSD.org>
Subject: git: 4838430844ed - main - audio/dexed: Add better workaround for broken ENVIRON(7) in shared libraries
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
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: yuri
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4838430844ed6d3a86ad82c591af3a575db113ab
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1665964558;
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=HSpeZ5fREDOCCWkz3pjfQWCb+VnZA3ebiG7EQuSqzz4=;
b=MUZeRvWWGfS5kfzRHB4MmL118OgxPKlSxsWdZEIWbGZ9j4IgCv47QtujtnrhGSbwo1uqNP
RePZfzsep80O/fokJvJuanhW2g8W1Hbvya9Ppplj9qQIHFFzERwt5Q2zz8M6RgJh4RZMJ2
kcBPd2ssJXMtrq6sAWhp01dudXmUsIICQFIf1VpzRsstIyzdJ5Vu6TaowpVFMRLm8oQeWx
MPOJxEkBP0mzsXK27HSia2EMBDDJVn2NMVYLsUTTG//R8LcKLDEZxOj1SU7LCeM4Jrsfvj
Hg5o+L29QLWtS30gNF5DH/spjF7ktzBM3yRqFDLL6Qkrg8JNEAV5iuqMSf45Rg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665964558; a=rsa-sha256; cv=none;
b=T7RR1gzll4NMrNsRk/lz+cqEDqbS6RKVUZXow/69/6gly0FchBCxqNG9y7ELtJrLuXxE/d
lmpFT82hh2k+FvuPNcAtkwN/Jg2efA9Ifsv79WHa/jMSMOeFs15M91bo2TiDZS3QGtNvvY
se1q6O1xLVx5AHaSCHtdZOaEwoVW9LDOeNAe7h4Ev5sZ7KsjqCmLOWQHKltvdAk82e2hkU
DZLPtSjD/M1T7fk5CDGEFoBNVZtm2PHntJ0VwGBEa7AVUfVVCMndNUvPMGV07LLNUriZuv
tvgyx0Ry8kc8kTR63abwiEYNCYVa1XQihHMUM1er+96scccSNiDYLAqeSUkasQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4838430844ed6d3a86ad82c591af3a575db113ab
commit 4838430844ed6d3a86ad82c591af3a575db113ab
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-10-16 23:42:04 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-10-16 23:55:55 +0000
audio/dexed: Add better workaround for broken ENVIRON(7) in shared libraries
---
audio/dexed/Makefile | 2 +-
...ibs_JUCE_modules_juce__core_native_juce__linux__Files.cpp | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/audio/dexed/Makefile b/audio/dexed/Makefile
index c449fd29c0c1..d50b38503dbb 100644
--- a/audio/dexed/Makefile
+++ b/audio/dexed/Makefile
@@ -2,7 +2,7 @@ PORTNAME= dexed
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.6-16
DISTVERSIONSUFFIX= -g1df9a58
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
PKGNAMESUFFIX= -synth
diff --git a/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_juce__linux__Files.cpp b/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_juce__linux__Files.cpp
index 2814210653f1..0d81b4ad053b 100644
--- a/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_juce__linux__Files.cpp
+++ b/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_juce__linux__Files.cpp
@@ -1,22 +1,24 @@
- otherwise it fails with unknown 'environ' symbol, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263265
---- libs/JUCE/modules/juce_core/native/juce_linux_Files.cpp.orig 2022-04-13 18:55:08 UTC
+--- libs/JUCE/modules/juce_core/native/juce_linux_Files.cpp.orig 2022-08-15 18:29:17 UTC
+++ libs/JUCE/modules/juce_core/native/juce_linux_Files.cpp
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,9 @@
*/
#if JUCE_BSD
-extern char** environ;
-+//extern char** environ;
++//extern char** environ; // this is broken on FreeBSD, see https://reviews.freebsd.org/D30842
++#include <dlfcn.h>
++static char*** environ_ptr = (char***)dlsym(RTLD_DEFAULT, "environ"); // workaround for the above
#endif
namespace juce
-@@ -230,7 +230,7 @@ bool Process::openDocument (const String& fileName, co
+@@ -229,7 +231,7 @@ bool Process::openDocument (const String& fileName, co
setsid();
// Child process
- execve (argv[0], (char**) argv, environ);
-+ execv (argv[0], (char**) argv);
++ execve (argv[0], (char**) argv, *environ_ptr);
exit (0);
}