[Pkg-shadow-commits] r273 - branches/experimental/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Sun, 19 Jun 2005 14:22:18 +0000
Author: nekral-guest
Date: 2005-06-19 14:22:17 +0000 (Sun, 19 Jun 2005)
New Revision: 273
Modified:
branches/experimental/debian/patches/340_passwd.1
branches/experimental/debian/patches/345_shadowconfig.8
branches/experimental/debian/patches/351_libmisc_failure_UTMPX
branches/experimental/debian/patches/series
Log:
Comments applied patches, and update some patches for 4.0.9.
Modified: branches/experimental/debian/patches/340_passwd.1
===================================================================
--- branches/experimental/debian/patches/340_passwd.1 2005-06-19 14:04:45 UTC (rev 272)
+++ branches/experimental/debian/patches/340_passwd.1 2005-06-19 14:22:17 UTC (rev 273)
@@ -1,77 +1,42 @@
Goal: Several rewrites for better English and clarity
-Status wrt upstream: Applied
+Status wrt upstream: Applied (for the next 4.0.10 release)
-Index: shadow-4.0.3/man/passwd.1
+However, the following minor points are missing upstream (2005-06-18):
+ * double spaces after periods.
+ * title of the passwd/shadow file (differ from their man pages)
+
===================================================================
---- shadow-4.0.3.orig/man/passwd.1 2005-05-12 12:12:08.888059724 +0200
-+++ shadow-4.0.3/man/passwd.1 2005-05-12 12:12:18.803578217 +0200
-@@ -45,9 +45,9 @@ The administrator of a group may change
- \fBpasswd\fR also changes account information, such as the full name
- of the user, user's login shell, or password expiry date and interval.
+--- shadow-4.0.9.orig/man/passwd.1 2005-05-12 12:12:08.888059724 +0200
++++ shadow-4.0.9/man/passwd.1 2005-05-12 12:12:18.803578217 +0200
+@@ -47,7 +47,7 @@
.PP
--The \fB-s\fR option makes passwd call chsh to change the user's shell. The
-+The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell. The
- \fB-f\fR option makes passwd call chfn to change the user's gecos
--information. These two options are only meant for compatiblity, since the
-+information. These two options are only meant for compatibility, since the
- other programs can be called directly.
+ The \fB\-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's
+ shell. The \fB\-f\fR option makes \fBpasswd\fR call \fBchfn\fR to change the user's
+-gecos information. These two options are only meant for compatiblity, since
++gecos information. These two options are only meant for compatibility, since
+ the other programs can be called directly.
.SS Password Changes
- The user is first prompted for his/her old password, if one is present.
-@@ -117,9 +117,9 @@
+ The user is first prompted for his/her old password, if one is present. This
+@@ -102,9 +102,9 @@
days, the user may no longer sign on to the account.
.PP
If you wish to immediately expire an account's password, you can use the
--\fB-e\fR option. This in effect can force a user to change his/her password at
--the user's next login. You can also use the \fB-d\fR option to delete a user's
+-\fB\-e\fR option. This in effect can force a user to change his/her password at
+-the user's next login. You can also use the \fB\-d\fR option to delete a user's
-password (make it empty). Use caution with this option since it can make an
-+\fB-e\fR option. This in effect can force a user to change his/her password at
-+the user's next login. You can also use the \fB-d\fR option to delete a user's
++\fB\-e\fR option. This in effect can force a user to change his/her password at
++the user's next login. You can also use the \fB\-d\fR option to delete a user's
+password (make it empty). Use caution with this option since it can make an
account not require a password at all to login, leaving your system open to
intruders.
.SS Account maintenance
-@@ -130,13 +130,19 @@ value which matches no possible encrypte
- The \fB-u\fR option re-enables an account by changing the password
- back to its previous value.
- .PP
--The account status may be given with the \fB-S\fR option.
--The status information consists of 6 parts.
--The first part indicates if the user account is locked (L), has no
-+The account status may be viewed with the \fB-S\fR option.
-+The status information consists of 7 fields.
-+The first field is the user's login name.
-+The second field indicates if the user account is locked (L), has no
- password (NP), or has a usable password (P).
--The second part gives the date of the last password change.
--The next four parts are the minimum age, maximum age, warning period,
-+The third field gives the date of the last password change.
-+The next four fields are the minimum age, maximum age, warning period,
- and inactivity period for the password.
-+These ages are expressed in days.
-+See
-+.B Password expiry information
-+above for a discussion
-+of these fields.
- .SS Hints for user passwords
- The security of a password depends upon the strength of the
- encryption algorithm and the size of the key space.
-@@ -187,11 +193,15 @@ feels comfortable with.
- Users may not be able to change their password on a system if NIS
- is enabled and they are not logged into the NIS server.
+@@ -173,7 +173,7 @@
.SH FILES
--/etc/passwd \- user account information
--.br
--/etc/shadow \- encrypted user passwords
-+.TP
-+.I /etc/passwd
-+User account information
-+.TP
-+.I /etc/shadow
-+Encrypted user passwords
- .SH "SEE ALSO"
- .BR group (5),
- .BR passwd (5)
-+.BR shadow (5)
- .SH AUTHOR
- Julianne Frances Haugh <jockgrrl@ix.netcom.com>
+ \fI/etc/passwd\fR \- user account information
+ .br
+-\fI/etc/shadow\fR \- secure user account information
++\fI/etc/shadow\fR \- encrypted user passwords
+ .SH EXIT VALUES
+ .TP 2
+ The \fBpasswd\fR command exits with the following values:
Modified: branches/experimental/debian/patches/345_shadowconfig.8
===================================================================
--- branches/experimental/debian/patches/345_shadowconfig.8 2005-06-19 14:04:45 UTC (rev 272)
+++ branches/experimental/debian/patches/345_shadowconfig.8 2005-06-19 14:22:17 UTC (rev 273)
@@ -1,18 +1,18 @@
Goal: Correct file name and additionnal information in shadowconfig.8
-Status wrt upstream: Applied
+Status wrt upstream: The following is not aplied (2005/06/18)
+ It is very Debian specific IMHO.
-Index: shadow-4.0.3/man/shadowconfig.8
+Index: shadow-4.0.9/man/shadowconfig.8
===================================================================
---- shadow-4.0.3.orig/man/shadowconfig.8 2005-05-12 12:12:08.909056587 +0200
-+++ shadow-4.0.3/man/shadowconfig.8 2005-05-12 12:12:18.805577919 +0200
-@@ -20,5 +20,8 @@ Turning shadow passwords on when they ar
- are already off, is harmless.
-
- Read
--.I /usr/share/doc/passwd/README.debian.gz
-+.I /usr/share/doc/passwd/README.Debian
- for a brief introduction to shadow passwords and related features.
-+
-+Note that turning shadow passwords off and on again will lose all password
-+aging information.
+--- shadow-4.0.9.orig/man/shadowconfig.8 2004-12-11 21:05:01.000000000 +0100
++++ shadow-4.0.9/man/shadowconfig.8 2005-06-19 01:58:08.000000000 +0200
+@@ -15,7 +15,7 @@
+ passwords on when they are already on, or off when they are already off, is
+ harmless.
+ .P
+-Read \fI/usr/share/doc/passwd/README.debian\fR for a brief introduction
++Read \fI/usr/share/doc/passwd/README.Debian\fR for a brief introduction
+ to shadow passwords and related features.
+ .P
+ Note that turning shadow passwords off and on again will lose all password
Modified: branches/experimental/debian/patches/351_libmisc_failure_UTMPX
===================================================================
--- branches/experimental/debian/patches/351_libmisc_failure_UTMPX 2005-06-19 14:04:45 UTC (rev 272)
+++ branches/experimental/debian/patches/351_libmisc_failure_UTMPX 2005-06-19 14:22:17 UTC (rev 273)
@@ -4,41 +4,29 @@
Upstream also noted that it affects login when compiled without PAM.
-Index: shadow-4.0.3/libmisc/failure.c
+Index: shadow-4.0.9/libmisc/failure.c
===================================================================
---- shadow-4.0.3.orig/libmisc/failure.c 2005-06-10 01:15:35.652729000 +0200
-+++ shadow-4.0.3/libmisc/failure.c 2005-06-10 01:16:28.902729000 +0200
-@@ -39,7 +39,11 @@
- #include "getdef.h"
- #include "failure.h"
-
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
-
- #define YEAR (365L*DAY)
-
-@@ -248,7 +252,13 @@
+--- shadow-4.0.9.orig/libmisc/failure.c 2005-06-19 02:13:00.000000000 +0200
++++ shadow-4.0.9/libmisc/failure.c 2005-06-19 02:14:00.000000000 +0200
+@@ -242,7 +242,13 @@
+ * maintains a record of all login failures.
*/
- void
--failtmp(const struct utmp *failent)
-+failtmp(
+-void failtmp (const struct utmp *failent)
++void failtmp (
+#ifdef HAVE_UTMPX_H
-+ const struct utmpx *failent
++ const struct utmpx *failent
+#else
-+ const struct utmp *failent
++ const struct utmp *failent
+#endif
+)
{
char *ftmp;
int fd;
-Index: shadow-4.0.3/libmisc/failure.h
+Index: shadow-4.0.9/libmisc/failure.h
===================================================================
---- shadow-4.0.3.orig/libmisc/failure.h 2005-06-10 01:15:35.652729000 +0200
-+++ shadow-4.0.3/libmisc/failure.h 2005-06-10 01:16:28.902729000 +0200
+--- shadow-4.0.9.orig/libmisc/failure.h 2005-06-19 02:13:00.000000000 +0200
++++ shadow-4.0.9/libmisc/failure.h 2005-06-19 02:14:00.000000000 +0200
@@ -4,7 +4,11 @@
#include "defines.h"
@@ -51,15 +39,14 @@
/*
* failure - make failure entry
-@@ -38,7 +42,11 @@
+@@ -38,6 +42,10 @@
* failtmp updates the (struct utmp) formatted failure log which
* maintains a record of all login failures.
*/
+#ifdef HAVE_UTMPX_H
-+extern void failtmp(const struct utmpx *);
++extern void failtmp (const struct utmpx *);
+#else
- extern void failtmp(const struct utmp *);
+ extern void failtmp (const struct utmp *);
+#endif
#endif
-
Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series 2005-06-19 14:04:45 UTC (rev 272)
+++ branches/experimental/debian/patches/series 2005-06-19 14:22:17 UTC (rev 273)
@@ -9,16 +9,16 @@
005_manpages-shadow.5
335_usermod.8-better-document--f
005_manpages-login.1
-339_newusers.8
+# 339_newusers.8 # applied
340_passwd.1
-341_passwd.5
-342_pw_auth.3
-343_pwck.8
-344_pwconv.8
+# 341_passwd.5 # applied
+# 342_pw_auth.3 # applied
+# 343_pwck.8 # applied
+# 344_pwconv.8 # applied
345_shadowconfig.8
-346_suauth.5
-352_userdel.8
-353_groupdel.8
+# 346_suauth.5 # applied
+# 352_userdel.8 # applied
+# 353_groupdel.8 # applied
351_libmisc_failure_UTMPX
006_libmisc_chowntty_ro_root_fs
008_su_addenv_HOME_and_SHELL