Created attachment 245200 [details] Patch for p11-kit Backport upstream commit d1d4b0ac316a27c739ff91e6c4153f1154e96e5a References: https://github.com/p11-glue/p11-kit/commit/d1d4b0ac316a27c739ff91e6c4153f1154e96e5a
Compile and runtime tested on FreeBSD 13.2-RELEASE (amd64) (make, make check-plist, make test) Poudriere testport OK 12.4-RELEASE (amd64) Poudriere testport OK 13.2-RELEASE (amd64) Tested with following consumers in 13.2-RELEASE (amd64) using Poudriere: security/softhsm2 security/sssd-devel biology/ncbi-blast+ biology/ncbi-toolkit cad/opencascade databases/evolution-data-server devel/libgdata devel/qt6-base mail/evolution net/gnome-online-accounts net/pacemaker2 net-p2p/ncdc security/gcr security/gnome-keyring (skipped due to plist issues) security/gnutls security/sssd-devel www/epiphany www/midori x11/gnome-shell
(In reply to Daniel Engberg from comment #1) Hi Daniel, thanks for the patch. Actually, I have this update sitting in my stash for a while now, and the reason for that is that: > security/gnome-keyring (skipped due to plist issues) I don't think this could be skipped. I guess the plist issue you're seeing is related to the new ".module" file missing from plist? For me this issue only occurs with this new version of the p11-kit. I wasn't able to quickly figure out if that change is intentional, and what specific change p11-kit changed this behavior.
It's not missing, it gets moved which seems to be correct looking at results when doing a quick search on Google. etc/pkcs11/modules/gnome-keyring.module --> share/p11-kit/modules/gnome-keyring.module
(In reply to Daniel Engberg from comment #3) Then security/gnome-keyring's plist should be updated as a part of this update, so we don't break its plist.
I'm fine with the changes in p11-kit. I'm not sure we need to wait for approval for security/gnome-keyring if we're fixing a plist issue caused directly by this upgrade.
Hi Daniel, any plans on pushing that?
They depend on each other, feel free to push once you're comfortable with bumping p11-kit in tree.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=64a8439c84aa38daeeed7b0ef0d0622abb84333e commit 64a8439c84aa38daeeed7b0ef0d0622abb84333e Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-10-18 15:16:21 +0000 Commit: Roman Bogorodskiy <novel@FreeBSD.org> CommitDate: 2023-10-22 16:43:13 +0000 security/p11-kit: Update to 0.25.0 PR: 274069 Approved by: novel (maintainer) security/p11-kit/Makefile | 8 +++++--- security/p11-kit/distinfo | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
Committed, thanks!