Merge pull request #2 from current/pam:current

sync with current

pam.spec

@@ -13,10 +13,12 @@
 
 %define pam_redhat_version 0.99.10-1
 
+Epoch:      1
+
 Summary:    A security tool which provides authentication for applications
 Name:       pam
 Version:    1.1.8
-Release:    22
+Release:    23
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 License:    BSD and GPLv2+
@@ -34,6 +36,8 @@ Source11:   postlogin.pamd
 Source12:   postlogin.5
 Source13:   pamtmp.conf
 Source14:   90-nproc.conf
+Source15:   password-auth.pamd
+Source16:   smartcard-auth.pamd
 #add missing documentation
 Source501:  pam_tty_audit.8
 Source502:  README
@@ -98,10 +102,9 @@ BuildRequires:  flex
 # this pulls in the mega texlive load
 BuildRequires:  linuxdoc-tools
 %endif
-BuildRequires:  db_nss-devel
-BuildRequires:  glibc-crypt_blowfish-devel
 BuildRequires:  cracklib-devel
 BuildRequires:  libaudit-devel
+BuildRequires:  db_nss-devel
 BuildRequires:  gettext-devel
 BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  db-devel
@@ -114,8 +117,6 @@ BuildRequires:  prelude-devel >= 0.9.0
 %else
 BuildConflicts: pkgconfig(libprelude)
 %endif
-BuildRequires:  pkgconfig(libtirpc)
-BuildRequires:  pkgconfig(openssl)
 Requires:       cracklib-dicts
 Requires:       setup >= 2.7.12-2
 Requires(pre):  rpm-helper
@@ -139,14 +140,16 @@ having to recompile programs that handle authentication.
 %attr(0644,root,shadow) %config(noreplace) %{_sysconfdir}/pam.d/system-auth-default
 %config %{_sysconfdir}/pam.d/config-util
 %config %{_sysconfdir}/pam.d/postlogin
+%config %{_sysconfdir}/pam.d/password-auth
+%config %{_sysconfdir}/pam.d/smartcard-auth
 /sbin/pam_console_apply
 /sbin/pam_tally2
+/sbin/faillock
 %attr(4755,root,root) /sbin/pam_timestamp_check
 %attr(0755,root,root) /sbin/pwhistory_helper
 %attr(4755,root,root) /sbin/unix_chkpwd
 %attr(0700,root,root) /sbin/unix_update
 %attr(0755,root,root) /sbin/mkhomedir_helper
-%{_sbindir}/faillock
 %config(noreplace) %{_sysconfdir}/security/access.conf
 %config(noreplace) %{_sysconfdir}/security/chroot.conf
 %config(noreplace) %{_sysconfdir}/security/console.perms
@@ -168,7 +171,7 @@ having to recompile programs that handle authentication.
 /%{_lib}/security/*.so
 /%{_lib}/security/pam_filter
 /usr/lib/tmpfiles.d/pam.conf
-%dir /var/run/console
+%ghost %dir /var/run/console
 %ghost /var/log/tallylog
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -308,6 +311,8 @@ install -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/other
 install -m 644 %{SOURCE6} %{buildroot}/etc/pam.d/system-auth
 install -m 644 %{SOURCE7} %{buildroot}/etc/pam.d/config-util
 install -m 644 %{SOURCE11} %{buildroot}/etc/pam.d/postlogin
+install -m 644 %{SOURCE15} %{buildroot}/etc/pam.d/password-auth
+install -m 644 %{SOURCE16} %{buildroot}/etc/pam.d/smartcard-auth
 install -m 600 /dev/null %{buildroot}%{_sysconfdir}/security/opasswd
 install -d -m 755 %{buildroot}/var/log
 install -m 600 /dev/null %{buildroot}/var/log/tallylog