[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Mart Raudsepp]

commit:     d91ec7bf4ecbbfcdb7a4cb7889c33ed6cd7c2519
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 10:37:07 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 10:37:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91ec7bf

gnome-base/gnome-keyring: bump to 3.31.91

Closes: https://bugs.gentoo.org/683674
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-keyring/Manifest                  |  1 +
 .../gnome-keyring/files/3.31.91-fix-musl.patch     | 27 +++++++
 .../gnome-keyring/gnome-keyring-3.31.91.ebuild     | 82 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a7682528e16..3819347d7fd 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-keyring-3.20.0.tar.xz 1215324 BLAKE2B 97a4663fac7d3e854a742ac2f160fda2b40c5ff9f7316b52197955aa1970732ef323252325a021469d4944e962b1f1b868d300476b854f21cc5636961e3972da SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b
 DIST gnome-keyring-3.20.1.tar.xz 1219800 BLAKE2B b0c633575ee35a733bbf04322e4413675bc40d4de256b66183138483f50c1d399a450cd4d06a3d76707948a7c541ef129a3385044f109a37677af6a7fc01e9af SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177
 DIST gnome-keyring-3.28.2.tar.xz 1322108 BLAKE2B 416697befb7670c3b854ff8d70626d495f5ba77691a062f854360e25a76766f5023e998b86114d36965023a5efefc2eb0ab1dca9aa03d73351eafebaa4920784 SHA512 a51bc9d6bc9203b86febe99bdbf893d3ba0eeaad976ece2bd49efc3869bd1d15f440a01999ce969f845f8336538de22e9f1161da990d707cbadb99d5cc3549bc
+DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210

diff --git a/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch b/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch
new file mode 100644
index 00000000000..85aebcd3001
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch
@@ -0,0 +1,27 @@
+From 7a8b7d2ebfbb831840e6d58dbb1109f4c31d6ba4 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@src.gnome.org>
+Date: Fri, 10 May 2019 15:47:33 +0200
+Subject: [PATCH] rpc-layer: fix build with musl-libc
+
+The recent POSIX suggests to include <sys/select.h> for select().
+
+Reported by Anthony G. Basile.
+---
+ pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
+index 5024e1e1..b3fb6707 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
++++ b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
+@@ -34,6 +34,7 @@
+ 
+ #include <dlfcn.h>
+ #include <pthread.h>
++#include <sys/select.h>
+ 
+ #define SOCKET_PATH "/tmp/gkm-rpc-daemon.sock"
+ 
+-- 
+2.20.1
+

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91.ebuild
new file mode 100644
index 00000000000..c2415ad86fe
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.27.90:=[gtk]
+	>=dev-libs/glib-2.44:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	>=app-crypt/gnupg-2.0.28:=
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-musl.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc
+}
+
+src_test() {
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Sam James]

commit:     da33ef820a414ac3f3aba54fd9099cc4494d13fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 03:10:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 03:10:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da33ef82

gnome-base/gnome-keyring: fix modern C issue in tests

Closes: https://bugs.gentoo.org/922630
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-keyring-42.1-c99.patch             | 40 ++++++++++++++++++++++
 .../gnome-keyring/gnome-keyring-42.1-r2.ebuild     |  4 +++
 2 files changed, 44 insertions(+)

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch
new file mode 100644
index 000000000000..3dfd578b7407
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/922630
+https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/f298c87e14e89656992ccfd17b133f4f2ab9c5ea
+
+From f298c87e14e89656992ccfd17b133f4f2ab9c5ea Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Wed, 24 Jan 2024 14:01:06 -0500
+Subject: [PATCH] gkm: fix test-sexp with GCC 14
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+pkcs11/gkm/test-sexp.c: In function ‘test_sign_verify’:
+pkcs11/gkm/test-sexp.c:231:92: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+In file included from pkcs11/gkm/test-sexp.c:31:
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+pkcs11/gkm/test-sexp.c:251:87: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+pkcs11/gkm/test-sexp.c:271:91: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+--- a/pkcs11/gkm/test-sexp.c
++++ b/pkcs11/gkm/test-sexp.c
+@@ -221,10 +221,10 @@ test_sign_verify (Test *test, gconstpointer unused)
+ {
+ 	gcry_sexp_t pubkey = NULL;
+ 	gboolean ret;
+-	guchar data[] = TEST_DATA;
+-	guchar data_size = TEST_DATA_SIZE;
+-	guchar signature[128];
+-	gsize signature_size = 128;
++	CK_BYTE data[] = TEST_DATA;
++	CK_ULONG data_size = TEST_DATA_SIZE;
++	CK_BYTE signature[128];
++	CK_ULONG signature_size = 128;
+ 
+ 	/* RSA */
+ 	/* sign some data */
+-- 
+GitLab

diff --git a/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild
index 5cce53f7b4df..a2696c83bd79 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild
@@ -40,6 +40,10 @@ BDEPEND="
 	test? ( ${PYTHON_DEPS} )
 "
 
+PATCHES=(
+	"${FILESDIR}"/gnome-keyring-42.1-c99.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Pacho Ramos]

commit:     9e393cd5cae6c5e9d54a8313cdcad4e2a5c245ca
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 08:43:18 2025 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 09:26:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e393cd5

gnome-base/gnome-keyring: add 48.0

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 gnome-base/gnome-keyring/Manifest                  |   1 +
 ...gnome-keyring-48.0-collection-registering.patch | 161 +++++++++++++++++++++
 .../gnome-keyring-48.0-gkm_marshal-header.patch    |  24 +++
 gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild |  88 +++++++++++
 4 files changed, 274 insertions(+)

diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 81236a9bb976..8f888337b29b 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1 +1,2 @@
 DIST gnome-keyring-46.2.tar.xz 1359500 BLAKE2B 47dad5b1eab387e600016828c99d7c829f509e9929e0e06d6427f6c84053050be1e79c4fb369caa1cdfc862e20677a518155b1a5496a64e118f461e81b60edcd SHA512 4229ca0606bdd1b84a3c737288df7f1fc1f8715734e3001964babd882201c3d818deabb3a7662dbf9b67316f03b234de84da3128fb991a500ef8305c2f962ba2
+DIST gnome-keyring-48.0.tar.xz 767428 BLAKE2B 6aacccf506872d3fe4b8b33be8e6d2a4af1ceaad9534b82b57ef7e5b274851aaab838015306bf38034c74574b72ba7751415ef29e4afc0d681d271421570f9d8 SHA512 9eac06164c22a854a171f538467403c6764a6a6c2665959d721f5e3515bd91c8709a374c292cde93143f944b4ed7ec9b5613d28808d7e79839a9377d5aaa5daa

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-48.0-collection-registering.patch b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-collection-registering.patch
new file mode 100644
index 000000000000..05ef465cfc11
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-collection-registering.patch
@@ -0,0 +1,161 @@
+From 651417478158ae00b9cdf1dc05d038117615fe69 Mon Sep 17 00:00:00 2001
+From: zsien <i@zsien.cn>
+Date: Tue, 3 Dec 2024 19:56:05 +0800
+Subject: [PATCH] Ensure the login collection is registered after unlocking
+
+Fixes #151
+---
+ daemon/control/gkd-control-server.c |  8 ++++++--
+ daemon/dbus/gkd-dbus-secrets.c      |  6 ++++++
+ daemon/dbus/gkd-dbus.h              |  2 ++
+ daemon/dbus/gkd-secret-objects.c    |  7 +++++++
+ daemon/dbus/gkd-secret-objects.h    |  3 +++
+ daemon/dbus/gkd-secret-service.c    | 13 +++++++++++++
+ daemon/dbus/gkd-secret-service.h    |  2 ++
+ daemon/gkd-main.c                   |  6 ++++++
+ daemon/gkd-main.h                   |  2 ++
+ 9 files changed, 47 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/control/gkd-control-server.c b/daemon/control/gkd-control-server.c
+index 5ef307d6..dcf6471e 100644
+--- a/daemon/control/gkd-control-server.c
++++ b/daemon/control/gkd-control-server.c
+@@ -25,6 +25,7 @@
+ 
+ #include "daemon/gkd-main.h"
+ #include "daemon/gkd-util.h"
++#include "daemon/dbus/gkd-dbus.h"
+ 
+ #include "egg/egg-buffer.h"
+ #include "egg/egg-cleanup.h"
+@@ -85,10 +86,13 @@ control_unlock_login (EggBuffer *buffer)
+ 	if (!egg_buffer_get_string (buffer, offset, &offset, &master, egg_secure_realloc))
+ 		return GKD_CONTROL_RESULT_FAILED;
+ 
+-	if (gkd_login_unlock (master))
++	if (gkd_login_unlock (master)) {
+ 		res = GKD_CONTROL_RESULT_OK;
+-	else
++		if (gkd_main_secrets_started ())
++			gkd_dbus_ensure_login_collection_is_registered ();
++	} else {
+ 		res = GKD_CONTROL_RESULT_DENIED;
++	}
+ 
+ 	egg_secure_strfree (master);
+ 	return res;
+diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
+index 207524b2..7227dd83 100644
+--- a/daemon/dbus/gkd-dbus-secrets.c
++++ b/daemon/dbus/gkd-dbus-secrets.c
+@@ -156,3 +156,9 @@ gkd_dbus_secrets_cleanup (GDBusConnection *conn)
+ 		secrets_service = NULL;
+ 	}
+ }
++
++void
++gkd_dbus_ensure_login_collection_is_registered (void)
++{
++	gkd_secret_service_ensure_login_collection_is_registered (secrets_service);
++}
+diff --git a/daemon/dbus/gkd-dbus.h b/daemon/dbus/gkd-dbus.h
+index 8a9ca450..9cd2a55b 100644
+--- a/daemon/dbus/gkd-dbus.h
++++ b/daemon/dbus/gkd-dbus.h
+@@ -38,4 +38,6 @@ gchar*        gkd_dbus_singleton_control        (void);
+ gboolean      gkd_dbus_invocation_matches_caller (GDBusMethodInvocation *invocation,
+ 						  const char            *caller);
+ 
++void          gkd_dbus_ensure_login_collection_is_registered (void);
++
+ #endif /* GKD_DBUS_H */
+diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
+index af896017..5dda0f3f 100644
+--- a/daemon/dbus/gkd-secret-objects.c
++++ b/daemon/dbus/gkd-secret-objects.c
+@@ -1660,3 +1660,10 @@ gkd_secret_objects_unregister_collection (GkdSecretObjects *self,
+ 		return;
+ 	}
+ }
++
++gboolean
++gkd_secret_objects_check_collection_is_registered  (GkdSecretObjects *self,
++                                                    const gchar *collection_path)
++{
++	return g_hash_table_lookup (self->collections_to_skeletons, collection_path) != NULL;
++}
+diff --git a/daemon/dbus/gkd-secret-objects.h b/daemon/dbus/gkd-secret-objects.h
+index e9b61d4e..90516743 100644
+--- a/daemon/dbus/gkd-secret-objects.h
++++ b/daemon/dbus/gkd-secret-objects.h
+@@ -102,4 +102,7 @@ void                gkd_secret_objects_register_collection       (GkdSecretObjec
+ void                gkd_secret_objects_unregister_collection     (GkdSecretObjects *self,
+                                                                   const gchar *collection_path);
+ 
++gboolean            gkd_secret_objects_check_collection_is_registered  (GkdSecretObjects *self,
++                                                                        const gchar *collection_path);
++
+ #endif /* __GKD_SECRET_OBJECTS_H__ */
+diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
+index 7a445815..b36cbac9 100644
+--- a/daemon/dbus/gkd-secret-service.c
++++ b/daemon/dbus/gkd-secret-service.c
+@@ -1447,3 +1447,16 @@ gkd_secret_service_emit_collection_changed (GkdSecretService *self,
+ 
+ 	gkd_exported_service_emit_collection_changed (self->skeleton, collection_path);
+ }
++
++void
++gkd_secret_service_ensure_login_collection_is_registered (GkdSecretService *self)
++{
++	g_return_if_fail (GKD_SECRET_IS_SERVICE (self));
++
++	gchar *collection_path = gkd_secret_util_build_path (SECRET_COLLECTION_PREFIX, "login", strlen("login"));
++	if (gkd_secret_objects_check_collection_is_registered (self->objects, collection_path)) {
++		return;
++	}
++
++	gkd_secret_objects_register_collection (self->objects, collection_path);
++}
+diff --git a/daemon/dbus/gkd-secret-service.h b/daemon/dbus/gkd-secret-service.h
+index f95ac960..960da546 100644
+--- a/daemon/dbus/gkd-secret-service.h
++++ b/daemon/dbus/gkd-secret-service.h
+@@ -84,4 +84,6 @@ void                    gkd_secret_service_emit_collection_changed (GkdSecretSer
+ 
+ gchar **                gkd_secret_service_get_collections         (GkdSecretService *self);
+ 
++void                    gkd_secret_service_ensure_login_collection_is_registered (GkdSecretService *self);
++
+ #endif /* ___SECRET_SERVICE_H__ */
+diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
+index 6fab91fa..f6268bad 100644
+--- a/daemon/gkd-main.c
++++ b/daemon/gkd-main.c
+@@ -821,6 +821,12 @@ gkd_main_complete_initialization (const gchar *components)
+ 	gkr_daemon_initialize_steps (components);
+ }
+ 
++gboolean
++gkd_main_secrets_started (void)
++{
++	return secrets_started;
++}
++
+ static gboolean
+ on_login_timeout (gpointer data)
+ {
+diff --git a/daemon/gkd-main.h b/daemon/gkd-main.h
+index b847be6b..5e9ba153 100644
+--- a/daemon/gkd-main.h
++++ b/daemon/gkd-main.h
+@@ -27,4 +27,6 @@ void           gkd_main_quit                    (void);
+ 
+ void           gkd_main_complete_initialization (const gchar *components);
+ 
++gboolean        gkd_main_secrets_started        (void);
++
+ #endif /* GKD_MAIN_H_ */
+-- 
+GitLab
+

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-48.0-gkm_marshal-header.patch b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-gkm_marshal-header.patch
new file mode 100644
index 000000000000..9955e8da4883
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-gkm_marshal-header.patch
@@ -0,0 +1,24 @@
+From ce3553000066f327e452c71bf12ef14b0cfeba7b Mon Sep 17 00:00:00 2001
+From: fossdd <fossdd@pwned.life>
+Date: Mon, 24 Mar 2025 15:23:51 +0100
+Subject: build: Add gkm_marshal header to libgkm sources
+
+Otherwise the gkm_marshal header is sometimes not generated
+while building libgkm
+
+diff --git a/pkcs11/gkm/meson.build b/pkcs11/gkm/meson.build
+index 9a3ab06c..23b57757 100644
+--- a/pkcs11/gkm/meson.build
++++ b/pkcs11/gkm/meson.build
+@@ -68,8 +68,9 @@ libgkm_dep = declare_dependency(
+   link_with: libgkm,
+   include_directories: [
+     include_directories('.'),
+-    include_directories('..'), # for gkm-marshal.h
+-  ]
++    include_directories('..'), # for gkm/gkm-{crypto,assertion}.h
++  ],
++  sources: gkm_marshal[1],
+ )
+ 
+ # Tests

diff --git a/gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild
new file mode 100644
index 000000000000..606d4204e170
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-keyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="pam selinux ssh-agent systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.80:2
+	>=app-crypt/gcr-3.27.90:0=[gtk]
+	>=dev-libs/libgcrypt-1.2.2:0=
+	app-crypt/p11-kit
+
+	>=app-eselect/eselect-pinentry-0.5
+	app-misc/ca-certificates
+
+	selinux? ( sec-policy/selinux-gnome )
+	systemd? ( sys-apps/systemd )
+	ssh-agent? ( virtual/openssh )
+	pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	# From Fedora:
+	# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/96
+	"${FILESDIR}/${PN}-48.0-collection-registering.patch"
+
+	#https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/151
+	"${FILESDIR}/${PN}-48.0-gkm_marshal-header.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use ssh-agent)
+		$(meson_feature selinux)
+		$(meson_feature systemd)
+		$(meson_use pam)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building with libcap-ng, but that breaks with glib-2.70
+	# Never install as suid root, this breaks dbus activation, see bug
+	# #513870, https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/77
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Sam James]

commit:     5024958128b2e6dba12345b58fb53f5e84d55249
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Nov  4 11:50:54 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  4 20:15:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50249581

gnome-base/gnome-keyring: disable automagic libcap-ng

Closes: https://bugs.gentoo.org/964549
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44472
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-keyring-48.0-disable-libcap-ng-automagic.patch | 36 ++++++++++++++++++++++
 ...ng-48.0.ebuild => gnome-keyring-48.0-r1.ebuild} |  8 ++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-48.0-disable-libcap-ng-automagic.patch b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-disable-libcap-ng-automagic.patch
new file mode 100644
index 000000000000..617bd7ea9a79
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-disable-libcap-ng-automagic.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/964549
+https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/101
+
+From 5ebf419ce10d100049d961c13fd5e63d0a62fcfe Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Tue, 4 Nov 2025 13:33:31 +0200
+Subject: [PATCH] meson: allow disabling libcap-ng explicitly
+
+Bug: https://bugs.gentoo.org/964549
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/meson.build
++++ b/meson.build
+@@ -37,7 +37,7 @@ threads_dep = dependency('threads')
+ gck_dep = dependency('gck-1', version: '>= 3.3.4')
+ gcr_base_dep = dependency('gcr-base-3', version: '>= 3.27.90')
+ libgcrypt_dep = dependency('libgcrypt', version: '>= 1.2.2')
+-libcap_ng_dep = dependency('libcap-ng', required: false)
++libcap_ng_dep = dependency('libcap-ng', required: get_option('libcap-ng'))
+ p11_kit_dep = dependency('p11-kit-1')
+ 
+ libselinux_dep = dependency('libselinux', required: get_option('selinux'))
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('libcap-ng',
++  type: 'feature',
++  value: 'auto',
++  description: 'Add support for Linux capabilities',
++)
++
+ option('ssh-agent',
+   type: 'boolean',
+   value: false,
+-- 
+2.51.2
+

diff --git a/gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
similarity index 89%
rename from gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
index 43d1fa88451f..5f5f1972fd87 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-48.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-keyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="pam selinux ssh-agent systemd test"
+IUSE="caps pam selinux ssh-agent systemd test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -24,6 +24,7 @@ RDEPEND="
 	>=app-eselect/eselect-pinentry-0.5
 	app-misc/ca-certificates
 
+	caps? ( sys-libs/libcap-ng )
 	selinux? ( sec-policy/selinux-gnome )
 	systemd? ( sys-apps/systemd )
 	ssh-agent? ( virtual/openssh )
@@ -46,6 +47,10 @@ PATCHES=(
 
 	#https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/151
 	"${FILESDIR}/${PN}-48.0-gkm_marshal-header.patch"
+
+	# bug #964549
+	# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/101
+	"${FILESDIR}/gnome-keyring-48.0-disable-libcap-ng-automagic.patch"
 )
 
 pkg_setup() {
@@ -54,6 +59,7 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_feature caps libcap-ng)
 		$(meson_use ssh-agent)
 		$(meson_feature selinux)
 		$(meson_feature systemd)

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Sam James]

commit:     ab27e1fbdd55b430b6e2b290d014a50493bbdfa2
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Nov  4 13:18:56 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  4 20:15:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab27e1fb

gnome-base/gnome-keyring: fix pam plugin install location

Closes: https://bugs.gentoo.org/964367
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44472
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-keyring-48.0-fix-pam-install.patch | 22 ++++++++++++++++++++++
 .../gnome-keyring/gnome-keyring-48.0-r1.ebuild     |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-48.0-fix-pam-install.patch b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-fix-pam-install.patch
new file mode 100644
index 000000000000..ac1895d10a86
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-48.0-fix-pam-install.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/964367
+
+From a2ca65d362e33a23ac8439bd3222cde90c4703a2 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Tue, 4 Nov 2025 13:48:11 +0200
+Subject: [PATCH] meson: install pam plugin to /lib64
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/pam/meson.build
++++ b/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') / 'security',
+ )
+ 
+ libpam_gkr_dep = declare_dependency(
+-- 
+2.51.2
+

diff --git a/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
index 5f5f1972fd87..515172ce8fd0 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
@@ -51,6 +51,9 @@ PATCHES=(
 	# bug #964549
 	# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/101
 	"${FILESDIR}/gnome-keyring-48.0-disable-libcap-ng-automagic.patch"
+
+	# bug #964367
+	"${FILESDIR}/gnome-keyring-48.0-fix-pam-install.patch"
 )
 
 pkg_setup() {