[Pkg-shadow-commits] r217 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-06-09 21:08:42 +0000 (Thu, 09 Jun 2005)
New Revision: 217

Added:
   trunk/debian/patches/341_passwd.5
Modified:
   trunk/debian/patches/005_manpages.dpatch
   trunk/debian/patches/series
Log:
Split out the shadow.5 patch from 005_manpages


Modified: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch	2005-06-09 21:02:06 UTC (rev 216)
+++ trunk/debian/patches/005_manpages.dpatch	2005-06-09 21:08:42 UTC (rev 217)
@@ -23,49 +23,6 @@
 
 @DPATCH@
 
-Index: shadow-4.0.3/man/passwd.5
-===================================================================
---- shadow-4.0.3.orig/man/passwd.5	2005-05-12 12:12:08.908056736 +0200
-+++ shadow-4.0.3/man/passwd.5	2005-05-12 12:12:18.804578068 +0200
-@@ -51,24 +51,24 @@ The password field may not be filled if 
- have been enabled.
- If shadow passwords are being used, the encrypted password will
- be found in \fI/etc/shadow\fR.
--The encryped password consists of 13 characters from the
-+The encrypted password consists of 13 characters from the
- 64 character alphabet
- a thru z, A thru Z, 0 thru 9, \. and /.
- Refer to \fBcrypt\fR(3) for details on how this string is
- interpreted.
--.PP
--An optional password age string may follow the encrypted
--password, separated by a comma, from the same alphabet
--as the password itself.
--The first character gives the number of weeks during which the
--password is valid.
--The second character gives the number of weeks which must pass
--before the user is permitted to change the password.
--The last two characters give the week since Jan 1970 when the
--password was last changed.
--When the number of weeks during which the password is valid
--have passed, the user will be required to provide a new
--password.
-+.\" .PP
-+.\" An optional password age string may follow the encrypted
-+.\" password, separated by a comma, from the same alphabet
-+.\" as the password itself.
-+.\" The first character gives the number of weeks during which the
-+.\" password is valid.
-+.\" The second character gives the number of weeks which must pass
-+.\" before the user is permitted to change the password.
-+.\" The last two characters give the week since Jan 1970 when the
-+.\" password was last changed.
-+.\" When the number of weeks during which the password is valid
-+.\" have passed, the user will be required to provide a new
-+.\" password.
- .PP
- The comment field is used by various system utilities, such as
- \fBfinger\fR(1).
 Index: shadow-4.0.3/man/pw_auth.3
 ===================================================================
 --- shadow-4.0.3.orig/man/pw_auth.3	2005-05-12 12:12:08.908056736 +0200

Added: trunk/debian/patches/341_passwd.5
===================================================================
--- trunk/debian/patches/341_passwd.5	2005-06-09 21:02:06 UTC (rev 216)
+++ trunk/debian/patches/341_passwd.5	2005-06-09 21:08:42 UTC (rev 217)
@@ -0,0 +1,47 @@
+Goal: Minor changes and one full part commented out (now irrelevant)
+
+Status wrt upstream: Applied (the commented part is removed now)
+
+Index: shadow-4.0.3/man/passwd.5
+===================================================================
+--- shadow-4.0.3.orig/man/passwd.5	2005-05-12 12:12:08.908056736 +0200
++++ shadow-4.0.3/man/passwd.5	2005-05-12 12:12:18.804578068 +0200
+@@ -51,24 +51,24 @@ The password field may not be filled if 
+ have been enabled.
+ If shadow passwords are being used, the encrypted password will
+ be found in \fI/etc/shadow\fR.
+-The encryped password consists of 13 characters from the
++The encrypted password consists of characters from the
+ 64 character alphabet
+ a thru z, A thru Z, 0 thru 9, \. and /.
+ Refer to \fBcrypt\fR(3) for details on how this string is
+ interpreted.
+-.PP
+-An optional password age string may follow the encrypted
+-password, separated by a comma, from the same alphabet
+-as the password itself.
+-The first character gives the number of weeks during which the
+-password is valid.
+-The second character gives the number of weeks which must pass
+-before the user is permitted to change the password.
+-The last two characters give the week since Jan 1970 when the
+-password was last changed.
+-When the number of weeks during which the password is valid
+-have passed, the user will be required to provide a new
+-password.
++.\" .PP
++.\" An optional password age string may follow the encrypted
++.\" password, separated by a comma, from the same alphabet
++.\" as the password itself.
++.\" The first character gives the number of weeks during which the
++.\" password is valid.
++.\" The second character gives the number of weeks which must pass
++.\" before the user is permitted to change the password.
++.\" The last two characters give the week since Jan 1970 when the
++.\" password was last changed.
++.\" When the number of weeks during which the password is valid
++.\" have passed, the user will be required to provide a new
++.\" password.
+ .PP
+ The comment field is used by various system utilities, such as
+ \fBfinger\fR(1).

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-09 21:02:06 UTC (rev 216)
+++ trunk/debian/patches/series	2005-06-09 21:08:42 UTC (rev 217)
@@ -11,6 +11,7 @@
 005_manpages-login.1
 339_newusers.8
 340_passwd.1
+341_passwd.5
 006_libmisc.dpatch
 008_su_addenv_HOME_and_SHELL
 008_su_uid_0_not_root