From nobody Tue Oct 26 20:49:33 2021 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 574B01820F9B; Tue, 26 Oct 2021 20:49:33 +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 4Hf3pj2322z3MxS; Tue, 26 Oct 2021 20:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2688223336; Tue, 26 Oct 2021 20:49:33 +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 19QKnXnQ091173; Tue, 26 Oct 2021 20:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QKnXs3091172; Tue, 26 Oct 2021 20:49:33 GMT (envelope-from git) Date: Tue, 26 Oct 2021 20:49:33 GMT Message-Id: <202110262049.19QKnXs3091172@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: 0ce96f7c97a1 - main - emulators/wine-proton: Adjust pkg32.sh to pkg 1.17.3 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: 0ce96f7c97a168d3b01e4f46296a410761f5c302 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ce96f7c97a168d3b01e4f46296a410761f5c302 commit 0ce96f7c97a168d3b01e4f46296a410761f5c302 Author: Alex S AuthorDate: 2021-10-26 20:48:48 +0000 Commit: Gerald Pfeifer CommitDate: 2021-10-26 20:48:48 +0000 emulators/wine-proton: Adjust pkg32.sh to pkg 1.17.3 After recent changes, given an uninitialized root dir pkg now fails with: pkg: Error opening the trusted directory /usr/share/keys/pkg/trusted pkg: Error loading trusted certificates This works around it for our WoW setup. PR: 259404 Approved: maintainer (= author) --- emulators/wine-proton/files/pkg32.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/emulators/wine-proton/files/pkg32.sh b/emulators/wine-proton/files/pkg32.sh index 7aebca5b7cd1..6e87ee27add3 100644 --- a/emulators/wine-proton/files/pkg32.sh +++ b/emulators/wine-proton/files/pkg32.sh @@ -1,4 +1,5 @@ #!/bin/sh -e + if [ "$(id -u)" = 0 ] then echo "Don't run this script as root!" @@ -7,7 +8,12 @@ fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" -mkdir -p "$I386_ROOT" +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] +then + mkdir -p "$I386_ROOT/usr/share/keys" + ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" +fi + ABI=$(pkg config ABI | sed s/amd64/i386/) echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"