From nobody Sun Dec 17 23:00:03 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 4StdhM4yZLz54Pfr; Sun, 17 Dec 2023 23:00:03 +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 4StdhM4YjKz3Zl0; Sun, 17 Dec 2023 23:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702854003; 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=JR+gJwdGVOCdsfYhoGAanfp7HuMq4DcsuI5swdcYtik=; b=Hm1mMSryK0r0agNLG9QQEIz0Mgza6XhiSvng5Ey0hkhxG0st1kGpBO74cHLNraex8fni5u 8mZQrFKWMz0J+9rcgyze68zWskXV68rEr88AsN7SJksL+Bb6bC+bIlfccWV7U0iTacaMuP aMNvJ/neGHkMa66685Ysj0jib0JJ0qTx+3rtqGrcvIMG+cGb6GTjC/jZZSe0cWw7vYFX6p RVn4YYStjNi2QtwI5GV77ctodwAXQCKU8dVWi1mJM4qrD7hBezi+a2410BFD+yJtwy6KcG j0ffvWEqjm1mpVA1TCBpkiuw0xAfsHfneTRpS0JXdL3fF0IiYfFxqVSWnphWHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702854003; a=rsa-sha256; cv=none; b=hJ4ZSEQteyK+BMNivpVD4LTMJO4Q3U6be3TJ1i54qdms5qvWidxUQ+r6ZFQ9rcFMcdCdsT 229W16/0N8kw3czO1VcfQTyZ7TFeEwR5svPhXdoJez/3fHmSuhqLbeqNGd0z2FFSu3SYmo MWMM9mB7hrLjjgk6CW+LWB7TtlDrMG8wuOqQ6PxTKkvYXc1n/hmUvrG+7Gp77tg09iFeFF lj8gbXMNOEKLXmO1Nq2lr3r49KQnC03axe1BBfdPPWnGGb5A7t0YJ0FodzG92g6Xs0mcg7 QmsFDmGovIoAa6CtuWkwWSQdDk83D52PjJ28cy05Z679S7t1AtV5kq0VTkH44g== 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=1702854003; 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=JR+gJwdGVOCdsfYhoGAanfp7HuMq4DcsuI5swdcYtik=; b=xamb6qT889Q9r2nzGwgjn7/UAH+UraNS3ejC/lT3RPT5zr2rWczC8ngejZCUA4nzlFhReW 1f5UnuNHgXPSeMaOZ9YFsjybYFFHsvXV8rPu/JehRXL5nYvetEIJTcdaKRiqfHQEXuC+9V q8ZVNhQpCh8525FAYNke9MDOol4HTTw/xHYguuzyhrIWDwjxjnezcGFgwWbLkuHbNEkOzV zenkQUIYhxPsXpAiqo0UKGZGEK6Ndb8v1w3xFRofFSfyTjjsR0y4Z9fICJqvJA4xKDbHWC 8sTVNJyKETbftDPdPtIt/r7rCaJuPkPkPNwMD9OFi3gve4uvkbVtaJFzIMB4Kw== 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 4StdhM3L9mzwXZ; Sun, 17 Dec 2023 23:00:03 +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 3BHN03v3049281; Sun, 17 Dec 2023 23:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BHN03l9049275; Sun, 17 Dec 2023 23:00:03 GMT (envelope-from git) Date: Sun, 17 Dec 2023 23:00:03 GMT Message-Id: <202312172300.3BHN03l9049275@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: 0f2052c3784e - main - emulators/wine: Unbreak WoW64 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f2052c3784e3b8d5aed85aab22b8a49613ee85c Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f2052c3784e3b8d5aed85aab22b8a49613ee85c commit 0f2052c3784e3b8d5aed85aab22b8a49613ee85c Author: Alexander Vereeken AuthorDate: 2023-12-17 22:58:41 +0000 Commit: Gerald Pfeifer CommitDate: 2023-12-17 22:59:27 +0000 emulators/wine: Unbreak WoW64 This is an excerpt of 1f07ec6014 by Alex S for emulators/wine-proton. PR: 275677 --- emulators/wine/Makefile | 1 + .../wine/files/patch-dlls_ntdll_unix_loader.c | 24 ++++++++++++++++++++++ emulators/wine/files/wine.sh | 11 ++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index e5ac5f97ad35..7851e78ca478 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 8.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/8.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..c290524821a4 --- /dev/null +++ b/emulators/wine/files/patch-dlls_ntdll_unix_loader.c @@ -0,0 +1,24 @@ +--- dlls/ntdll/unix/loader.c.orig 2023-07-19 15:29:22 UTC ++++ dlls/ntdll/unix/loader.c +@@ -694,6 +694,21 @@ static NTSTATUS loader_exec( char **argv, WORD machine + { + if (machine != current_machine) + { ++ 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) { ++ argv[1] = malloc(strlen(s) + 3); ++ strcpy(argv[1], s); ++ strcat(argv[1], "64"); ++ } else { ++ argv[1] = s; ++ } ++ preloader_exec(argv); ++ } ++ } ++ + if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ + { + size_t len = strlen(wineloader); diff --git a/emulators/wine/files/wine.sh b/emulators/wine/files/wine.sh index 96a350fce615..057406196371 100644 --- a/emulators/wine/files/wine.sh +++ b/emulators/wine/files/wine.sh @@ -2,9 +2,16 @@ TARGET="$(realpath "$0")" -if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ] +if [ -z "$WINESERVER" ] then - export WINESERVER="${TARGET}server32" + if [ -f "${TARGET%/*}/wineserver" ] + then + export WINESERVER="${TARGET%/*}/wineserver" + fi + if [ -f "${TARGET%/*}/wineserver32" ] + then + export WINESERVER="${TARGET%/*}/wineserver32" + fi fi # Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257