[pam/f19: 3/3] Merge branch 'master' into f19

[Tomáš Mráz]

commit 15be917e6c714f82a427be7b5f1e73e1c028d0ec
Merge: 4f5c509 58c0255
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Jul 12 08:56:25 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	pam.spec

 pam-1.1.6-pwhistory-helper.patch |  765 ++++++++++++++++++++++++++++++++++++++
 pam-1.1.6-rootok-audit.patch     |   99 +++++
 pam.spec                         |   11 +-
 3 files changed, 874 insertions(+), 1 deletions(-)
---
diff --cc pam.spec
index 86a691e,83e455c..702a901
--- a/pam.spec
+++ b/pam.spec
@@@ -388,9 -393,10 +393,13 @@@ f
  %doc doc/adg/*.txt doc/adg/html
  
  %changelog
+ * Thu Jul 11 2013 Tomáš Mráz <tmraz at redhat.com> 1.1.6-12
+ - add auditing of SELinux policy violation in pam_rootok (#965723)
+ - add SELinux helper to pam_pwhistory
+ 
 +* Wed Jun 12 2013 Tomáš Mráz <tmraz at redhat.com> 1.1.6-11.1
 +- disable lastlog messages for gdm
 +
  * Tue May  7 2013 Tomáš Mráz <tmraz at redhat.com> 1.1.6-11
  - the default isadir is more correct