git: 5d296656e828 - main - security/gnome-keyring: update to 48.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Jun 2025 10:07:51 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5d296656e82883d7dffb78e58622b9ace93f3c72
commit 5d296656e82883d7dffb78e58622b9ace93f3c72
Author: Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2025-06-11 08:04:29 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-06-11 10:07:04 +0000
security/gnome-keyring: update to 48.0
PR: 286697
---
security/gnome-keyring/Makefile | 21 +++++++++------------
security/gnome-keyring/distinfo | 6 +++---
.../files/patch-egg_egg-unix-credentials.c | 21 +++++++++++++++++++++
security/gnome-keyring/files/patch-pam_meson.build | 11 +++++++++++
security/gnome-keyring/pkg-plist | 8 +++++---
5 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index df8da5a36031..890d4ded0384 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,14 +1,14 @@
PORTNAME= gnome-keyring
-PORTVERSION= 42.1
-PORTREVISION= 6
+PORTVERSION= 48.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Program that keeps passwords and other secrets
+WWW= https://gitlab.gnome.org/GNOME/gnome-keyring
-LICENSE= GPLv2
+LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
@@ -20,17 +20,14 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libgcrypt.so:security/libgcrypt
RUN_DEPENDS= pinentry-gnome3:security/pinentry-gnome
-PORTSCOUT= limitw:1,even
-
-USE_GNOME= cairo gtk30 intlhack libxslt:build
-USES= compiler:c11 cpe gettext gmake gnome libtool localbase \
- pathfix pkgconfig tar:xz
+USE_GNOME= cairo glib20 gtk30 libxslt:build
+USES= compiler:c11 cpe gettext meson gnome localbase \
+ pkgconfig tar:xz
CPE_VENDOR= gnome
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib"
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Dssh-agent=true \
+ -Dselinux=disabled \
+ -Dsystemd=disabled
GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml
SUB_FILES= pkg-message
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 2cbd9e960351..146c1dd6fa41 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660069108
-SHA256 (gnome/gnome-keyring-42.1.tar.xz) = c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6
-SIZE (gnome/gnome-keyring-42.1.tar.xz) = 1346284
+TIMESTAMP = 1744563757
+SHA256 (gnome/gnome-keyring-48.0.tar.xz) = f20518c920e9ea3f9c9b8b44be8c50d8d7feecd0dd5624960f77bd2ca4fbeb9d
+SIZE (gnome/gnome-keyring-48.0.tar.xz) = 767428
diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
new file mode 100644
index 000000000000..e54c436a03df
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
@@ -0,0 +1,21 @@
+--- egg/egg-unix-credentials.c.orig 2025-03-18 08:38:44 UTC
++++ egg/egg-unix-credentials.c
+@@ -142,7 +142,9 @@ egg_unix_credentials_read (int sock, pid_t *pid, uid_t
+ cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
+ *pid = 0;
+ *uid = cred->sc_euid;
++#ifndef __FreeBSD__
+ set_local_creds(sock, 0);
++#endif
+ #elif defined(HAVE_GETPEEREID) /* OpenBSD */
+ uid_t euid;
+ gid_t egid;
+@@ -230,7 +232,7 @@ egg_unix_credentials_setup (int sock)
+ #if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
+ int val = 1;
+ if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
+- fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
++ fprintf (stderr, "unable to set LOCAL_CREDS socket option\n");
+ retval = -1;
+ }
+ #endif
diff --git a/security/gnome-keyring/files/patch-pam_meson.build b/security/gnome-keyring/files/patch-pam_meson.build
new file mode 100644
index 000000000000..9a488d71adab
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pam_meson.build
@@ -0,0 +1,11 @@
+--- pam/meson.build.orig 2025-03-18 08:38:44 UTC
++++ pam/meson.build
+@@ -33,7 +33,7 @@ libpam_gkr = shared_library('pam_gnome_keyring',
+ link_depends: pam_gkr_symbolmap,
+ include_directories: config_h_inc,
+ install: true,
+- install_dir: get_option('libdir') / 'security',
++ install_dir: get_option('libdir'),
+ )
+
+ libpam_gkr_dep = declare_dependency(
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index d54d389c6add..648922830943 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -10,13 +10,11 @@ lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
lib/gnome-keyring/devel/gkm-xdg-store-standalone.so
lib/pam_gnome_keyring.so
lib/pkcs11/gnome-keyring-pkcs11.so
-share/man/man1/gnome-keyring-3.1.gz
-share/man/man1/gnome-keyring-daemon.1.gz
-share/man/man1/gnome-keyring.1.gz
share/GConf/gsettings/org.gnome.crypto.cache.convert
share/dbus-1/services/org.freedesktop.impl.portal.Secret.service
share/dbus-1/services/org.freedesktop.secrets.service
share/dbus-1/services/org.gnome.keyring.service
+share/locale/ab/LC_MESSAGES/gnome-keyring.mo
share/locale/af/LC_MESSAGES/gnome-keyring.mo
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
share/locale/as/LC_MESSAGES/gnome-keyring.mo
@@ -61,6 +59,7 @@ share/locale/is/LC_MESSAGES/gnome-keyring.mo
share/locale/it/LC_MESSAGES/gnome-keyring.mo
share/locale/ja/LC_MESSAGES/gnome-keyring.mo
share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/kab/LC_MESSAGES/gnome-keyring.mo
share/locale/kk/LC_MESSAGES/gnome-keyring.mo
share/locale/km/LC_MESSAGES/gnome-keyring.mo
share/locale/kn/LC_MESSAGES/gnome-keyring.mo
@@ -107,5 +106,8 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+share/man/man1/gnome-keyring-3.1.gz
+share/man/man1/gnome-keyring-daemon.1.gz
+share/man/man1/gnome-keyring.1.gz
share/p11-kit/modules/gnome-keyring.module
share/xdg-desktop-portal/portals/gnome-keyring.portal