Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-gnome-keyring-2.20.1.tar.bz2

.gitignore

@@ -0,0 +1,81 @@
+gnome-keyring-2.31.4.tar.bz2
+/gnome-keyring-2.31.91.tar.bz2
+/gnome-keyring-2.32.0.tar.bz2
+/gnome-keyring-2.91.0.tar.bz2
+/gnome-keyring-2.91.1.tar.bz2
+/gnome-keyring-2.91.2.tar.bz2
+/gnome-keyring-2.91.3.tar.bz2
+/gnome-keyring-2.91.4.tar.bz2
+/gnome-keyring-2.91.91.tar.bz2
+/gnome-keyring-2.91.92.tar.bz2
+/gnome-keyring-2.91.93.tar.bz2
+/gnome-keyring-3.0.0.tar.bz2
+/gnome-keyring-3.0.1.tar.bz2
+/gnome-keyring-3.1.1.tar.bz2
+/gnome-keyring-3.1.4.tar.xz
+/gnome-keyring-3.1.90.tar.xz
+/gnome-keyring-3.1.91.tar.xz
+/gnome-keyring-3.1.92.tar.xz
+/gnome-keyring-3.2.0.tar.xz
+/gnome-keyring-3.2.1.tar.xz
+/gnome-keyring-3.3.1.tar.xz
+/gnome-keyring-3.3.3.1.tar.xz
+/gnome-keyring-3.3.4.tar.xz
+/gnome-keyring-3.3.5.tar.xz
+/gnome-keyring-3.3.91.tar.xz
+/gnome-keyring-3.3.92.tar.xz
+/gnome-keyring-3.4.0.tar.xz
+/gnome-keyring-3.4.1.tar.xz
+/gnome-keyring-3.5.3.tar.xz
+/gnome-keyring-3.5.5.tar.xz
+/.build-*.log
+/*.src.rpm
+/gnome-keyring-3.?.?/
+/x86_64/
+/gnome-keyring-3.5.90.tar.xz
+/gnome-keyring-3.5.91.tar.xz
+/gnome-keyring-3.5.92.tar.xz
+/gnome-keyring-3.6.0.tar.xz
+/gnome-keyring-3.6.1.tar.xz
+/gnome-keyring-3.7.1.tar.xz
+/gnome-keyring-3.7.2.tar.xz
+/gnome-keyring-3.7.5.tar.xz
+/gnome-keyring-3.7.91.tar.xz
+/gnome-keyring-3.7.92.tar.xz
+/gnome-keyring-3.8.0.tar.xz
+/gnome-keyring-3.8.1.tar.xz
+/gnome-keyring-3.9.1.tar.xz
+/gnome-keyring-3.9.90.tar.xz
+/gnome-keyring-3.10.0.tar.xz
+/gnome-keyring-3.10.1.tar.xz
+/gnome-keyring-3.11.92.tar.xz
+/gnome-keyring-3.12.0.tar.xz
+/gnome-keyring-3.12.2.tar.xz
+/gnome-keyring-3.13.91.tar.xz
+/gnome-keyring-3.14.0.tar.xz
+/gnome-keyring-3.15.90.tar.xz
+/gnome-keyring-3.15.92.tar.xz
+/gnome-keyring-3.16.0.tar.xz
+/gnome-keyring-3.17.91.tar.xz
+/gnome-keyring-3.18.0.tar.xz
+/gnome-keyring-3.18.1.tar.xz
+/gnome-keyring-3.18.2.tar.xz
+/gnome-keyring-3.18.3.tar.xz
+/gnome-keyring-3.19.4.tar.xz
+/gnome-keyring-3.19.90.tar.xz
+/gnome-keyring-3.20.0.tar.xz
+/gnome-keyring-3.20.1.tar.xz
+/gnome-keyring-3.27.92.tar.xz
+/gnome-keyring-3.28.0.tar.xz
+/gnome-keyring-3.28.0.1.tar.xz
+/gnome-keyring-3.28.0.2.tar.xz
+/gnome-keyring-3.28.2.tar.xz
+/gnome-keyring-3.31.90.tar.xz
+/gnome-keyring-3.31.91.tar.xz
+/gnome-keyring-3.34.0.tar.xz
+/gnome-keyring-3.35.1.tar.xz
+/gnome-keyring-3.35.90.tar.xz
+/gnome-keyring-3.36.0.tar.xz
+/gnome-keyring-40.0.tar.xz
+/gnome-keyring-42.0.tar.xz
+/gnome-keyring-42.1.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gnome-keyring
-# $Id: Makefile,v 1.1 2004/09/09 05:26:08 cvsdist Exp $
-NAME := gnome-keyring
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gnome-keyring-0.5.2-null-fix.patch

@@ -1,11 +0,0 @@
---- gnome-keyring-0.5.2/gnome-keyring.c.nullfix	2006-08-23 16:31:47.000000000 -0400
-+++ gnome-keyring-0.5.2/gnome-keyring.c	2006-08-23 16:32:25.000000000 -0400
-@@ -2483,7 +2483,7 @@
- 	GnomeKeyringResult result;
- 	GList *found;
- 	
--	out_list = NULL;
-+	*out_list = NULL;
- 	attributes = make_attribute_list_for_network_password (user,
- 							       domain,
- 							       server,

gnome-keyring-2.20-selinux-pam.patch

@@ -1,291 +0,0 @@
-diff -ur gnome-keyring-2.20.orig/daemon/gkr-daemon.c gnome-keyring-2.20/daemon/gkr-daemon.c
---- gnome-keyring-2.20.orig/daemon/gkr-daemon.c	2007-10-05 12:40:28.000000000 +0200
-+++ gnome-keyring-2.20/daemon/gkr-daemon.c	2007-10-05 12:55:26.000000000 +0200
-@@ -27,6 +27,7 @@
- #include "common/gkr-async.h"
- #include "common/gkr-cleanup.h"
- #include "common/gkr-unix-signal.h"
-+#include "common/gkr-location.h"
- 
- #include "keyrings/gkr-keyrings.h"
- 
-@@ -183,6 +184,10 @@
- 	GIOChannel *channel;
- 	GMainContext *ctx;
- 	int i;
-+	gboolean login;
-+	char *login_password;
-+	int len;
-+	GkrKeyring *login_keyring;
- 	
- 	g_type_init ();
- 	g_thread_init (NULL);
-@@ -211,6 +216,7 @@
- 
- 	foreground = FALSE;
- 	daemon = FALSE;
-+	login = FALSE;
- 
- 	if (argc > 1) {
- 		for (i = 1; i < argc; i++) {
-@@ -218,8 +224,19 @@
- 				foreground = TRUE;
- 			if (strcmp (argv[i], "-d") == 0)
- 				daemon = TRUE;
-+			if (strcmp (argv[i], "--login") == 0)
-+				login = TRUE;
- 		}
- 	}
-+
-+	login_password = NULL;
-+	if (login) {
-+		login_password = gnome_keyring_memory_alloc (256);
-+		fgets (login_password, 256, stdin);
-+		len = strlen (login_password);
-+		if (login_password[len-1] == '\n')
-+			login_password[len-1] = 0;
-+	}
- 	
- 	if (!foreground) {
- 		pid = fork ();
-@@ -315,6 +332,27 @@
- 		gkr_daemon_dbus_setup (loop, path);
- #endif
- 
-+
-+	if (login_password) {
-+		login_keyring = gkr_keyrings_get_login ();
-+		if (login_keyring) {
-+			if (!gkr_keyring_unlock (login_keyring,
-+						 login_password)) {
-+				g_warning ("Failed to unlock login keyring");
-+			}
-+		} else {
-+			login_keyring =
-+				gkr_keyring_create (GKR_LOCATION_BASE_LOCAL,
-+						    "login", 
-+						    login_password);
-+			if (login_keyring) {
-+				gkr_keyrings_add (login_keyring);
-+				g_object_unref (login_keyring);
-+			}
-+		}
-+		gnome_keyring_memory_free (login_password);
-+	}
-+	
- 	g_main_loop_run (loop);
- 
- 	/* Make sure no other threads are running */
-diff -ur gnome-keyring-2.20.orig/pam/gkr-pam-module.c gnome-keyring-2.20/pam/gkr-pam-module.c
---- gnome-keyring-2.20.orig/pam/gkr-pam-module.c	2007-10-05 12:40:28.000000000 +0200
-+++ gnome-keyring-2.20/pam/gkr-pam-module.c	2007-10-05 12:42:05.000000000 +0200
-@@ -249,15 +249,20 @@
- }
- 
- static void
--setup_child (int outp[2], int errp[2], struct passwd *pwd)
-+setup_child (int inp[2], int outp[2], int errp[2], struct passwd *pwd, const char *password)
- {
--	char *args[] = { GNOME_KEYRING_DAEMON, "-d", NULL};
--	
-+	char *args[] = { GNOME_KEYRING_DAEMON, "-d", "--login", NULL};
-+
- 	assert (pwd);
- 	assert (pwd->pw_dir);
--	
-+
-+	/* If no password, don't pas in --login */
-+	if (password == NULL)
-+		args[2] = NULL;
-+
- 	/* Fix up our end of the pipes */
--	if (dup2 (outp[WRITE_END], STDOUT) < 0 || 
-+	if (dup2 (inp[READ_END], STDIN) < 0 ||
-+	    dup2 (outp[WRITE_END], STDOUT) < 0 || 
- 	    dup2 (errp[WRITE_END], STDERR) < 0) {
- 	    	syslog (GKR_LOG_ERR, "gkr-pam: couldn't setup pipes: %s",
- 		        strerror (errno));
-@@ -265,6 +270,8 @@
- 	}
- 	    
- 	/* Close unnecessary file descriptors */
-+	close (inp[READ_END]);
-+	close (inp[WRITE_END]);
- 	close (outp[READ_END]);
- 	close (outp[WRITE_END]);
- 	close (errp[READ_END]);
-@@ -348,9 +355,10 @@
- }
- 
- static int
--start_daemon (pam_handle_t *ph, struct passwd *pwd)
-+start_daemon (pam_handle_t *ph, struct passwd *pwd, const char *password)
- {
- 	struct sigaction defsact, oldsact;
-+	int inp[2] = { -1, -1 };
- 	int outp[2] = { -1, -1 };
- 	int errp[2] = { -1, -1 };
- 	int ret = PAM_SERVICE_ERR;
-@@ -372,7 +380,7 @@
- 	sigaction (SIGCHLD, &defsact, &oldsact);
- 	
- 	/* Create the necessary pipes */
--	if (pipe (outp) < 0 || pipe (errp) < 0) {
-+	if (pipe (inp) < 0 || pipe (outp) < 0 || pipe (errp) < 0) {
- 	    	syslog (GKR_LOG_ERR, "gkr-pam: couldn't create pipes: %s", 
- 	    	        strerror (errno));
- 	    	goto done;
-@@ -387,7 +395,7 @@
- 		
- 	/* This is the child */
- 	case 0:
--		setup_child (outp, errp, pwd);
-+		setup_child (inp, outp, errp, pwd, password);
- 		/* Should never be reached */
- 		break;
- 		
-@@ -397,9 +405,16 @@
- 	};
- 	
- 	/* Close our unneeded ends of the pipes */
-+	close (inp[READ_END]);
- 	close (outp[WRITE_END]);
- 	close (errp[WRITE_END]);
--	outp[WRITE_END] = errp[WRITE_END] = -1; 
-+	inp[READ_END] = outp[WRITE_END] = errp[WRITE_END] = -1; 
-+
-+	if (password) {
-+		/* Write the login keyring password */
-+		write (inp[WRITE_END], password, strlen (password));
-+		write (inp[WRITE_END], "\n", 1);
-+	}
- 	
- 	/* 
- 	 * Note that we're not using select() or any such. We know how the 
-@@ -438,6 +453,8 @@
- 	/* Restore old handler */
- 	sigaction (SIGCHLD, &oldsact, NULL);
- 	
-+	close_safe (inp[0]);
-+	close_safe (inp[1]);
- 	close_safe (outp[0]);
- 	close_safe (outp[1]);
- 	close_safe (errp[0]);
-@@ -450,7 +467,7 @@
- }
- 
- static int
--start_daemon_if_necessary (pam_handle_t *ph, struct passwd *pwd)
-+start_daemon_if_necessary (pam_handle_t *ph, struct passwd *pwd, const char *password)
- {
- 	const char *socket;
- 	int ret;
-@@ -470,7 +487,7 @@
- 	}
- 
- 	/* Not running, start process */
--	return start_daemon (ph, pwd);
-+	return start_daemon (ph, pwd, password);
- }
- 
- static int
-@@ -691,6 +708,7 @@
- 	struct passwd *pwd;
- 	const char *user, *password;
- 	const char *socket;
-+	int started_daemon;
- 	uint args;
- 	int ret;
- 	
-@@ -728,9 +746,11 @@
- 	}
- 
- 
-+	started_daemon = 0;
- 	/* Should we start the daemon? */
- 	if (args & ARG_AUTO_START) {
--		ret = start_daemon_if_necessary (ph, pwd);
-+		started_daemon = 1;
-+		ret = start_daemon_if_necessary (ph, pwd, password);
- 		if (ret != PAM_SUCCESS)
- 			return ret;
- 	}
-@@ -739,10 +759,12 @@
- 
- 	/* If gnome keyring is running, then unlock now */
- 	if (socket) {
--		ret = unlock_keyring (ph, pwd, password);
--		if (ret != PAM_SUCCESS)
--			return ret;
--			
-+		/* If we started the daemon, its already unlocked, since we passed the password */
-+		if (!started_daemon) {
-+			ret = unlock_keyring (ph, pwd, password);
-+			if (ret != PAM_SUCCESS)
-+				return ret;
-+		}
- 	/* Otherwise start in open session, store password */
- 	} else {
- 		if (pam_set_data (ph, "gkr_system_authtok", strdup (password),
-@@ -762,6 +784,7 @@
- 	struct passwd *pwd;
- 	int ret;
- 	uint args = parse_args (argc, argv);
-+	int started_daemon;
- 
- 	/* Figure out the user name */
- 	ret = pam_get_user (ph, &user, NULL);
-@@ -777,29 +800,32 @@
- 		return PAM_SERVICE_ERR;
- 	}
- 
--	/* Should we start the daemon? */
--	if (args & ARG_AUTO_START) {
--		ret = start_daemon_if_necessary (ph, pwd);
--		if (ret != PAM_SUCCESS)
--			return ret;
--	}
--
- 	/* Get the stored authtok here */
- 	if (pam_get_data (ph, "gkr_system_authtok", (const void**)&password) != PAM_SUCCESS) {
--		
- 		/* 
- 		 * No password, no worries, maybe this (PAM using) application 
- 		 * didn't do authentication, or is hopeless and wants to call 
- 		 * different PAM callbacks from different processes.
- 		 * 
- 		 * No use complaining
--		 */ 
--		return PAM_SUCCESS;
-+		 */
-+		password = NULL;
- 	}
- 	
--	if (unlock_keyring (ph, pwd, password) != PAM_SUCCESS)
--		return PAM_SERVICE_ERR;
-+	started_daemon = 0;
-+	/* Should we start the daemon? */
-+	if (args & ARG_AUTO_START) {
-+		started_daemon = 1;
-+		ret = start_daemon_if_necessary (ph, pwd, password);
-+		if (ret != PAM_SUCCESS)
-+			return ret;
-+	}
- 
-+	if (!started_daemon && password != NULL) {
-+		if (unlock_keyring (ph, pwd, password) != PAM_SUCCESS)
-+			return PAM_SERVICE_ERR;
-+	}
-+	
- 	return PAM_SUCCESS;
- }
- 
-@@ -897,7 +923,7 @@
- 	 * argument. Because if the password is being changed, then making 
- 	 * the 'login' keyring match it is a priority. 
- 	 */
--	ret = start_daemon_if_necessary (ph, pwd);
-+	ret = start_daemon_if_necessary (ph, pwd, original);
- 	if (ret != PAM_SUCCESS)
- 		return ret;
- 	

gnome-keyring-42.0-fix-strncpy.patch

@@ -0,0 +1,78 @@
+From f532e3de2bd77465c976abc913e3f0a5cd09a5d2 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 22 May 2022 13:00:46 -0400
+Subject: [PATCH] pkcs11: Don't use strncpy when copying paths
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using strncpy produces the following warning, which indicates that the
+destination string could be left unterminated.
+
+  CC       daemon/control/gkd-control-server.lo
+  CCLD     libgkd-control.la
+  CC       pkcs11/rpc-layer/libgkm_rpc_layer_la-gkm-rpc-dispatch.lo
+In file included from /usr/include/string.h:519,
+                 from /usr/include/glib-2.0/glib/galloca.h:33,
+                 from /usr/include/glib-2.0/glib.h:30,
+                 from ./egg/egg-error.h:24,
+                 from pkcs11/rpc-layer/gkm-rpc-dispatch.c:31:
+In function ‘strncpy’,
+    inlined from ‘gkm_rpc_layer_startup’ at pkcs11/rpc-layer/gkm-rpc-dispatch.c:2382:2:
+/usr/include/bits/string_fortified.h:95:10: warning: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Wstringop-truncation]
+   95 |   return __builtin___strncpy_chk (__dest, __src, __len,
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   96 |                                   __glibc_objsize (__dest));
+      |                                   ~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ pkcs11/rpc-layer/gkm-rpc-dispatch.c | 4 +++-
+ pkcs11/rpc-layer/gkm-rpc-module.c   | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/pkcs11/rpc-layer/gkm-rpc-dispatch.c b/pkcs11/rpc-layer/gkm-rpc-dispatch.c
+index 72d2ced1..dbedb355 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-dispatch.c
++++ b/pkcs11/rpc-layer/gkm-rpc-dispatch.c
+@@ -31,6 +31,8 @@
+ #include "egg/egg-error.h"
+ #include "egg/egg-unix-credentials.h"
+ 
++#include <glib.h>
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+@@ -2379,7 +2381,7 @@ gkm_rpc_layer_startup (const char *prefix)
+ 	memset(&addr, 0, sizeof(addr));
+ 	addr.sun_family = AF_UNIX;
+ 	unlink (pkcs11_socket_path);
+-	strncpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path));
++	g_strlcpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path));
+ 	if (bind (sock, (struct sockaddr*)&addr, sizeof (addr)) < 0) {
+ 		gkm_rpc_warn ("couldn't bind to pkcs11 socket: %s: %s",
+ 		                  pkcs11_socket_path, strerror (errno));
+diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c
+index 24457ce1..515b18a4 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-module.c
++++ b/pkcs11/rpc-layer/gkm-rpc-module.c
+@@ -29,6 +29,8 @@
+ 
+ #include "egg/egg-unix-credentials.h"
+ 
++#include <glib.h>
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+@@ -233,7 +235,7 @@ call_connect (CallState *cs)
+ 	debug (("connecting to: %s", pkcs11_socket_path));
+ 
+ 	addr.sun_family = AF_UNIX;
+-	strncpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path));
++	g_strlcpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path));
+ 
+ 	sock = socket (AF_UNIX, SOCK_STREAM, 0);
+ 	if (sock < 0) {
+-- 
+GitLab
+

gnome-keyring.spec

@@ -1,117 +1,742 @@
-%define gtk2_version 2.3.1
+%global glib2_version 2.44.0
+%global gcr_version 3.27.90
+%global gcrypt_version 1.2.2
 
-Summary: A framework for managing user passwords and other secrets
-Name: gnome-keyring
-Version: 2.20.1
+Name:    gnome-keyring
+Version: 42.1
 Release: 2%{?dist}
+Summary: Framework for managing passwords and other secrets
+
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
-URL: http://www.gnome.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: dbus-devel >= 1.0
+URL:     https://wiki.gnome.org/Projects/GnomeKeyring
+Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz
+# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/52
+Patch0:  gnome-keyring-42.0-fix-strncpy.patch
+
+BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(p11-kit-1)
+BuildRequires: docbook-dtds
+BuildRequires: docbook-style-xsl
+BuildRequires: gcc
 BuildRequires: gettext
-BuildRequires: libgcrypt-devel
-BuildRequires: pam-devel
-BuildRequires: hal-devel
-BuildRequires: autoconf, automake, libtool
 BuildRequires: intltool
-BuildRequires: perl(XML::Parser)
+BuildRequires: libgcrypt-devel >= %{gcrypt_version}
+BuildRequires: libselinux-devel
+BuildRequires: make
+BuildRequires: pam-devel
+BuildRequires: systemd-rpm-macros
+BuildRequires: /usr/bin/ssh-add
+BuildRequires: /usr/bin/ssh-agent
+BuildRequires: /usr/bin/xsltproc
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=484612 
-Patch0:    gnome-keyring-2.20-selinux-pam.patch
-
-# autounlock does not currently work, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=250147
-Patch1: no-autounlock.patch
+Requires: /usr/bin/ssh-add
+Requires: /usr/bin/ssh-agent
+Requires: /usr/libexec/gcr-ssh-askpass
 
 %description
-gnome-keyring manages passwords and other types of secrets
-for the user, storing them encrypted with a main password.
-Applications can use the gnome-keyring library to integrate
-with the keyring.
+The gnome-keyring session daemon manages passwords and other types of
+secrets for the user, storing them encrypted with a main password.
+Applications can use the gnome-keyring library to integrate with the keyring.
 
-%package devel
-Summary: The files needed for gnome-keyring application development
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-Requires: glib2-devel
-Requires: pkgconfig
-# for /usr/share/gtk-doc/html
-Requires: gtk-doc
-
-%description devel
-The gnome-keyring-devel package contains the libraries and
-include files that you can use to develop applications that
-use gnome-keyring.
 
 %package pam
-Summary: A pam module for unlocking keyrings at login time
+Summary: Pam module for unlocking keyrings
 License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 # for /lib/security
-Requires: pam
+Requires: pam%{?_isa}
 
 %description pam
 The gnome-keyring-pam package contains a pam module that can
-automatically unlock the "login" keyring when the user logs in 
-and start the keyring daemon.
+automatically unlock the "login" keyring when the user logs in.
 
 
 %prep
-%setup -q -n gnome-keyring-%{version}
+%autosetup -p1
 
-%patch0 -p1 -b .selinux_pam
-%patch1 -p1 -b .no-autounlock
 
 %build
-aclocal
-automake
-autoconf
-%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security
-make %{?_smp_mflags}
+%configure \
+           --with-pam-dir=%{_libdir}/security \
+           --enable-pam \
+           --with-systemd \
+           --without-libcap-ng \
+	   --with-pkcs11-config=%{_datadir}/p11-kit/modules
+
+# avoid unneeded direct dependencies
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+
+%make_build
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install install-pam DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/pam_gnome_keyring.so
+rm $RPM_BUILD_ROOT%{_libdir}/security/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 
 %find_lang gnome-keyring
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+%post
+%systemd_user_post gnome-keyring-daemon.service
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%preun
+%systemd_user_preun gnome-keyring-daemon.service
 
 %files -f gnome-keyring.lang
-%defattr(-, root, root)
-%doc AUTHORS NEWS README COPYING COPYING.LIB
+%doc AUTHORS NEWS README
+%license COPYING COPYING.LIB
 # LGPL
-%{_libdir}/lib*.so.*
+%dir %{_libdir}/gnome-keyring
+%dir %{_libdir}/gnome-keyring/devel
+%{_libdir}/gnome-keyring/devel/*.so
+%dir %{_libdir}/pkcs11
+%{_libdir}/pkcs11/*.so
 # GPL
-%{_bindir}/*
-%{_libexecdir}/*
-
-%files devel
-%defattr(-, root, root)
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
-%doc %{_datadir}/gtk-doc/html/gnome-keyring/
+%{_bindir}/gnome-keyring-daemon
+%{_bindir}/gnome-keyring
+%{_bindir}/gnome-keyring-3
+%{_datadir}/dbus-1/services/*.service
+%{_sysconfdir}/xdg/autostart/*
+%{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_datadir}/p11-kit/modules/gnome-keyring.module
+%dir %{_datadir}/xdg-desktop-portal
+%dir %{_datadir}/xdg-desktop-portal/portals
+%{_datadir}/xdg-desktop-portal/portals/gnome-keyring.portal
+%{_mandir}/man1/gnome-keyring.1*
+%{_mandir}/man1/gnome-keyring-3.1*
+%{_mandir}/man1/gnome-keyring-daemon.1*
+%{_userunitdir}/gnome-keyring-daemon.service
+%{_userunitdir}/gnome-keyring-daemon.socket
 
 %files pam
-%defattr(-, root, root)
-/%{_lib}/security/*
+%{_libdir}/security/*.so
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 23 2022 David King <amigadave@amigadave.com> - 42.1-1
+- Update to 42.1
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Update the path of the PKCS#11 module
+
+* Tue Sep 21 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-3
+- Drop dependency on libcapng
+- Drop cap_ipc_lock to unbreak the D-Bus service
+- Fixes #2005625
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+
+* Fri Mar 05 2021 David King <amigadave@amigadave.com> - 3.36.0-6
+- Apply upstream patch to fix capng usage (#1888978)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 3.36.0-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
+- Update to 3.35.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
+- Update to 3.35.1
+
+* Mon Sep 30 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
+- Update to 3.34.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Mar 02 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
+- Update to 3.31.91
+
+* Sun Feb 10 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
+- Update to 3.31.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
+- Update to 3.28.2
+
+* Mon Mar 26 2018 Kalev Lember <klember@redhat.com> - 3.28.0.2-1
+- Update to 3.28.0.2
+
+* Tue Mar 13 2018 Kalev Lember <klember@redhat.com> - 3.28.0.1-1
+- Update to 3.28.0.1
+
+* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
+- Update to 3.28.0
+
+* Mon Mar 05 2018 Kalev Lember <klember@redhat.com> - 3.27.92-1
+- Update to 3.27.92
+- Don't set group tags
+- Remove ancient obsoletes
+- Remove gsettings schema scriptlets
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec 08 2017 Nikos Mavrogiannopoulos - 3.20.1-4
+- No longer register gnome-keyring as a local PKCS#11 module (#1520268)
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Debarshi Ray <rishi@fedoraproject.org> - 3.20.1-1
+- Update to 3.20.1
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Mar 25 2016 Kalev Lember <klember@redhat.com> - 3.20.0-1
+- Update to 3.20.0
+
+* Thu Feb 18 2016 Richard Hughes <rhughes@redhat.com> - 3.19.90-1
+- Update to 3.19.90
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jan 20 2016 Kalev Lember <klember@redhat.com> - 3.19.4-1
+- Update to 3.19.4
+
+* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 3.18.3-1
+- Update to 3.18.3
+
+* Fri Oct 23 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
+- Update to 3.18.2
+
+* Sat Oct 17 2015 Kalev Lember <klember@redhat.com> - 3.18.1-2
+- dbus: Fix object path regression from GDBus port
+
+* Sat Oct 17 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
+- Update to 3.18.1
+- Drop unused dbus build dependency
+- Use make_install macro
+
+* Thu Oct 15 2015 Ray Strode <rstrode@redhat.com> 3.18.0-4
+- Fix password handoff in non-autologin case
+- Remove unneccessary part of autologin fix
+  Related: #1269581
+
+* Thu Oct 15 2015 Ray Strode <rstrode@redhat.com> 3.18.0-3
+- Fix deadlock in gnome-keyring when using autologin
+  Resolves: #1269581
+
+* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 3.18.0-2
+- dbus: Initialize secret service before claiming name
+
+* Mon Sep 28 2015 Kalev Lember <klember@redhat.com> - 3.18.0-1
+- Update to 3.18.0
+
+* Tue Sep 15 2015 Richard Hughes <rhughes@redhat.com> - 3.17.91-1
+- Update to 3.17.91
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Apr 08 2015 David King <amigadave@amigadave.com> - 3.16.0-1
+- Update to 3.16.0
+
+* Tue Mar 17 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.92-1
+- Update to 3.15.92
+
+* Sun Mar 08 2015 David King <amigadave@amigadave.com> - 3.15.90-2
+- Add patch to fix repeated SSH agent requests
+
+* Thu Feb 26 2015 David King <amigadave@amigadave.com> - 3.15.90-1
+- Update to 3.15.90
+- Update URL
+- Use pkgconfig for BuildRequires
+- Use license macro for COPYING and COPYING.LIB
+- Preserve timestamps during install
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 3.14.0-2
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Tue Sep 23 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.0-1
+- Update to 3.14.0
+- Tighten deps with the _isa macro
+
+* Thu Sep 11 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.91-1
+- Update to 3.13.91
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 15 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.2-1
+- Update to 3.12.2
+
+* Sun Mar 23 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.0-1
+- Update to 3.12.0
+
+* Mon Mar 17 2014 Richard Hughes <rhughes@redhat.com> - 3.11.92-1
+- Update to 3.11.92
+
+* Sat Dec 21 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.10.1-2
+- Drop unneeded ldconfig calls from %%post* scriptlets.
+- Fix bogus dates in %%changelog.
+
+* Mon Oct 28 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-1
+- Update to 3.10.1
+
+* Wed Sep 25 2013 Kalev Lember <kalevlember@gmail.com> - 3.10.0-1
+- Update to 3.10.0
+
+* Wed Aug 28 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-1
+- Update to 3.9.90
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul  2 2013 Matthias Clasen <mclasen@redhat.com> - 3.9.1-2
+- usrmove stragglers: move pam modules to /usr/lib/security
+
+* Sat May 04 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.1-1
+- Update to 3.9.1
+
+* Tue Apr 16 2013 Richard Hughes <rhughes@redhat.com> - 3.8.1-1
+- Update to 3.8.1
+
+* Tue Mar 26 2013 Kalev Lember <kalevlember@gmail.com> - 3.8.0-1
+- Update to 3.8.0
+
+* Tue Mar 19 2013 Richard Hughes <rhughes@redhat.com> - 3.7.92-1
+- Update to 3.7.92
+
+* Thu Mar  7 2013 Matthias Clasen <mclasen@redhat.com> - 3.7.91-1
+- Update to 3.7.91
+
+* Wed Feb 06 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.5-1
+- Update to 3.7.5
+
+* Mon Jan 14 2013 Tomas Bzatek <tbzatek@redhat.com> - 3.7.2-2
+- Fix crash on parsing some certificates (#893162)
+
+* Fri Nov 23 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.7.2-1
+- Update to 3.7.2
+
+* Fri Nov 09 2012 Kalev Lember <kalevlember@gmail.com> - 3.7.1-1
+- Update to 3.7.1
+
+* Fri Nov 09 2012 Rex Dieter <rdieter@fedoraproject.org> 3.6.1-2
+- WARNING: couldn't connect to: /tmp/keyring-... (#783568, gnome#665961)
+
+* Tue Oct 16 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.1-1
+- Update to 3.6.1
+
+* Tue Sep 25 2012 Matthias Clasen <mclasen@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+
+* Wed Sep 19 2012 Richard Hughes <hughsient@gmail.com> - 3.5.92-1
+- Update to 3.5.92
+
+* Tue Sep 04 2012 Richard Hughes <hughsient@gmail.com> - 3.5.91-1
+- Update to 3.5.91
+
+* Tue Aug 21 2012 Richard Hughes <hughsient@gmail.com> - 3.5.90-1
+- Update to 3.5.90
+
+* Tue Aug 07 2012 Stef Walter <stefw@redhat.com> - 3.5.5-2
+- Update for renamed gnome-keyring.module file
+- Update sources
+
+* Tue Aug 07 2012 Richard Hughes <hughsient@gmail.com> - 3.5.5-1
+- Update to 3.5.5
+
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 17 2012 Richard Hughes <hughsient@gmail.com> - 3.5.3-1
+- Update to 3.5.3
+
+* Tue Apr 24 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-2
+- Silence rpm scriptlet output
+
+* Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Mon Mar 26 2012 Debarshi Ray <rishi@fedoraproject.org> - 3.4.0-1
+- Update to 3.4.0
+
+* Wed Mar 21 2012 Kalev Lember <kalevlember@gmail.com> - 3.3.92-1
+- Update to 3.3.92
+
+* Fri Mar  9 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
+* Tue Feb  7 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
+- Update to 3.3.5
+
+* Wed Jan 18 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.4-2
+- Fix a problem that prevents the ssh-agent from working
+
+* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.4-1
+- Update to 3.3.4
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jan  3 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.3.3.1-3
+- Properly obsolete dead -devel subpackage (#771299)
+
+* Mon Dec 26 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.3.3.1-2
+- Fix libgnome-keyring dep version syntax.
+
+* Thu Dec 22 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.3.1-1
+- Update to 3.3.3.1
+- No more devel package
+
+* Wed Nov  2 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-2
+- Rebuilt for glibc bug#747377
+
+* Tue Oct 18 2011 Matthias Clasen <mclasen@redhat.com> - 3.2.1-1
+- Update to 3.2.1
+
+* Mon Sep 26 2011 Ray <rstrode@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Mon Sep 19 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
+* Tue Sep  6 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
+- Update to 3.1.91
+
+* Wed Aug 31 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.90-1
+- Update to 3.1.90
+
+* Thu Aug 18 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Tue May 10 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.1.1-2
+- Improved libcap-ng patches
+
+* Mon May  9 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+
+* Mon Apr 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.1-1
+- Update to 3.0.1
+
+* Mon Apr  4 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Mon Mar 21 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.93-1
+- Update to 2.91.93
+
+* Tue Mar 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-3
+- Update the pam module selinux patch
+
+* Tue Mar 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-2
+- Set correct SELinux context of daemon started from the pam module (#684225)
+
+* Fri Mar 11 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
+* Mon Mar  7 2011 Matthias Clasen <mclasen@redhat.com> 2.91.91-1
+- Update to 2.91.91
+
+* Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> 2.91.4-7
+- Rebuild against newer gtk
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.91.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.4-5
+- Rebuild against new gtk
+
+* Sat Jan 29 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.91.4-4
+- Dir ownership fixes.
+
+* Mon Jan 17 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.4-3
+- Use file system based capabilities instead of suid bit (#668831)
+
+* Fri Jan  7 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.4-2
+- Rebuild against new gtk
+
+* Mon Jan  3 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.4-1
+- Update to 2.91.4
+
+* Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.3-2
+- Rebuild against new gtk
+
+* Tue Nov 30 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.91.3-1
+- Update to 2.91.3
+
+* Tue Nov  9 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.91.2-1
+- Update to 2.91.2
+
+* Mon Nov  1 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.1-2
+- Rebuild against newer gtk3
+
+* Mon Oct 11 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.91.1-1
+- Update to 2.91.1
+
+* Mon Oct  4 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.91.0-1
+- Update to 2.91.0
+
+* Tue Sep 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.32.0-1
+- Update to 2.32.0
+
+* Sat Sep 25 2010 Owen Taylor <otaylor@redhat.com> - 2.31.92-2
+- Bump and rebuild for GTK3 ABI changes
+
+* Mon Sep 13 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.31.92-1
+- Update to 2.31.92
+- Built against gtk3
+
+* Tue Aug 31 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.91-1
+- Update to 2.31.91
+
+* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-3
+- Co-own /usr/share/gtk-doc (#604359)
+- Some spec file cleanups
+
+* Tue Jul 20 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.31.4-2
+- ssh-agent: fix key unlocking (#611642)
+
+* Tue Jun 29 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.31.4-1
+- Update to 2.31.4
+
+* Thu Jun 24 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.3-1
+- Update to 2.30.3
+
+* Mon May  3 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-2
+- Enable daemon autostart in XFCE
+- Fix Networkmanager can no longer find secrets service (#572137)
+
+* Tue Apr 27 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-1
+- Update to 2.30.1
+
+* Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
+* Mon Mar 22 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.92-2
+- More robust error display and handling
+- [secret-store] Don't save session keyring to disk
+- [dbus] Allow unlocking even when always unlock is not available
+- [dbus] Hide the automatically unlock check when login not usable
+- [login] Fix various issues storing and using auto unlock passwords
+
+* Wed Mar 10 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.92-1
+- Update to 2.29.92
+
+* Tue Feb 16 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.90-2
+- Backport fixes from master related to storing secret value
+
+* Tue Feb  9 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.90-1
+- Update to 2.29.90
+
+* Mon Feb  8 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-4
+- Backport some fixes related to password saving
+
+* Mon Feb  1 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-3
+- Fix hidden entry boxes in the new password prompt (#560345)
+
+* Mon Jan 25 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-2
+- Fix endless loop when looking for password in login keyring
+- Fix undefined reference to S_ISSOCK (#557970)
+
+* Mon Jan 11 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-1
+- Update to 2.29.5
+
+* Thu Jan  7 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.4-1
+- Update to 2.29.4
+
+* Mon Sep 21 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
+* Mon Sep 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
+* Tue Aug 11 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
+* Tue Jul 28 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.5-1
+- Update to 2.27.5
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
+* Thu Jul  2 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2
+- Rebuild
+
+* Sun Apr 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.news
+
+* Wed Apr  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-4
+- Fix service activation
+
+* Tue Apr  7 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-3
+- Revert the previous patch since it causes crashes
+
+* Thu Apr 02 2009 Richard Hughes  <rhughes@redhat.com> - 2.26.0-2
+- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
+  would hang when re-allocating from a pool of secure memory.
+
+* Mon Mar 16 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.26.0-1
+- Update to 2.26.0
+
+* Mon Mar  2 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.92-1
+- Update to 2.25.92
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-1
+- Update to 2.25.91
+
+* Tue Feb  3 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.90-4
+- Update to 2.25.90
+
+* Tue Jan 20 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
+* Thu Jan  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.4.2-1
+- Update to 2.25.4.2
+
+* Tue Jan  6 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.4.1-1
+- Update to 2.25.4.1
+
+* Mon Jan  5 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
+* Sat Dec 20 2008 Ray Strode <rstrode@redhat.com> - 2.25.2-3
+- Init dbus later (fixes ssh-agent,
+  patch from Yanko Kaneti, bug 476300)
+
+* Fri Dec 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.2-2
+- Update to 2.25.2
+
+* Sun Nov 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.1-2
+- Tweak description
+
+* Mon Nov 10 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
+* Sun Oct 19 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
+* Sun Sep 21 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-2
+- Update to 2.24.0
+
+* Sun Sep  7 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
+* Thu Sep  4 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
+* Wed Aug 20 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.90-1
+- Update to 2.23.90
+
+* Mon Aug 11 2008 Colin Walters <walters@redhat.com> - 2.22.3.6-2
+- Add --disable-acl-prompts; you can't try to maintain integrity
+  between two processes with the same UID and no other form of
+  access control.
+
+* Mon Aug  4 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
+* Tue Jul 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
+* Thu May 29 2008 Colin Walters <walters@redhat.com> - 2.22.2-2
+- Add patch to nuke allow-deny dialog, see linked upstream bug
+  for discussion
+
+* Tue May 27 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.22.2-1
+- Update to 2.22.2
+
+* Mon Apr  7 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
+* Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Sun Feb 24 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
+* Tue Feb 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-1
+- Update to 2.21.91
+- Drop upstreamed patch
+
+* Wed Feb  6 2008 Ray Strode <rstrode@redhat.com> - 2.21.90-2
+- Fix problem in patch for bug 430525
+
+* Tue Jan 29 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-1
+- Update to 2.21.90
+
+* Mon Jan 28 2008 Ray Strode <rstrode@redhat.com> - 2.21.5-3
+- Don't ask for a password...ever (bug 430525)
+
+* Mon Jan 21 2008 Matthew Barnes  <mbarnes@redhat.com> - 2.21.5-2
+- Fix a race condition that was causing Evolution to hang (#429097)
+
+* Mon Jan 14 2008 Matthias Clasen  <mclasen@redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
+* Tue Dec 18 2007 Matthias Clasen  <mclasen@redhat.com> - 2.21.4-1
+- Update to 2.21.4
+
+* Fri Dec  7 2007 Matthias Clasen  <mclasen@redhat.com> - 2.21.3.2-1
+- Update to 2.21.3.2
+
+* Fri Nov 30 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.2-2
+- Reenable auto-unlock
+
+* Mon Nov 26 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.2-1
+- Update to 2.20.2
+
+* Sun Nov 11 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.1-4
+- Don't ship a .la file (#370531)
+
+* Thu Oct 25 2007 Christopher Aillon <caillon@redhat.com> - 2.20.1-3
+- Rebuild
+
 * Mon Oct 15 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.1-2
 - Disable the auto-unlock question for now (#312531)
 
@@ -134,7 +759,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add NO_MATCH error patch from svn. Will fix apps that
   can't handle empty list matches
 
-* Mon Oct 3 2007 Alexander Larsson <alexl@redhat.com> - 2.20-2
+* Wed Oct 3 2007 Alexander Larsson <alexl@redhat.com> - 2.20-2
 - Backport fix from svn where newly created keyrings weren't
   found
 - Don't unset default keyring on daemon shutdown

init-ret.patch

@@ -1,12 +0,0 @@
-diff -up gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c
---- gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval	2007-07-30 13:26:41.000000000 -0400
-+++ gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c	2007-07-30 13:27:12.000000000 -0400
-@@ -1495,7 +1495,7 @@ op_get_item_info (GkrBuffer *packet, Gkr
- 	GkrKeyringItem *item;
- 	GnomeKeyringOpCode opcode;
- 	guint32 item_id, flags;
--	gboolean ret;
-+	gboolean ret = TRUE;
- 	GnomeKeyringResult res;
- 	
- 	if (!gnome_keyring_proto_decode_get_item_info (packet, &opcode, &keyring_name,

pam.patch

@@ -1,37 +0,0 @@
-diff -up gnome-keyring-2.19.6.1/configure.in.pam gnome-keyring-2.19.6.1/configure.in
---- gnome-keyring-2.19.6.1/configure.in.pam	2007-07-30 13:41:08.000000000 -0400
-+++ gnome-keyring-2.19.6.1/configure.in	2007-07-30 20:15:38.000000000 -0400
-@@ -231,25 +231,20 @@ AC_ARG_ENABLE(pam, 
- 	    AC_HELP_STRING([--disable-pam],
- 	    [Build GNOME keyring PAM helper]))
- 
-+
- if test "$enable_pam" != "no"; then
- 	AC_CHECK_HEADER(security/pam_modules.h, have_pam=yes, have_pam=no)
- 	if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
- 		AC_MSG_ERROR(The PAM headers are missing)
- 	fi
--	
--	case "$host" in
--	*-redhat-linux-gnu)
--		PAM_DEST_DIR="/lib/security"
--		;;
--	*-*-linux*)
--	 	PAM_DEST_DIR="\$(prefix)/../lib/security"
--		;;
--	*)
--		PAM_DEST_DIR="/usr/lib"
--		;;
--	esac
--	AC_SUBST(PAM_DEST_DIR)
- fi
-+
-+AC_ARG_WITH([pam-dir],
-+            [AC_HELP_STRING([--with-pam-dir=DIR],
-+                             [directory to install pam modules in])],
-+             [], [with_pam_dir="/usr/lib"])
-+PAM_DEST_DIR="$with_pam_dir"
-+AC_SUBST(PAM_DEST_DIR)
- 	
- AM_CONDITIONAL(WITH_PAM, test "$have_pam" = "yes")
- 

sources

@@ -1 +1 @@
-16eb73c4a23db11ee8f20a731cf2a92b  gnome-keyring-2.20.1.tar.bz2
+SHA512 (gnome-keyring-42.1.tar.xz) = 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57