From nobody Thu Oct 28 07:44:19 2021 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 12911181DCFD; Thu, 28 Oct 2021 07:44:20 +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 4HfyHl7232z4fmT; Thu, 28 Oct 2021 07:44:19 +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 C922A1FDBD; Thu, 28 Oct 2021 07:44:19 +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 19S7iJgQ089879; Thu, 28 Oct 2021 07:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S7iJvf089878; Thu, 28 Oct 2021 07:44:19 GMT (envelope-from git) Date: Thu, 28 Oct 2021 07:44:19 GMT Message-Id: <202110280744.19S7iJvf089878@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: 2a166ec5f43b - main - emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 2a166ec5f43bcafcecfc3f4172901c831b84482e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a166ec5f43bcafcecfc3f4172901c831b84482e commit 2a166ec5f43bcafcecfc3f4172901c831b84482e Author: Alex S AuthorDate: 2021-10-28 07:43:33 +0000 Commit: Gerald Pfeifer CommitDate: 2021-10-28 07:43:33 +0000 emulators/wine-devel: 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 --- emulators/wine/files/pkg32.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh index 267fb8b38ca4..d75422997e12 100644 --- a/emulators/wine/files/pkg32.sh +++ b/emulators/wine/files/pkg32.sh @@ -8,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/) # Show what we're going to do, then do it. echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"