Author: jw Date: 2006-08-02 12:28:24 +0200 (Wed, 02 Aug 2006) New Revision: 1669 Added: crux-2.2/ports/core/shadow/limits.5 crux-2.2/ports/core/shadow/login.access.5 crux-2.2/ports/core/shadow/porttime.5 crux-2.2/ports/core/shadow/shadow-4.0.18-groupmems-nopam.diff Modified: crux-2.2/ports/core/shadow/.footprint crux-2.2/ports/core/shadow/.md5sum crux-2.2/ports/core/shadow/Pkgfile Log: shadow: update to 4.0.18 Modified: crux-2.2/ports/core/shadow/.footprint =================================================================== --- crux-2.2/ports/core/shadow/.footprint 2006-08-02 08:21:48 UTC (rev 1668) +++ crux-2.2/ports/core/shadow/.footprint 2006-08-02 10:28:24 UTC (rev 1669) @@ -47,6 +47,7 @@ -rw-r--r-- root/root usr/man/man8/faillog.8.gz -rw-r--r-- root/root usr/man/man8/groupadd.8.gz -rw-r--r-- root/root usr/man/man8/groupdel.8.gz +-rw-r--r-- root/root usr/man/man8/groupmems.8.gz -rw-r--r-- root/root usr/man/man8/groupmod.8.gz -rw-r--r-- root/root usr/man/man8/grpck.8.gz -rw-r--r-- root/root usr/man/man8/lastlog.8.gz @@ -61,6 +62,7 @@ -rwxr-xr-x root/root usr/sbin/chgpasswd -rwxr-xr-x root/root usr/sbin/groupadd -rwxr-xr-x root/root usr/sbin/groupdel +-rwxr-xr-x root/root usr/sbin/groupmems -rwxr-xr-x root/root usr/sbin/groupmod -rwxr-xr-x root/root usr/sbin/grpck -rwxr-xr-x root/root usr/sbin/pwck Modified: crux-2.2/ports/core/shadow/.md5sum =================================================================== --- crux-2.2/ports/core/shadow/.md5sum 2006-08-02 08:21:48 UTC (rev 1668) +++ crux-2.2/ports/core/shadow/.md5sum 2006-08-02 10:28:24 UTC (rev 1669) @@ -1,6 +1,10 @@ +553d7f4e031312b1170bd60d6583eda3 limits.5 +dd0ae191b0b9ec9938b8651828b9d07b login.access.5 2b8c303d972cf6fb2a4545dd17262f27 login.defs +28b05021cb0e4a4bfc3115a74492ae76 porttime.5 be8f69c2701118093af3d7f3bc02af16 pwck 9e2f566e29068dc98e42ea94ac788200 shadow-4.0.15-nflg-conflict.diff -bc5972a195290533b4c0576276056ed9 shadow-4.0.17.tar.bz2 +f750f030229a5254068619c9f36aa5e3 shadow-4.0.18-groupmems-nopam.diff +c1e167281a5783c10d5329a065a978ff shadow-4.0.18.tar.bz2 a588e277ff49988f0e3787c5b327d10c shadow-fix-useradd-usergroups.patch 75161be083592e2e4e7f9cdcb7369bab useradd-usergroup.diff Modified: crux-2.2/ports/core/shadow/Pkgfile =================================================================== --- crux-2.2/ports/core/shadow/Pkgfile 2006-08-02 08:21:48 UTC (rev 1668) +++ crux-2.2/ports/core/shadow/Pkgfile 2006-08-02 10:28:24 UTC (rev 1669) @@ -4,19 +4,22 @@ # Maintainer: Johannes Winkelmann, jw at crux dot nu name=shadow -version=4.0.17 +version=4.0.18 release=1 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \ pwck login.defs \ shadow-fix-useradd-usergroups.patch\ shadow-4.0.15-nflg-conflict.diff \ - useradd-usergroup.diff) + useradd-usergroup.diff \ + shadow-4.0.18-groupmems-nopam.diff + limits.5 porttime.5 login.access.5) build() { cd $name-$version patch src/useradd.c $SRC/shadow-fix-useradd-usergroups.patch patch src/useradd.c $SRC/shadow-4.0.15-nflg-conflict.diff patch src/useradd.c $SRC/useradd-usergroup.diff + patch src/groupmems.c $SRC/shadow-4.0.18-groupmems-nopam.diff ./configure --prefix=/usr \ --mandir=/usr/man \ @@ -26,6 +29,8 @@ --disable-nls \ --without-selinux \ --without-libpam + + cp $SRC/{limits.5,porttime.5,login.access.5} man make make DESTDIR=$PKG install mkdir -p $PKG/etc/cron/daily $PKG/var/log @@ -42,4 +47,5 @@ $PKG/usr/man/{man3,cs,de,es,fi,tr,fr,hu,id,it,ja,ko,pl,pt_BR,ru,zh_CN,zh_TW} \ $PKG/lib \ $PKG/etc/{login.access,limits,default} + } Added: crux-2.2/ports/core/shadow/limits.5 =================================================================== --- crux-2.2/ports/core/shadow/limits.5 (rev 0) +++ crux-2.2/ports/core/shadow/limits.5 2006-08-02 10:28:24 UTC (rev 1669) @@ -0,0 +1,114 @@ +.\" Title: limits +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/> +.\" Date: 06/06/2006 +.\" Manual: File Formats and Conversions +.\" Source: File Formats and Conversions +.\" +.TH "LIMITS" "5" "06/06/2006" "File Formats and Conversions" "File Formats and Conversions" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +limits \- resource limits definition +.SH "DESCRIPTION" +.PP +The +\fIlimits\fR +file (\fI/etc/limits\fR +by default or LIMITS_FILE defined +\fIconfig.h\fR) describes the resource limits you wish to impose. It should be owned by root and readable by root account only. +.PP +By default no quota is imposed on 'root'. In fact, there is no way to impose limits via this procedure to root\-equiv accounts (accounts with UID 0). +.PP +Each line describes a limit for a user in the form: +.PP + +\fIuser LIMITS_STRING\fR +.PP +The +\fILIMITS_STRING\fR +is a string of a concatenated list of resource limits. Each limit consists of a letter identifier followed by a numerical limit. +.PP +The valid identifiers are: +.TP 3n +\(bu +A: max address space (KB) +.TP 3n +\(bu +C: max core file size (KB) +.TP 3n +\(bu +D: max data size (KB) +.TP 3n +\(bu +F: maximum filesize (KB) +.TP 3n +\(bu +M: max locked\-in\-memory address space (KB) +.TP 3n +\(bu +N: max number of open files +.TP 3n +\(bu +R: max resident set size (KB) +.TP 3n +\(bu +S: max stack size (KB) +.TP 3n +\(bu +T: max CPU time (MIN) +.TP 3n +\(bu +U: max number of processes +.TP 3n +\(bu +K: file creation mask, set by +\fBumask\fR(2). +.TP 3n +\(bu +L: max number of logins for this user +.TP 3n +\(bu +P: process priority, set by +\fBsetpriority\fR(2). +.sp +.RE +.PP +For example, +\fIL2D2048N5\fR +is a valid +\fILIMITS_STRING \fR. For reading convenience, the following entries are equivalent: +.sp +.RS 3n +.nf + username L2D2048N5 + username L2 D2048 N5 + +.fi +.RE +.PP +Be aware that after +\fIusername\fR +the rest of the line is considered a limit string, thus comments are not allowed. A invalid limits string will be rejected (not considered) by the +\fBlogin\fR +program. +.PP +The default entry is denoted by username "\fI*\fR". If you have multiple +\fIdefault\fR +entries in your +\fILIMITS_FILE\fR, then the last one will be used as the default entry. +.PP +To completely disable limits for a user, a single dash "\fI\-\fR" will do. +.PP +Also, please note that all limit settings are set PER LOGIN. They are not global, nor are they permanent. Perhaps global limits will come, but for now this will have to do ;) +.SH "FILES" +.TP 3n +\fI/etc/limits\fR +.SH "SEE ALSO" +.PP + +\fBlogin\fR(1), +\fBsetpriority\fR(2), +\fBsetrlimit\fR(2). Added: crux-2.2/ports/core/shadow/login.access.5 =================================================================== --- crux-2.2/ports/core/shadow/login.access.5 (rev 0) +++ crux-2.2/ports/core/shadow/login.access.5 2006-08-02 10:28:24 UTC (rev 1669) @@ -0,0 +1,50 @@ +.\" Title: login.access +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/> +.\" Date: 06/06/2006 +.\" Manual: File Formats and Conversions +.\" Source: File Formats and Conversions +.\" +.TH "LOGIN.ACCESS" "5" "06/06/2006" "File Formats and Conversions" "File Formats and Conversions" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +login.access \- login access control table +.SH "DESCRIPTION" +.PP +The +\fIlogin.access\fR +file specifies (user, host) combinations and/or (user, tty) combinations for which a login will be either accepted or refused. +.PP +When someone logs in, the +\fIlogin.access\fR +is scanned for the first entry that matches the (user, host) combination, or, in case of non\-networked logins, the first entry that matches the (user, tty) combination. The permissions field of that table entry determines whether the login will be accepted or refused. +.PP +Each line of the login access control table has three fields separated by a ":" character: +.PP + +\fIpermission\fR:\fIusers\fR:\fIorigins\fR +.PP +The first field should be a "\fI+\fR" (access granted) or "\fI\-\fR" (access denied) character. The second field should be a list of one or more login names, group names, or +\fIALL\fR +(always matches). The third field should be a list of one or more tty names (for non\-networked logins), host names, domain names (begin with "."), host addresses, internet network numbers (end with "."), +\fIALL\fR +(always matches) or +\fILOCAL\fR +(matches any string that does not contain a "." character). If you run NIS you can use @netgroupname in host or user patterns. +.PP +The +\fIEXCEPT\fR +operator makes it possible to write very compact rules. +.PP +The group file is searched only when a name does not match that of the logged\-in user. Only groups are matched in which users are explicitly listed: the program does not look at a user's primary group id value. +.SH "FILES" +.TP 3n +\fI/etc/login.defs\fR +Shadow password suite configuration. +.SH "SEE ALSO" +.PP + +\fBlogin\fR(1). Added: crux-2.2/ports/core/shadow/porttime.5 =================================================================== --- crux-2.2/ports/core/shadow/porttime.5 (rev 0) +++ crux-2.2/ports/core/shadow/porttime.5 2006-08-02 10:28:24 UTC (rev 1669) @@ -0,0 +1,75 @@ +.\" Title: porttime +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/> +.\" Date: 06/06/2006 +.\" Manual: File Formats and Conversions +.\" Source: File Formats and Conversions +.\" +.TH "PORTTIME" "5" "06/06/2006" "File Formats and Conversions" "File Formats and Conversions" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +porttime \- port access time file +.SH "DESCRIPTION" +.PP + +\fIporttime\fR +contains a list of tty devices, user names, and permitted login times. +.PP +Each entry consists of three colon separated fields. The first field is a comma separated list of tty devices, or an asterisk to indicate that all tty devices are matched by this entry. The second field is a comma separated list of user names, or an asterisk to indicated that all user names are matched by this entry. The third field is a comma separated list of permitted access times. +.PP +Each access time entry consists of zero or more days of the week, abbreviated +\fISu\fR, +\fIMo\fR, +\fITu\fR, +\fIWe\fR, +\fITh\fR, +\fIFr\fR, and +\fISa\fR, followed by a pair of times separated by a hyphen. The abbreviation +\fIWk\fR +may be used to represent Monday thru Friday, and +\fIAl\fR +may be used to indicate every day. If no days are given, +\fIAl\fR +is assumed. +.SH "EXAMPLES" +.PP +The following entry allows access to user +\fBjfh\fR +on every port during weekdays from 9am to 5pm. +.PP +*:jfh:Wk0900\-1700 +.PP +The following entries allow access only to the users +\fIroot\fR +and +\fIoper\fR +on +\fI/dev/console\fR +at any time. This illustrates how the +\fI/etc/porttime\fR +file is an ordered list of access times. Any other user would match the second entry which does not permit access at any time. +.sp +.RS 3n +.nf + console:root,oper:Al0000\-2400 + console:*: + +.fi +.RE +.PP +The following entry allows access for the user +\fIgames\fR +on any port during non\-working hours. +.PP +*:games:Wk1700\-0900,SaSu0000\-2400 +.SH "FILES" +.TP 3n +\fI/etc/porttime\fR +File containing port access. +.SH "SEE ALSO" +.PP + +\fBlogin\fR(1). Added: crux-2.2/ports/core/shadow/shadow-4.0.18-groupmems-nopam.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.18-groupmems-nopam.diff (rev 0) +++ crux-2.2/ports/core/shadow/shadow-4.0.18-groupmems-nopam.diff 2006-08-02 10:28:24 UTC (rev 1669) @@ -0,0 +1,12 @@ +--- shadow-4.0.18.orig/src/groupmems.c 2006-07-23 21:19:22.000000000 +0200 ++++ shadow-4.0.18/src/groupmems.c 2006-08-02 10:53:10.087940008 +0200 +@@ -37,8 +37,8 @@ + #include <sys/types.h> + #ifdef USE_PAM + #include "pam_defs.h" +-#include <pwd.h> + #endif /* USE_PAM */ ++#include <pwd.h> + #include "defines.h" + #include "groupio.h" +