From 4041e6fb4780473b1374e3bbf3f3d312a8017374 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 22 Jul 2008 16:37:21 -0700 Subject: refresh patch for new upstream version --- .../patches-applied/008_modules_pam_limits_chroot | 139 ++++++++++----------- 1 file changed, 66 insertions(+), 73 deletions(-) (limited to 'debian/patches-applied') diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot index 5155920f..f2d3cc26 100644 --- a/debian/patches-applied/008_modules_pam_limits_chroot +++ b/debian/patches-applied/008_modules_pam_limits_chroot @@ -1,7 +1,7 @@ -Index: pam.deb/modules/pam_limits/pam_limits.c +Index: pam.debian/modules/pam_limits/pam_limits.c =================================================================== ---- pam.deb.orig/modules/pam_limits/pam_limits.c -+++ pam.deb/modules/pam_limits/pam_limits.c +--- pam.debian.orig/modules/pam_limits/pam_limits.c ++++ pam.debian/modules/pam_limits/pam_limits.c @@ -75,6 +75,7 @@ int flag_numsyslogins; /* whether to limit logins only for a specific user or to count all logins */ @@ -27,7 +27,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c return retval; } -@@ -311,6 +315,8 @@ +@@ -313,6 +317,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; -@@ -348,9 +354,9 @@ +@@ -350,9 +356,9 @@ pam_syslog(pamh, LOG_DEBUG, "wrong limit value '%s' for limit type '%s'", lim_value, lim_type); @@ -48,7 +48,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c #ifdef __USE_FILE_OFFSET64 rlimit_value = strtoull (lim_value, &endptr, 10); #else -@@ -409,7 +415,9 @@ +@@ -413,7 +419,9 @@ break; } @@ -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) { -@@ -605,6 +613,13 @@ +@@ -601,6 +609,13 @@ retval |= LOGIN_ERR; } @@ -73,11 +73,11 @@ Index: pam.deb/modules/pam_limits/pam_limits.c return retval; } -Index: pam.deb/modules/pam_limits/limits.conf.5.xml +Index: pam.debian/modules/pam_limits/limits.conf.5.xml =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf.5.xml -+++ pam.deb/modules/pam_limits/limits.conf.5.xml -@@ -223,6 +223,12 @@ +--- pam.debian.orig/modules/pam_limits/limits.conf.5.xml ++++ pam.debian/modules/pam_limits/limits.conf.5.xml +@@ -224,6 +224,12 @@ (Linux 2.6.12 and higher) @@ -90,67 +90,60 @@ Index: pam.deb/modules/pam_limits/limits.conf.5.xml -Index: pam.deb/modules/pam_limits/limits.conf.5 +Index: pam.debian/modules/pam_limits/limits.conf.5 =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf.5 -+++ pam.deb/modules/pam_limits/limits.conf.5 -@@ -1,11 +1,11 @@ +--- pam.debian.orig/modules/pam_limits/limits.conf.5 ++++ pam.debian/modules/pam_limits/limits.conf.5 +@@ -1,17 +1,17 @@ .\" Title: limits.conf .\" Author: --.\" Generator: DocBook XSL Stylesheets v1.71.1 --.\" Date: 04/30/2007 --.\" Manual: Linux\-PAM Manual --.\" Source: Linux\-PAM Manual +-.\" Generator: DocBook XSL Stylesheets v1.72.0 +-.\" Date: 08/30/2007 +.\" Generator: DocBook XSL Stylesheets v1.73.2 +.\" Date: 07/22/2008 -+.\" Manual: Linux-PAM Manual -+.\" Source: Linux-PAM Manual + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual .\" --.TH "LIMITS.CONF" "5" "04/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual" -+.TH "LIMITS\&.CONF" "5" "07/22/2008" "Linux-PAM Manual" "Linux\-PAM Manual" +-.TH "LIMITS.CONF" "5" "08/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual" ++.TH "LIMITS\.CONF" "5" "07/22/2008" "Linux-PAM Manual" "Linux\-PAM Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -@@ -26,48 +26,49 @@ + .ad l + .SH "NAME" +-limits.conf \- configuration file for the pam_limits module ++limits.conf - configuration file for the pam_limits module + .SH "DESCRIPTION" + .PP + The syntax of the lines is as follows: +@@ -26,46 +26,49 @@ .PP \fB\fR .RS 4 +.sp -+.RS 4 -+\h'-04'\(bu\h'+03'a username -+.RE + .RS 4 + \h'-04'\(bu\h'+03'a username + .RE +.sp .RS 4 --.TP 4 --\(bu --a username --.TP 4 --\(bu --a groupname, with -+\h'-04'\(bu\h'+03'a groupname, with + \h'-04'\(bu\h'+03'a groupname, with \fB@group\fR -syntax. This should not be confused with netgroups. --.TP 4 --\(bu --the wildcard --\fB*\fR, for default entry. --.TP 4 --\(bu --the wildcard -+syntax\&. This should not be confused with netgroups\&. -+.RE ++syntax\. This should not be confused with netgroups\. + .RE +.sp -+.RS 4 -+\h'-04'\(bu\h'+03'the wildcard -+\fB*\fR, for default entry\&. -+.RE + .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 + .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\&. ++syntax\. .RE .RE .PP @@ -163,7 +156,7 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 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\&. ++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 @@ -171,26 +164,26 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 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\-exisiting -+resource limits\&. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting ++resource limits\. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting \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 ++limits\. The values specified with this token can be thought of as \fIdefault\fR -values, for normal system usage. -+values, for normal system usage\&. ++values, for normal system usage\. .RE .PP \fB\-\fR -@@ -76,16 +77,14 @@ +@@ -74,16 +77,14 @@ \fBsoft\fR and \fBhard\fR -resource limits together. -+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. . -.RE -+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 @@ -200,36 +193,36 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 .PP \fBcore\fR .RS 4 -@@ -154,48 +153,52 @@ +@@ -153,48 +154,52 @@ .PP \fBlocks\fR .RS 4 -maximum locked files (Linux 2.4 and higher) -+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) ++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) ++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) -+maximum nice priority allowed to raise to (Linux 2\&.6\&.12 and higher) ++maximum nice priority allowed to raise to (Linux 2\.6\.12 and higher) .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) ++maximum realtime priority allowed for non\-privileged processes (Linux 2\.6\.12 and higher) .RE +.PP +\fBchroot\fR @@ -241,38 +234,38 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 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\&. ++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\&. ++\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\&. ++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)\&. ++\fBsyslog\fR(3)\. .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\&. ++\fI/etc/security/limits\.conf\fR\. .sp .RS 4 .nf -@@ -217,4 +220,4 @@ +@@ -216,4 +221,4 @@ \fBpam\fR(8) .SH "AUTHOR" .PP -pam_limits was initially written by Cristian Gafton -+pam_limits was initially written by Cristian Gafton -Index: pam.deb/modules/pam_limits/limits.conf ++pam_limits was initially written by Cristian Gafton +Index: pam.debian/modules/pam_limits/limits.conf =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf -+++ pam.deb/modules/pam_limits/limits.conf +--- pam.debian.orig/modules/pam_limits/limits.conf ++++ pam.debian/modules/pam_limits/limits.conf @@ -35,6 +35,7 @@ # - msgqueue - max memory used by POSIX message queues (bytes) # - nice - max nice priority allowed to raise to -- cgit v1.2.3