Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Oct 2021 07:44:19 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2a166ec5f43b - main - emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3
Message-ID:  <202110280744.19S7iJvf089878@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2a166ec5f43bcafcecfc3f4172901c831b84482e

commit 2a166ec5f43bcafcecfc3f4172901c831b84482e
Author:     Alex S <iwtcex@gmail.com>
AuthorDate: 2021-10-28 07:43:33 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
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" "$@"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110280744.19S7iJvf089878>