refresh other patches for new upstream release

1 files changed, 209 insertions, 135 deletions

diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot
index 23f6c9d4..d791567c 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches-applied/008_modules_pam_limits_chroot
@@ -18,7 +18,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
  
  #define LIMIT_SOFT  1
  #define LIMIT_HARD  2
-@@ -250,6 +252,8 @@
+@@ -317,6 +319,8 @@
      pl->login_limit = -2;
      pl->login_limit_def = LIMITS_DEF_NONE;
  
@@ -27,7 +27,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
      return retval;
  }
  
-@@ -320,6 +324,8 @@
+@@ -387,6 +391,8 @@
  	pl->flag_numsyslogins = 1;
      } else if (strcmp(lim_item, "priority") == 0) {
  	limit_item = LIMIT_PRI;
@@ -36,7 +36,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
      } else {
          pam_syslog(pamh, LOG_DEBUG, "unknown limit item '%s'", lim_item);
          return;
-@@ -357,9 +363,9 @@
+@@ -424,9 +430,9 @@
  			pam_syslog(pamh, LOG_DEBUG,
  				   "wrong limit value '%s' for limit type '%s'",
  				   lim_value, lim_type);
@@ -48,8 +48,8 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
  #ifdef __USE_FILE_OFFSET64
  		rlimit_value = strtoull (lim_value, &endptr, 10);
  #else
-@@ -420,7 +426,9 @@
-          break;
+@@ -487,7 +493,9 @@
+ #endif
      }
  
 -    if ( (limit_item != LIMIT_LOGIN)
@@ -59,7 +59,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
  	 && (limit_item != LIMIT_NUMSYSLOGINS)
  	 && (limit_item != LIMIT_PRI) ) {
          if (limit_type & LIMIT_SOFT) {
-@@ -615,6 +623,13 @@
+@@ -689,6 +697,13 @@
          retval |= LOGIN_ERR;
      }
  
@@ -94,155 +94,229 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
 ===================================================================
 --- pam.deb.orig/modules/pam_limits/limits.conf.5
 +++ pam.deb/modules/pam_limits/limits.conf.5
-@@ -1,17 +1,17 @@
+@@ -1,161 +1,13 @@
++'\" t
  .\"     Title: limits.conf
- .\"    Author: 
--.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
--.\"      Date: 04/16/2008
-+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-+.\"      Date: 07/27/2008
+ .\"    Author: [see the "AUTHOR" section]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\"      Date: 03/02/2009
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\"      Date: 08/24/2009
  .\"    Manual: Linux-PAM Manual
  .\"    Source: Linux-PAM Manual
+ .\"  Language: English
  .\"
--.TH "LIMITS\.CONF" "5" "04/16/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "LIMITS\&.CONF" "5" "07/27/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
- .\" disable hyphenation
- .nh
- .\" disable justification (adjust text to left margin only)
- .ad l
- .SH "NAME"
--limits.conf - configuration file for the pam_limits module
-+limits.conf \- configuration file for the pam_limits module
+-.TH "LIMITS\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.\" -----------------------------------------------------------------
+-.\" * (re)Define some macros
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" toupper - uppercase a string (locale-aware)
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de toupper
+-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+-\\$*
+-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH-xref - format a cross-reference to an SH section
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de SH-xref
+-.ie n \{\
+-.\}
+-.toupper \\$*
+-.el \{\
+-\\$*
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH - level-one heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SH
+-.\" put an extra blank line of space above the head in non-TTY output
+-.if t \{\
+-.sp 1
+-.\}
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[an-margin]u
+-.ti 0
+-.HTML-TAG ".NH \\n[an-level]"
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-\." make the size of the head bigger
+-.ps +3
+-.ft B
+-.ne (2v + 1u)
+-.ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+-.el \{\
+-.nr an-break-flag 0
+-.\" if not n (not TTY), use normal case (not uppercase)
+-\\$1
+-.in \\n[an-margin]u
+-.ti 0
+-.\" if not n (not TTY), put a border/line under subheading
+-.sp -.6
+-\l'\n(.lu'
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SS - level-two heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SS
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[IN]u
+-.ti \\n[SN]u
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-.ps \\n[PS-SS]u
+-\." make the size of the head bigger
+-.ps +2
+-.ft B
+-.ne (2v + 1u)
+-.if \\n[.$] \&\\$*
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BB/BE - put background/screen (filled box) around block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BB
+-.if t \{\
+-.sp -.5
+-.br
+-.in +2n
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EB
+-.if t \{\
+-.if "\\$2"adjust-for-leading-newline" \{\
+-.sp -1
+-.\}
+-.br
+-.di
+-.in
+-.ll
+-.gcolor
+-.nr BW \\n(.lu-\\n(.i
+-.nr BH \\n(dn+.5v
+-.ne \\n(BHu+.5v
+-.ie "\\$2"adjust-for-leading-newline" \{\
+-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.el \{\
+-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.in 0
+-.sp -.5v
+-.nf
+-.BX
+-.in
+-.sp .5v
+-.fi
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BM/EM - put colored marker in margin next to block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BM
+-.if t \{\
+-.br
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EM
+-.if t \{\
+-.br
+-.di
+-.ll
+-.gcolor
+-.nr BH \\n(dn
+-.ne \\n(BHu
+-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+-.in 0
+-.nf
+-.BX
+-.in
+-.fi
+-.\}
+-..
++.TH "LIMITS\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------
+@@ -166,7 +18,7 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ limits.conf \- configuration file for the pam_limits module
  .SH "DESCRIPTION"
  .PP
- The syntax of the lines is as follows:
-@@ -34,19 +34,19 @@
+@@ -360,6 +212,11 @@
  .RS 4
- \h'-04'\(bu\h'+03'a groupname, with
- \fB@group\fR
--syntax\. This should not be confused with netgroups\.
-+syntax\&. This should not be confused with netgroups\&.
+ maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher)
  .RE
- .sp
- .RS 4
- \h'-04'\(bu\h'+03'the wildcard
--\fB*\fR, for default entry\.
-+\fB*\fR, for default entry\&.
- .RE
- .sp
- .RS 4
- \h'-04'\(bu\h'+03'the wildcard
- \fB%\fR, for maxlogins limit only, can also be used with
- \fI%group\fR
--syntax\.
-+syntax\&.
- .RE
- .RE
- .PP
-@@ -57,18 +57,18 @@
- .RS 4
- for enforcing
- \fBhard\fR
--resource limits\. These limits are set by the superuser and enforced by the Kernel\. The user cannot raise his requirement of system resources above such values\.
-+resource limits\&. These limits are set by the superuser and enforced by the Kernel\&. The user cannot raise his requirement of system resources above such values\&.
- .RE
- .PP
- \fBsoft\fR
- .RS 4
- for enforcing
- \fBsoft\fR
--resource limits\. These limits are ones that the user can move up or down within the permitted range by any pre\-existing
-+resource limits\&. These limits are ones that the user can move up or down within the permitted range by any pre\-existing
- \fBhard\fR
--limits\. The values specified with this token can be thought of as
-+limits\&. The values specified with this token can be thought of as
- \fIdefault\fR
--values, for normal system usage\.
-+values, for normal system usage\&.
- .RE
- .PP
- \fB\-\fR
-@@ -77,9 +77,9 @@
- \fBsoft\fR
- and
- \fBhard\fR
--resource limits together\.
-+resource limits together\&.
- .sp
--Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\. \.
-+Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\&. \&.
- .RE
- .RE
- .PP
-@@ -154,47 +154,52 @@
- .PP
- \fBlocks\fR
- .RS 4
--maximum locked files (Linux 2\.4 and higher)
-+maximum locked files (Linux 2\&.4 and higher)
- .RE
- .PP
- \fBsigpending\fR
- .RS 4
--maximum number of pending signals (Linux 2\.6 and higher)
-+maximum number of pending signals (Linux 2\&.6 and higher)
- .RE
- .PP
- \fBmsqqueue\fR
- .RS 4
--maximum memory used by POSIX message queues (bytes) (Linux 2\.6 and higher)
-+maximum memory used by POSIX message queues (bytes) (Linux 2\&.6 and higher)
- .RE
- .PP
- \fBnice\fR
- .RS 4
--maximum nice priority allowed to raise to (Linux 2\.6\.12 and higher) values: [\-20,19]
-+maximum nice priority allowed to raise to (Linux 2\&.6\&.12 and higher) values: [\-20,19]
- .RE
- .PP
- \fBrtprio\fR
- .RS 4
--maximum realtime priority allowed for non\-privileged processes (Linux 2\.6\.12 and higher)
-+maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher)
-+.RE
 +.PP
 +\fBchroot\fR
 +.RS 4
 +the directory to chroot the user to
- .RE
++.RE
  .RE
  .PP
- In general, individual limits have priority over group limits, so if you impose no limits for
- \fIadmin\fR
--group, but one of the members in this group have a limits line, the user will have its limits set according to this line\.
-+group, but one of the members in this group have a limits line, the user will have its limits set according to this line\&.
- .PP
- Also, please note that all limit settings are set
--\fIper login\fR\. They are not global, nor are they permanent; existing only for the duration of the session\.
-+\fIper login\fR\&. They are not global, nor are they permanent; existing only for the duration of the session\&.
- .PP
- In the
- \fIlimits\fR
--configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\.
-+configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\&.
- .PP
- The pam_limits module does its best to report configuration problems found in its configuration file via
--\fBsyslog\fR(3)\.
-+\fBsyslog\fR(3)\&.
+ All items support the values
+@@ -392,20 +249,12 @@
  .SH "EXAMPLES"
  .PP
  These are some example lines which might be specified in
--\fI/etc/security/limits\.conf\fR\.
-+\fI/etc/security/limits\&.conf\fR\&.
+-\FC/etc/security/limits\&.conf\F[]\&.
++/etc/security/limits\&.conf\&.
  .sp
+ .if n \{\
  .RS 4
+ .\}
+-.fam C
+-.ps -1
  .nf
-@@ -216,4 +221,4 @@
- \fBpam\fR(8)
- .SH "AUTHOR"
- .PP
--pam_limits was initially written by Cristian Gafton <gafton@redhat\.com>
-+pam_limits was initially written by Cristian Gafton <gafton@redhat\&.com>
+-.if t \{\
+-.sp -1
+-.\}
+-.BB lightgray adjust-for-leading-newline
+-.sp -1
+-
+ *               soft    core            0
+ *               hard    rss             10000
+ @student        hard    nproc           20
+@@ -414,13 +263,7 @@
+ ftp             hard    nproc           0
+ @student        \-       maxlogins       4
+     
+-.EB lightgray adjust-for-leading-newline
+-.if t \{\
+-.sp 1
+-.\}
+ .fi
+-.fam
+-.ps +1
+ .if n \{\
+ .RE
+ .\}
 Index: pam.deb/modules/pam_limits/limits.conf
 ===================================================================
 --- pam.deb.orig/modules/pam_limits/limits.conf