[pam/f16] add a note to limits.conf (#754285)

[Tomáš Mráz]

commit 3401bc39d9080bff2d54e95dbc3b2a07a6c32199
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Dec 21 09:13:05 2011 +0100

    add a note to limits.conf (#754285)
    
    Conflicts:
    
    	pam.spec

 pam-1.1.5-limits-user.patch |   12 ++++++++++++
 pam.spec                    |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/pam-1.1.5-limits-user.patch b/pam-1.1.5-limits-user.patch
new file mode 100644
index 0000000..1890e4d
--- /dev/null
+++ b/pam-1.1.5-limits-user.patch
@@ -0,0 +1,12 @@
+diff -up Linux-PAM-1.1.5/modules/pam_limits/limits.conf.limits Linux-PAM-1.1.5/modules/pam_limits/limits.conf
+--- Linux-PAM-1.1.5/modules/pam_limits/limits.conf.limits	2011-06-21 11:04:56.000000000 +0200
++++ Linux-PAM-1.1.5/modules/pam_limits/limits.conf	2011-12-21 09:09:17.000000000 +0100
+@@ -1,5 +1,8 @@
+ # /etc/security/limits.conf
+ #
++#This file sets the resource limits for the users logged in via PAM.
++#It does not affect resource limits of the system services.
++#
+ #Each line describes a limit for a user in the form:
+ #
+ #<domain>        <type>  <item>  <value>
diff --git a/pam.spec b/pam.spec
index 3fac661..f33935c 100644
--- a/pam.spec
+++ b/pam.spec
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+
 # - this option is redundant as the BSD license allows that anyway.
 # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
@@ -37,6 +37,7 @@ Patch9:  pam-1.1.2-noflex.patch
 Patch10: pam-1.1.3-nouserenv.patch
 Patch11: pam-1.1.3-console-abstract.patch
 Patch12: pam-1.1.3-faillock-screensaver.patch
+Patch13: pam-1.1.5-limits-user.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -107,6 +108,7 @@ mv pam-redhat-%{pam_redhat_version}/* modules
 %patch10 -p1 -b .nouserenv
 %patch11 -p1 -b .abstract
 %patch12 -p1 -b .screensaver
+%patch13 -p1 -b .limits
 
 libtoolize -f
 autoreconf
@@ -361,6 +363,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Wed Dec 21 2011 Tomas Mraz <tmraz at redhat.com> 1.1.5-3
+- add a note to limits.conf (#754285)
+
 * Thu Nov 24 2011 Tomas Mraz <tmraz at redhat.com> 1.1.5-1
 - upgrade to new upstream release