From nobody Sun Jul 24 21:15:08 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 4LrbY85BZLz4XZP0; Sun, 24 Jul 2022 21:15:08 +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 4LrbY84llgz3mwg; Sun, 24 Jul 2022 21:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658697308; 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=GiNeq1oF9h/FK8RE0VcZXtt3bDD9Ibq1JTfvOl+pTRE=; b=e4MI2vkZqcYHKVe3+KisZg+OR2z8e9p3HhGExP6AxZCWqBgSWQq48AZxyPrk+zzoVposJy lhY0tBAETc3pix2UF36PwekcgdHoUfYESrd6GLxqKik+h5Lob3ow73W/Ax+P7AdMqFkmwJ 45zeuYuujoPXdHADGh8vUIcbSH2HpK9zaqYv6eJ1y8ZhYLMAgP/URkWgkRVUUxp1cHBBqW qLpaT1F0Bwd/uueVSXFvfH6zj+9KHTutdYpWQx5AsW4g5ezZhrTFh4vSg9CY+3XNzZKzZL 8yJ26h8aW5Ca14kI3nH+c750skSZVSATgJwQ4lNUn6WV92MhW7GVy9OTtx/22A== 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 4LrbY83q27zXyF; Sun, 24 Jul 2022 21:15:08 +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 26OLF8lM069021; Sun, 24 Jul 2022 21:15:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OLF8Q9069020; Sun, 24 Jul 2022 21:15:08 GMT (envelope-from git) Date: Sun, 24 Jul 2022 21:15:08 GMT Message-Id: <202207242115.26OLF8Q9069020@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 023338f7d107 - main - emulators/wine-proton: Fix crash due to ASLR 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 023338f7d107b80a8a40b6aadbcf7cccce0354f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658697308; 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=GiNeq1oF9h/FK8RE0VcZXtt3bDD9Ibq1JTfvOl+pTRE=; b=DdZX8W6f3ceTm+AUOOmNGjBWGi6hUr9uZDCXK7/mEqK/UpnGOSLt7LTNz8YYtMOtYA1Tnr hrBZwZxjtRdXLcv73xbp4b27rnHanMEszTq9dpiUahFfz8eVyPFiA0KQ7u+e6wwukptx+R oQ4LbHIAOkLqAdM9NE+XCPmSF9EbhttPsvwxNq65ahVH715YiOGZIFU/oOyl3PYJMwCVh9 Ovz7Q1qsvWktwfZKv/n0VdgxDRrrS2zNIcDDA4tdfgQCqUhSgqzn2zG2I4zKUwFoJ5SyvU nEoiA7QXjn1neKQYBJJippo0tOkR5gdzuJFJrCe7v9tJD9oRFJlNsSzLyiNSvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658697308; a=rsa-sha256; cv=none; b=DlwJplMeLeJMmnE/eGzFVIoCvhIhFq2ZcEnGoLNGvj+vldujUI2EpW9gu8nmpuxx/uV2IQ /QAckjmLlOMZifA+A9Ahjj7aDX2tfrncBeM4l/vObXuYG1JgXXuyftEfTS4/7J43FntIue NWKxH9Dj3hu9upHfrOCLwHS9XfPjSVbqMTIpBnW7EVSrR8oejfkPpuoHzBioiYlRJoTf9q 2kutj2Zh2F4x4jRVN5ZKEpLKJWJ6NO0ivxqdJIke0fLmkGqJ93CQ/FdHYQ/QumjlbidlQl 7G/a1nzWpDr1ztvdGlaKrn+aCq9G0yE/727aMRx6cDPe7Q5k5h5MMohbLzog/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=023338f7d107b80a8a40b6aadbcf7cccce0354f2 commit 023338f7d107b80a8a40b6aadbcf7cccce0354f2 Author: Stefan Eßer AuthorDate: 2022-07-24 21:14:23 +0000 Commit: Stefan Eßer CommitDate: 2022-07-24 21:14:23 +0000 emulators/wine-proton: Fix crash due to ASLR ASLR has been enabled by default on -CURRENT and -STABLE and this causes Wine to crash. The clean solution would be to implement some memory mapping code that already exists for macOS and Linux, but this is not an essy task. In order to allow use of Wine on systems with ASLR mark the Wine executables as not compatible with ASLR using elfctl. This allows to keeps ASLR enabled on the system for all other binaries. If the required memory mapping functionality is made available, the elfctl commands should be removed from this and the other Wine ports. Approved by: portmgr (implicit) --- emulators/wine-proton/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index a648a13c545f..9ad4465e5310 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine-proton DISTVERSION= 6.3-2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MAINTAINER= iwtcex@gmail.com @@ -108,10 +108,12 @@ post-install: .if ${ARCH} == i386 ${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver32 ${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine.bin + -${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine.bin ${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine .else ${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh ${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin + -${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin ${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64 ${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine .endif