Merge branch 'master' of ssh://pkgs.fedoraproject.org/pam

Conflicts:
	pam.spec
This commit is contained in:
Tomas Mraz 2011-08-25 16:10:53 +02:00
commit 39bef6c743

View File

@ -3,7 +3,7 @@
Summary: An extensible library which provides authentication for applications Summary: An extensible library which provides authentication for applications
Name: pam Name: pam
Version: 1.1.4 Version: 1.1.4
Release: 2%{?dist} Release: 4%{?dist}
# The library is BSD licensed with option to relicense as GPLv2+ # The library is BSD licensed with option to relicense as GPLv2+
# - this option is redundant as the BSD license allows that anyway. # - this option is redundant as the BSD license allows that anyway.
# pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+. # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
@ -365,10 +365,13 @@ fi
%doc doc/adg/*.txt doc/adg/html %doc doc/adg/*.txt doc/adg/html
%changelog %changelog
* Thu Aug 25 2011 Tomas Mraz <tmraz@redhat.com> 1.1.4-3 * Thu Aug 25 2011 Tomas Mraz <tmraz@redhat.com> 1.1.4-4
- fix dereference in pam_env - fix dereference in pam_env
- fix wrong parse of user@host pattern in pam_access (#732081) - fix wrong parse of user@host pattern in pam_access (#732081)
* Sat Jul 23 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.1.4-3
- Rebuild to fix trailing slashes in provided dirs added by rpm 4.9.1.
* Fri Jul 15 2011 Tomas Mraz <tmraz@redhat.com> 1.1.4-2 * Fri Jul 15 2011 Tomas Mraz <tmraz@redhat.com> 1.1.4-2
- clear supplementary groups in pam_console handler execution - clear supplementary groups in pam_console handler execution