[Pkg-shadow-commits] r245 - branches/experimental/debian/patches

Martin Quinson pkg-shadow-devel@lists.alioth.debian.org
Sat, 11 Jun 2005 22:39:57 +0000


Author: mquinson
Date: 2005-06-11 22:39:57 +0000 (Sat, 11 Jun 2005)
New Revision: 245

Modified:
   branches/experimental/debian/patches/005_manpages-login.1
   branches/experimental/debian/patches/005_manpages-shadow.5
   branches/experimental/debian/patches/335_usermod.8-better-document--f
   branches/experimental/debian/patches/series
Log:
Some more patches updated to the lastest upstream version. There's still a long way to do, but not tonight

Modified: branches/experimental/debian/patches/005_manpages-login.1
===================================================================
--- branches/experimental/debian/patches/005_manpages-login.1	2005-06-11 22:13:52 UTC (rev 244)
+++ branches/experimental/debian/patches/005_manpages-login.1	2005-06-11 22:39:57 UTC (rev 245)
@@ -5,23 +5,11 @@
 Status wrt upstream: Forwarded but not completely applied yet 
 		     (the files locations patches are already applied)
 
-Index: shadow-4.0.3/man/login.1
+Index: shadow-4.0.9/man/login.1
 ===================================================================
---- shadow-4.0.3.orig/man/login.1	2005-05-12 12:12:08.887059874 +0200
-+++ shadow-4.0.3/man/login.1	2005-05-12 12:12:18.802578367 +0200
-@@ -95,9 +95,9 @@ executed.
- Please see the appropriate manual section for more information on
- this function.
- .PP
--A subsystem login is indicated by the presense of a "*" as the first
-+A subsystem login is indicated by the presence of a "*" as the first
- character of the login shell. The given home directory will be used as
--the root of a new filesystem which the user is actually logged into.
-+the root of a new file system which the user is actually logged into.
- .SH OPTIONS
- .TP
- .B -p
-@@ -119,11 +119,20 @@ This version of \fBlogin\fR has many com
+--- shadow-4.0.9.orig/man/login.1	2005-04-29 01:23:06.000000000 +0200
++++ shadow-4.0.9/man/login.1	2005-06-12 00:35:34.680201897 +0200
+@@ -99,6 +99,15 @@ This version of \fBlogin\fR has many com
  may be in use at any particular site.
  .PP
  The location of files is subject to differences in system configuration.
@@ -35,12 +23,5 @@
 +from the shell prompt without \fBexec\fR, the user you use will
 +continue to appear to be logged in even after you log out of the "subsession".
  .SH FILES
+ \fI/var/run/utmp\fR		\- list of current login sessions
  .br
--/etc/utmp \- list of current login sessions
-+/var/run/utmp \- list of current login sessions
- .br
--/etc/wtmp \- list of previous login sessions
-+/var/log/wtmp \- list of previous login sessions
- .br
- /etc/passwd \- user account information
- .br

Modified: branches/experimental/debian/patches/005_manpages-shadow.5
===================================================================
--- branches/experimental/debian/patches/005_manpages-shadow.5	2005-06-11 22:13:52 UTC (rev 244)
+++ branches/experimental/debian/patches/005_manpages-shadow.5	2005-06-11 22:39:57 UTC (rev 245)
@@ -3,17 +3,18 @@
 
 Status wrt upstream: Forwarded but not applied yet
 
-Index: shadow-4.0.3/man/shadow.5
+Index: shadow-4.0.9/man/shadow.5
 ===================================================================
---- shadow-4.0.3.orig/man/shadow.5	2005-05-12 12:12:08.909056587 +0200
-+++ shadow-4.0.3/man/shadow.5	2005-05-12 12:12:18.805577919 +0200
-@@ -58,6 +58,9 @@ The encryped password consists of 13 to 
- a thru z, A thru Z, 0 thru 9, \. and /.
- Refer to \fBcrypt\fR(3) for details on how this string is
- interpreted.
+--- shadow-4.0.9.orig/man/shadow.5	2005-04-12 18:31:06.000000000 +0200
++++ shadow-4.0.9/man/shadow.5	2005-06-12 00:25:46.085145619 +0200
+@@ -58,6 +58,10 @@ example if it starts with "$1$" it means
+ .PP
+ Refer to \fBcrypt\fR(3) for details on how this string is interpreted.
+ .PP
 +If the password field contains some string that is not valid result
 +of \fBcrypt\fR(3), for instance ! or *, the user will not be able to use
 +a unix password to log in, subject to \fBpam\fR(7).
- .PP
- The date of the last password change is given as the number
- of days since Jan 1, 1970.
++.PP
+ The date of the last password change is given as the number of days since
+ Jan 1, 1970. The password may not be changed again until the proper number
+ of days have passed, and must be changed after the maximum number of days.

Modified: branches/experimental/debian/patches/335_usermod.8-better-document--f
===================================================================
--- branches/experimental/debian/patches/335_usermod.8-better-document--f	2005-06-11 22:13:52 UTC (rev 244)
+++ branches/experimental/debian/patches/335_usermod.8-better-document--f	2005-06-11 22:39:57 UTC (rev 245)
@@ -2,16 +2,16 @@
 
 Status wrt upstream: Applied
 
-Index: shadow-4.0.3/man/usermod.8
+Index: shadow-4.0.9/man/usermod.8
 ===================================================================
---- shadow-4.0.3.orig/man/usermod.8	2005-05-12 12:12:08.931053300 +0200
-+++ shadow-4.0.3/man/usermod.8	2005-05-12 12:12:18.807577620 +0200
-@@ -32,7 +32,7 @@ usermod \- Modify a user account
+--- shadow-4.0.9.orig/man/usermod.8	2005-06-12 00:29:03.586636339 +0200
++++ shadow-4.0.9/man/usermod.8	2005-06-12 00:29:17.362578035 +0200
+@@ -31,7 +31,7 @@ usermod \- Modify a user account
+ .SH SYNOPSIS
  .TP 8
- \fBusermod\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR [\fB-m\fR]]
+ \fBusermod\fR [\fB\-c\fR \fIcomment\fR] [\fB\-d\fR \fIhome_dir\fR [\fB\-m\fR]] [\fB\-e\fR \fIexpire_date\fR]
+-[\fB\-f\fR \fIinactive_time\fR] [\fB\-g\fR \fIinitial_group\fR]
++[\fB\-f\fR \fIinactive_days\fR] [\fB\-g\fR \fIinitial_group\fR]
  .br
--[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR]
-+[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_days\fR]
+ [\fB\-G\fR \fIgroup1\fR[\fI,group2,...,\fR[\fIgroupN\fR]\fR]]
  .br
- [\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR [,...]]
- .br

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-06-11 22:13:52 UTC (rev 244)
+++ branches/experimental/debian/patches/series	2005-06-11 22:39:57 UTC (rev 245)
@@ -4,8 +4,8 @@
 004_configure.in.dpatch
 005_manpages.dpatch
 336_chfn.1
-337_chpasswd.8
-338_lastlog.8
+# 337_chpasswd.8 # applied
+# 338_lastlog.8  # applied
 005_manpages-shadow.5
 335_usermod.8-better-document--f
 005_manpages-login.1