From 648313fd03b4c58180f659c191be0107f49e6cc2 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 8 Oct 2007 07:30:19 +0000 Subject: [PATCH] - Fixed minor issue with pam-selinux issue pointed out by stef --- gnome-keyring-2.20-selinux-pam.patch | 2 +- gnome-keyring.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-keyring-2.20-selinux-pam.patch b/gnome-keyring-2.20-selinux-pam.patch index 14f2630..23fdea8 100644 --- a/gnome-keyring-2.20-selinux-pam.patch +++ b/gnome-keyring-2.20-selinux-pam.patch @@ -285,7 +285,7 @@ diff -ur gnome-keyring-2.20.orig/pam/gkr-pam-module.c gnome-keyring-2.20/pam/gkr * the 'login' keyring match it is a priority. */ - ret = start_daemon_if_necessary (ph, pwd); -+ ret = start_daemon_if_necessary (ph, pwd, password); ++ ret = start_daemon_if_necessary (ph, pwd, original); if (ret != PAM_SUCCESS) return ret; diff --git a/gnome-keyring.spec b/gnome-keyring.spec index aa3e41c..1909297 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -3,7 +3,7 @@ Summary: A framework for managing user passwords and other secrets Name: gnome-keyring Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2 @@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 8 2007 Alexander Larsson - 2.20-5 +- Fixed minor issue with pam-selinux issue pointed out by stef + * Thu Oct 4 2007 Alexander Larsson - 2.20-4 - Have the pam module tell the daemon to init the login keyring without using the socket as selinux limits access to that