From nobody Fri May 10 07:55:58 2024 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 4VbLmG2dfwz5L5qX; Fri, 10 May 2024 07: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 4VbLmG215pz446V; Fri, 10 May 2024 07: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=1715327758; 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=pG9eB79tA9xrxR7/F/e0tLFZLXxnOVIafYZprtLRDBU=; b=MJu1kNT4JRGz5CtK57UWXvf4uguEE5jTexM6BK8n+I521GP9lakXUIBr8oyMX+7sMnIVy2 QjV/9vYa4+UIgeEhTTINUvz5+Nf7WOo4iIgCN2g05tODQpd+qVA9AkgViWzqKx0vdDCbjP MPkXn5f0CScrwt8/CIYoh358MrLnGkAqqrAE49kQSErSHKSOVZmh8P4zQ+hHxOBxzH6Vc+ H7zVjglooXMXwURdNfuI8p77ZGZDTG0oW3iashI+vAp7ZfItNMI2kKsinKg2j5oWQlYCPA R0NbVlF8jU1V6g/j8NDk03GEdnftlWNiZDAqCxRpVQKw9fCW8EexwWvF3vlZAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715327758; a=rsa-sha256; cv=none; b=SUz16g5HAYY6OrrvHffjNWr2F8wVDiguZUQXFouLl+KYbJSGVBWrwYF78E8CSJWW6qO+MT dRcCwmEsUFS04emRa5twn1k7KO08JqrTYCR9ghig6+DvvjKaPrBHozKnHNR6d9cDXAvr6n +QgdcqtIR9jFpGkM4hoakms+DoF1LRP9FDBOAbHRy0AJIRRpboCAR9hwoW+Snp5I1cHgkv Yc9zNCjvbQ7hnfFnq9A8FfV/I3ntmRiWrYZjuGFY+WI0AsqYF1DEQgu8ojoc0tBdEu6tBj KKPS3K7/2hgSyZXRmLN/IFZbUGZSJwPJdc7LYVRzxFKsCr3fTwPq4GMN6Vw6rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715327758; 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=pG9eB79tA9xrxR7/F/e0tLFZLXxnOVIafYZprtLRDBU=; b=uvNckNZ0xmFEpXLESyOwbAuMp5Z8d9sB/yLSgTEaQ+UhNEmIeqzJCpS3RSFOIJX+n/DGaW 9ibv1NKNgE7f1j6MMtAtLb97pH0ymZ3Pa/RBb+WTHxT5iUMekjrK1jPfprpacBrBZwZ1th FvOkICCkOfmkCDnCuGBOqFKKPXTJd1udhgK/5OKhpZHHBSydCROcrXl2If/vyNYUaA4m8C 4mxMeAtdTYdjWTbwJHq+UqyBs+cjj9Mgyge4q+/WLoXvrdGWPADLTuqI8Y06mZYOfv3HRR mOohIiSyQ/+d7izT0VGGWjyksTrxScM0DMCTfV2vHR5FSO5o5M8dFCkwFn1wrg== 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 4VbLmG1b4WzSk6; Fri, 10 May 2024 07:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44A7twbB027672; Fri, 10 May 2024 07:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A7tweT027669; Fri, 10 May 2024 07:55:58 GMT (envelope-from git) Date: Fri, 10 May 2024 07:55:58 GMT Message-Id: <202405100755.44A7tweT027669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 3bde6b5aeee5 - main - emulators/wine: Unbreak WoW64 again 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bde6b5aeee56da01d237854c5be9854c7a27995 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bde6b5aeee56da01d237854c5be9854c7a27995 commit 3bde6b5aeee56da01d237854c5be9854c7a27995 Author: Gerald Pfeifer AuthorDate: 2024-05-10 07:54:52 +0000 Commit: Gerald Pfeifer CommitDate: 2024-05-10 07:55:45 +0000 emulators/wine: Unbreak WoW64 again Restore files/patch-dlls_ntdll_unix_loader.c which we "lost" with the update to Wine 9.0 by means of an updated version based on a version for emulators/wine-devel by Alex S in PR 278525. PR: 278427 --- emulators/wine/Makefile | 2 +- .../wine/files/patch-dlls_ntdll_unix_loader.c | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index f4e6d8dd9ecf..df8365ba92ac 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 9.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.0/ diff --git a/emulators/wine/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine/files/patch-dlls_ntdll_unix_loader.c new file mode 100644 index 000000000000..599c4ee0d53a --- /dev/null +++ b/emulators/wine/files/patch-dlls_ntdll_unix_loader.c @@ -0,0 +1,25 @@ +--- UTC +--- dlls/ntdll/unix/loader.c.orig 2024-01-16 20:55:47 ++++ dlls/ntdll/unix/loader.c 2024-05-10 07:03:04 +@@ -480,6 +480,21 @@ + + if (machine == current_machine) return NULL; + ++ char* wineserver_path = getenv("WINESERVER"); ++ if (wineserver_path != NULL && wineserver_path[0] == '/') { ++ char* s = remove_tail(wineserver_path, "server"); ++ if (s != NULL) { ++ if (machine == IMAGE_FILE_MACHINE_AMD64) { ++ ret = malloc(strlen(s) + 3); ++ strcpy(ret, s); ++ strcat(ret, "64"); ++ } else { ++ ret = s; ++ } ++ return ret; ++ } ++ } ++ + if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ + { + size_t len = strlen(wineloader);