diff --git a/passwd-0.77-gnome-keyring.patch b/passwd-0.77-gnome-keyring.patch new file mode 100644 index 0000000..f3486b2 --- /dev/null +++ b/passwd-0.77-gnome-keyring.patch @@ -0,0 +1,9 @@ +diff -up passwd-0.77/passwd.pamd.keyring passwd-0.77/passwd.pamd +--- passwd-0.77/passwd.pamd.keyring 2009-02-11 15:06:31.000000000 +0100 ++++ passwd-0.77/passwd.pamd 2010-04-06 17:13:29.000000000 +0200 +@@ -2,4 +2,4 @@ + auth include system-auth + account include system-auth + password substack system-auth +--password optional pam_gnome_keyring.so ++-password optional pam_gnome_keyring.so use_authtok diff --git a/passwd.spec b/passwd.spec index f3d89b0..77b7043 100644 --- a/passwd.spec +++ b/passwd.spec @@ -7,11 +7,12 @@ Summary: An utility for setting or changing passwords using PAM Name: passwd Version: 0.77 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD or GPLv2+ Group: System Environment/Base URL: http://fedorahosted.org/passwd Source: https://fedorahosted.org/releases/p/a/%{name}/%{name}-%{version}.tar.bz2 +Patch1: passwd-0.77-gnome-keyring.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pam >= 1.0.90, /etc/pam.d/system-auth %if %{WITH_SELINUX} @@ -31,6 +32,7 @@ Modules) library. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .keyring %build %configure \ @@ -65,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/passwd.1* %changelog +* Tue Apr 6 2010 Tomas Mraz 0.77-5 +- first part of fix for pam_gnome_keyring prompting (#578624) + needs support for use_authtok to be added to pam_gnome_keyring + * Thu Jan 28 2010 Tomas Mraz 0.77-4 - add COPYING and other things to doc - correct the licence field