From nobody Thu May 16 08:30:30 2024 X-Original-To: dev-commits-ports-all@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 4Vg3FL40bgz5KrHm; Thu, 16 May 2024 08:30:30 +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 4Vg3FL3QRGz4Qpf; Thu, 16 May 2024 08:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715848230; 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=Pjp5NiEIpc7S3el9wmpIqaeapDGhMAXO68FZR52Xm20=; b=q0/acYrCQV1CoWlhdwxrZrR138IgL8BKXvVsrbh20g+cnnHyCysbN1y9FeATeFIwPalFiB p9H7OzvHiqn2p2JxEtIVtCqitM9cB713ZEkPn80T3UjSSmCutNxycCcJ8CCN8QVIYcqGVW EZSE/er/h0OzgvHJ7qM7DbImlWaYLoVjv6Kj/oJK0Uk10/4mQvohhLaHaJ/Y4KndFDzWYk 657LePq1s+Y61B9AN+asVhKrK78Y7J4CFrF0lE98ryGSHn6VJyRF9zl2Pz1LNoZnzkW/20 6AIVursus0AukhMrvf2dRz/A0KPlFKmCLipKnTqjihkcZ6OTnyMdxhlWhRHB8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715848230; a=rsa-sha256; cv=none; b=EVrEZKDIy6FsJZZdxT7+GrT0n6QUqXRZG2069GT3ZYy4kcirsgsiOusvCs7agQXfjZIaq4 OLbXTTD/mfCdNuLZJAR4QtkU5hAsuybGPmh5Utkig7maJmg6nkAedFasZkJXrlSR42ljYH bgRGdzLYiNoj1OyNZJKzAk7x0ILqoHyEzFgedZdtw0w7PVaehMa6wHukV3MkGrUctjTvu2 aUwFFa4iWZJTLgN8ruZ0IWgOtIZ1Mle8wBws5z68Sn1gYJUKB8z9joyNCtLPBGrkzlImdi Xpw3rENol1irOIqF3f0Y1EizKLEaFRZHU7FHYqkqA4UIFE3qTJOMXnr+zg53Zg== 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=1715848230; 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=Pjp5NiEIpc7S3el9wmpIqaeapDGhMAXO68FZR52Xm20=; b=kM0gNzFxbJQvWY8CbLwkpRmzIUfaXj6Z7ckGx3s84ERo+4l++97EsKFrPvULw3DFCAiqdr tQ5Kf9R+RMZyL9pnc938HcLbH9XBPtXP3vha7bq0BrKDObjSpkiT5v1tiiT5PlODAIUT8z CXhO8QQQ15ckywtHlD7uWPvfKuLRaQyE03+NOxi1El9zoP+Z7/nmbTRIUFDjV/WFMeT7DG tnh5jqOjSEj+T2GNmeF7rmmrrdx0MFa8mPyKEB9nXLnasFtCN75msv+6lJyE8dsD27TMBG jy2Pf+nMzEohTToxPgeNo9n3ucVtfME47ZkodvpseWKtdtTFSQyaxumCDNcx7g== 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 4Vg3FL31ckzrdS; Thu, 16 May 2024 08:30:30 +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 44G8UUC0048965; Thu, 16 May 2024 08:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44G8UUt3048962; Thu, 16 May 2024 08:30:30 GMT (envelope-from git) Date: Thu, 16 May 2024 08:30:30 GMT Message-Id: <202405160830.44G8UUt3048962@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: 3f7e010b24f8 - main - emulators/wine-devel: Unbreak WoW64 again List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 3f7e010b24f898f6f4128cc81ee9cb90b1a78277 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f7e010b24f898f6f4128cc81ee9cb90b1a78277 commit 3f7e010b24f898f6f4128cc81ee9cb90b1a78277 Author: Gerald Pfeifer AuthorDate: 2024-05-16 08:29:14 +0000 Commit: Gerald Pfeifer CommitDate: 2024-05-16 08:30:07 +0000 emulators/wine-devel: 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 adjusted version. PR: 278427 Obtained from: Alex S in PR 278525 --- emulators/wine-devel/Makefile | 1 + .../files/patch-dlls_ntdll_unix_loader.c | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 5939a449dc25..a081b90e8ab5 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 9.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.x/ diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c new file mode 100644 index 000000000000..97f237d79c30 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c @@ -0,0 +1,24 @@ +--- dlls/ntdll/unix/loader.c.orig 2024-04-05 17:03:05 UTC ++++ dlls/ntdll/unix/loader.c +@@ -480,6 +480,21 @@ char *get_alternate_wineloader( WORD machine ) + + 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; ++ } ++ } ++ + /* try the 64-bit loader */ + if (current_machine == IMAGE_FILE_MACHINE_I386 && machine == IMAGE_FILE_MACHINE_AMD64) + {