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

[Christian Perrier]

Author: bubulle
Date: 2005-06-09 18:27:44 +0000 (Thu, 09 Jun 2005)
New Revision: 211

Added:
   trunk/debian/patches/337_chpasswd.8
Modified:
   trunk/debian/patches/005_manpages.dpatch
   trunk/debian/patches/series
Log:
Still splitting the bug manpages patch : move the chpasswd.8 out to 3xx
series (already applied)


Modified: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch	2005-06-09 18:19:45 UTC (rev 210)
+++ trunk/debian/patches/005_manpages.dpatch	2005-06-09 18:27:44 UTC (rev 211)
@@ -23,43 +23,6 @@
 
 @DPATCH@
 
-Index: shadow-4.0.3/man/chpasswd.8
-===================================================================
---- shadow-4.0.3.orig/man/chpasswd.8	2005-05-12 12:12:08.887059874 +0200
-+++ shadow-4.0.3/man/chpasswd.8	2005-05-12 12:12:18.801578516 +0200
-@@ -1,5 +1,6 @@
- .\"$Id: chpasswd.8,v 1.10 2002/03/08 04:39:11 kloczek Exp $
- .\" Copyright 1991, Julianne Frances Haugh
-+.\" Copyright 2004, Christian Perrier
- .\" All rights reserved.
- .\"
- .\" Redistribution and use in source and binary forms, with or without
-@@ -29,12 +30,12 @@
- .SH NAME
- \fBchpasswd\fR - update password file in batch
- .SH SYNOPSIS
--\fBchpasswd\fR [\fB-e\fR]
-+\fBchpasswd\fR [\fB--encrypted\fR] [\fB--md5\fR]
- .SH DESCRIPTION
- \fBchpasswd\fR reads a file of user name and password pairs
- from standard input and uses this information
--to update a group of existing users. Without the -e switch, the
--passwords are expected to be cleartext. With the -e switch, the
-+to update a group of existing users. Without the --encrypted switch, the
-+passwords are expected to be cleartext. With the --encrypted switch, the
- passwords are expected to be in encrypted form.
- Each line is of the format
- .sp 1
-@@ -46,6 +47,9 @@ updated, if present.
- .PP
- This command is intended to be used in a large system environment where
- many accounts are created at a single time.
-+.PP
-+The --md5 switch allows using MD5 encryption instead of the default DES
-+encryption when the supplied passwords are not already in encrypted form.
- .SH CAVEATS
- .\" The \fBmkpasswd\fR command must be executed afterwards to update the
- .\" DBM password files.
 Index: shadow-4.0.3/man/lastlog.8
 ===================================================================
 --- shadow-4.0.3.orig/man/lastlog.8	2005-05-12 12:12:08.887059874 +0200

Added: trunk/debian/patches/337_chpasswd.8
===================================================================
--- trunk/debian/patches/337_chpasswd.8	2005-06-09 18:19:45 UTC (rev 210)
+++ trunk/debian/patches/337_chpasswd.8	2005-06-09 18:27:44 UTC (rev 211)
@@ -0,0 +1,41 @@
+Goal: Document the --encrypted and --md5 options
+
+Status wrt upstream: Applied (though slightly differently)
+
+Index: shadow-4.0.3/man/chpasswd.8
+===================================================================
+--- shadow-4.0.3.orig/man/chpasswd.8	2005-05-12 12:12:08.887059874 +0200
++++ shadow-4.0.3/man/chpasswd.8	2005-05-12 12:12:18.801578516 +0200
+@@ -1,5 +1,6 @@
+ .\"$Id: chpasswd.8,v 1.10 2002/03/08 04:39:11 kloczek Exp $
+ .\" Copyright 1991, Julianne Frances Haugh
++.\" Copyright 2004, Christian Perrier
+ .\" All rights reserved.
+ .\"
+ .\" Redistribution and use in source and binary forms, with or without
+@@ -29,12 +30,12 @@
+ .SH NAME
+ \fBchpasswd\fR - update password file in batch
+ .SH SYNOPSIS
+-\fBchpasswd\fR [\fB-e\fR]
++\fBchpasswd\fR [\fB--encrypted\fR] [\fB--md5\fR]
+ .SH DESCRIPTION
+ \fBchpasswd\fR reads a file of user name and password pairs
+ from standard input and uses this information
+-to update a group of existing users. Without the -e switch, the
+-passwords are expected to be cleartext. With the -e switch, the
++to update a group of existing users. Without the --encrypted switch, the
++passwords are expected to be cleartext. With the --encrypted switch, the
+ passwords are expected to be in encrypted form.
+ Each line is of the format
+ .sp 1
+@@ -46,6 +47,9 @@ updated, if present.
+ .PP
+ This command is intended to be used in a large system environment where
+ many accounts are created at a single time.
++.PP
++The --md5 switch allows using MD5 encryption instead of the default DES
++encryption when the supplied passwords are not already in encrypted form.
+ .SH CAVEATS
+ .\" The \fBmkpasswd\fR command must be executed afterwards to update the
+ .\" DBM password files.

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-09 18:19:45 UTC (rev 210)
+++ trunk/debian/patches/series	2005-06-09 18:27:44 UTC (rev 211)
@@ -4,6 +4,7 @@
 004_configure.in.dpatch
 005_manpages.dpatch
 336_chfn.1
+337_chpasswd.8
 005_manpages-shadow.5
 335_usermod.8-better-document--f
 006_libmisc.dpatch