[Pkg-shadow-commits] r353 - branches/experimental/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Thu, 07 Jul 2005 00:09:04 +0000
Author: nekral-guest
Date: 2005-07-07 00:09:03 +0000 (Thu, 07 Jul 2005)
New Revision: 353
Modified:
branches/experimental/debian/patches/005_manpages.dpatch
Log:
Update 005_manpages.dpatch to 4.0.10 (XML man pages)
Modified: branches/experimental/debian/patches/005_manpages.dpatch
===================================================================
--- branches/experimental/debian/patches/005_manpages.dpatch 2005-07-07 00:00:46 UTC (rev 352)
+++ branches/experimental/debian/patches/005_manpages.dpatch 2005-07-07 00:09:03 UTC (rev 353)
@@ -1,83 +1,53 @@
-#! /bin/sh -e
-## 005_manpages.dpatch by <unknown>
-##
-## All lines beginning with `## DP:' are a description of the patch.
+Note: * the man pages were not generated from the XML (there will be a new
+ build dependency).
+ * the XML pages were not verified.
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
-Index: shadow-4.0.9/man/su.1
+Index: shadow-4.0.10/man/su.1
===================================================================
---- shadow-4.0.9.orig/man/su.1 2005-06-11 23:44:45.356810288 +0200
-+++ shadow-4.0.9/man/su.1 2005-06-11 23:44:47.134544672 +0200
-@@ -27,45 +27,86 @@
- .\" SUCH DAMAGE.
- .TH SU 1
- .SH NAME
--su \- change user ID or become super\-user
-+su \- Change user ID or become super\-user
- .SH SYNOPSIS
--\fBsu\fR [\fB\-\fR] [\fIusername\fR [\fIargs\fR]]
-+\fBsu\fR [\fBOPTS\fR] [\fB\-\fR] [\fIusername\fR [\fIargs\fR]]
- .SH DESCRIPTION
- \fBsu\fR is used to become another user during a login session. Invoked
- without a username, \fBsu\fR defaults to becoming the super user. The
- optional argument \fB\-\fR may be used to provide an environment similar to
- what the user would expect had the user logged in directly.
+--- shadow-4.0.10.orig/man/su.1 2005-06-16 18:09:24.000000000 +0200
++++ shadow-4.0.10/man/su.1 2005-07-04 17:49:20.000000000 +0200
+@@ -24,7 +24,7 @@
+ .ad l
+ .hy 0
+ .HP 3
+-\fBsu\fR [\-] [\fIusername\fR\ [\fIargs\fR]]
++\fBsu\fR [\fBOPTS\fR] [\-] [\fIusername\fR\ [\fIargs\fR]]
+ .ad
+ .hy
+
+@@ -34,17 +34,58 @@
+ \fBsu\fR is used to become another user during a login session\&. Invoked without a username, \fBsu\fR defaults to becoming the super user\&. The optional argument \fB\-\fR may be used to provide an environment similar to what the user would expect had the user logged in directly\&.
+
.PP
--Additional arguments may be provided after the username, in which case they
--are supplied to the user\'s login shell. In particular, an argument of
--\fB\-c\fR will cause the next argument to be treated as a command by most
--command interpreters. The command will be executed by the shell specified in
--\fI/etc/passwd\fR for the target user.
+-Additional arguments may be provided after the username, in which case they are supplied to the userīs login shell\&. In particular, an argument of \fB\-c\fR will cause the next argument to be treated as a command by most command interpreters\&. The command will be executed by the shell specified in \fI/etc/passwd\fR for the target user\&.
+-
-.PP
- The user will be prompted for a password, if appropriate. Invalid passwords
- will produce an error message. All attempts, both valid and invalid, are
- logged to detect abuses of the system.
+ The user will be prompted for a password, if appropriate\&. Invalid passwords will produce an error message\&. All attempts, both valid and invalid, are logged to detect abuses of the system\&.
+
.PP
--The current environment is passed to the new shell. The value of \fB$PATH\fR
--\is reset to \fB/bin:/usr/bin\fR for normal users, or
--\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be changed
--with the \fBENV_PATH\fR and \fBENV_SUPATH\fR definitions in
+-The current environment is passed to the new shell\&. The value of \fI$PATH\fR is reset to \fI/bin:/usr/bin\fR for normal users, or \fI/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user\&. This may be changed with the \fIENV_PATH\fR and \fIENV_SUPATH\fR definitions in \fI/etc/login\&.defs\fR\&.
+An optional command can be executed. This is done by the shell specified
+in \fI/etc/passwd\fR for the target user unless the \fB-s\fR or \fB-m\fR
+options are used. Any arguments supplied after the \fBusername\fR will be
-+passed to the invoked shell (shell must support the -c command line
++passed to the invoked shell (shell must support the \-c command line
+option in order for a command to be passed to it).
+.PP
-+Unless the \fB-m\fR or \fB-p\fR options are used, the current environment is
++Unless the \fB\-m\fR or \fB\-p\fR options are used, the current environment is
+passed to the new shell with alterations. The value of \fB$PATH\fR is
+reset to \fB/bin:/usr/bin\fR for normal users, or
+\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be
+changed with the \fBENV_PATH\fR and \fBENV_SUPATH\fR definitions in
- \fI/etc/login.defs\fR.
++\fI/etc/login.defs\fR.
+\fB$IFS\fP, if is set, is reset to contain space, tab, and newline.
+\fB$USER\fP is set to the name of the target user,
+\fB$HOME\fP is set to the home directory of the target user, and
+\fB$SHELL\fP is set to the shell of the target user.
-+When using the \fB-m\fR or \fB-p\fR options, the
++When using the \fB\-m\fR or \fB\-p\fR options, the
+user's environment is not changed.
+
.PP
- A subsystem login is indicated by the presense 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.
+ A subsystem login is indicated by the presense 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\&.
+
+.SH OPTIONS
+.TP
+\fB-\fR
@@ -104,38 +74,222 @@
+.PP
+Much of the behavior of this command can be altered via its pam
+configuration \- see
-+.BR pam (7)
- .SH CAVEATS
-+.PP
- This version of \fBsu\fR has many compilation options, only some of which
- may be in use at any particular site.
- .SH FILES
- \fI/etc/passwd\fR \- user account information
- .br
- \fI/etc/shadow\fR \- secure user account information
-+.br
-+\fI/etc/shells\fR \- valid user shells
-+.br
-+\fI$HOME/.profile\fR \- initialization script for default shell
- .SH SEE ALSO
- .BR login (1),
- .BR sh (1),
- .BR login.defs (5),
- .BR suauth (5)
-+.BR shells (5),
-+.BR pam (7)
- .SH AUTHOR
--Julianne Frances Haugh <jockgrrl@ix.netcom.com>
++.BR pam (7).
+ .SH "CAVEATS"
+
+ .PP
+@@ -58,13 +99,20 @@
+ .TP
+ \fI/etc/shadow\fR
+ secure user account information
++.TP
++\fI/etc/shells\fR
++valid user shells
++.TP
++\fI$HOME/.profile\fR
++initialization script for default shell
+ .SH "SEE ALSO"
+
+ .PP
+-\fBlogin\fR(1), \fBsh\fR(1), \fBlogin\&.defs\fR(5), \fBsuauth\fR(5)
++\fBlogin\fR(1), \fBsh\fR(1), \fBlogin\&.defs\fR(5), \fBsuauth\fR(5),
++\fBshells\fR(5), \fBpam\fR(7)
+
+ .SH "AUTHOR"
+
+ .PP
+-Julianne Frances Haugh <jockgrrl@ix\&.netcom\&.com>
+Julianne Frances Haugh (jfh@austin.ibm.com)
-Index: shadow-4.0.9/man/useradd.8
+
+Index: shadow-4.0.10/man/su.1.xml
===================================================================
---- shadow-4.0.9.orig/man/useradd.8 2005-06-11 23:44:45.356810288 +0200
-+++ shadow-4.0.9/man/useradd.8 2005-06-11 23:44:47.134544672 +0200
-@@ -89,6 +89,7 @@ will be used instead. Any directories co
- \fI/etc/skel\fR will be created in the user's home directory as well. The
- \fB\-k\fR option is only valid in conjunction with the \fB\-m\fR option. The
- default is to not create the directory and to not copy any files.
+--- shadow-4.0.10.orig/man/su.1.xml 2005-06-15 14:39:27.000000000 +0200
++++ shadow-4.0.10/man/su.1.xml 2005-07-04 17:51:43.000000000 +0200
+@@ -15,6 +15,7 @@
+ <refsynopsisdiv id='synopsis'>
+ <cmdsynopsis>
+ <command>su</command>
++ <arg choice='opt'>OPTS </arg>
+ <arg choice='opt'>- </arg>
+ <arg choice='opt'>
+ <arg choice='plain'>
+@@ -36,26 +37,39 @@
+ expect had the user logged in directly.
+ </para>
+
+- <para>Additional arguments may be provided after the username, in which
+- case they are supplied to the user´s login shell. In particular,
+- an argument of <option>-c</option> will cause the next argument to be
+- treated as a command by most command interpreters. The command will be
+- executed by the shell specified in <filename>/etc/passwd</filename>
+- for the target user.
+- </para>
+-
+ <para>The user will be prompted for a password, if appropriate. Invalid
+ passwords will produce an error message. All attempts, both valid and
+ invalid, are logged to detect abuses of the system.
+ </para>
+
+- <para>The current environment is passed to the new shell. The value of
+- <emphasis remap='B'>$PATH</emphasis> is reset to
++ <para>An optional command can be executed. This is done by the shell
++ specified in <filename>/etc/passwd</filename> for the target user
++ unless the <option>-s</option> or <option>-m</option>
++ options are used. Any arguments supplied after the <emphasis remap='I'>
++ username</emphasis> will be passed to the invoked shell (shell must
++ support the <option>-c</option> command line option in order for a
++ command to be passed to it).
++ </para>
++
++ <para>
++ Unless the <option>-m</option> or <option>-p</option> options are used,
++ the current environment is passed to the new shell with alterations.
++ The value of <emphasis remap='B'>$PATH</emphasis> is reset to
+ <filename>/bin:/usr/bin</filename> for normal users, or
+- <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
++ <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
+ This may be changed with the <emphasis remap='B'>ENV_PATH</emphasis>
+ and <emphasis remap='B'>ENV_SUPATH</emphasis> definitions in
+ <filename>/etc/login.defs</filename>.
++ <emphasis remap='B'>$IFS</emphasis>, if is set, is reset to contain
++ space, tab, and newline.
++ <emphasis remap='B'>$USER</emphasis> is set to the name of the target
++ user,
++ <emphasis remap='B'>$HOME</emphasis> is set to the home directory of
++ the target user, and
++ <emphasis remap='B'>$SHELL</emphasis> is set to the shell of the target
++ user.
++ When using the <option>-m</option> or <option>-p</option> options,
++ the user's environment is not changed.
+ </para>
+
+ <para>A subsystem login is indicated by the presense of a "*" as the
+@@ -65,6 +79,70 @@
+ </para>
+ </refsect1>
+
++ <refsect1 id='options'>
++ <title>OPTIONS</title>
++ <variablelist remap='IP'>
++ <varlistentry>
++ <term>
++ <option>-</option>
++ </term>
++ <listitem>
++ <para>make this a login shell</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <option>-c</option>, <option>--command</option>=
++ <replaceable>command</replaceable>
++ </term>
++ <listitem>
++ <para>pass <emphasis remap='I'>command</emphasis> to the invoked
++ shell using its <option>-c</option> option</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <option>-m</option>, <option>-p</option>,
++ <option>--preserve-environment</option>
++ </term>
++ <listitem>
++ <para>do not reset environment variables, and keep the same shell
++ </para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <option>-s</option>, <option>--shell</option>=
++ <replaceable>shell</replaceable>
++ </term>
++ <listitem>
++ <para>use <emphasis remap='I'>shell</emphasis> instead of the
++ default in <filename>/etc/passwd</filename>
++ </para>
++ </listitem>
++ </varlistentry>
++ </refsect1>
++
++ <refsect1 id='notes'>
++ <title>NOTES</title>
++ <para>The <option>-m</option>, <option>-p</option> and <option>-s</option>
++ options are restricted by the target user's shell being listed in
++ <filename>/etc/shells</filename>. If it's not listed, then it's assumed
++ to be a restricted account, a normal su is performed, and those options
++ are ignored silently.
++ </para>
++
++ <para>A subsystem login is indicated by the presense 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.
++ </para>
++
++ <para>Much of the behavior of this command can be altered via its pam
++ configuration - see <citerefentry><refentrytitle>pam</refentrytitle>
++ <manvolnum>7</manvolnum></citerefentry>.
++ </para>
++ </refsect1>
++
+ <refsect1 id='caveats'>
+ <title>CAVEATS</title>
+ <para>
+@@ -84,6 +162,14 @@
+ <term><filename>/etc/shadow</filename></term>
+ <listitem>secure user account information</listitem>
+ </varlistentry>
++ <varlistentry>
++ <term><filename>/etc/shells</filename></term>
++ <listitem>valid user shells</listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><filename>$HOME/.profile</filename></term>
++ <listitem>initialization script for default shell</listitem>
++ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+@@ -101,11 +187,17 @@
+ <citerefentry>
+ <refentrytitle>suauth</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>
++ <citerefentry>
++ <refentrytitle>shells</refentrytitle><manvolnum>5</manvolnum>
++ </citerefentry>
++ <citerefentry>
++ <refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum>
++ </citerefentry>
+ </para>
+ </refsect1>
+
+ <refsect1 id='author'>
+ <title>AUTHOR</title>
+- <para>Julianne Frances Haugh <jockgrrl@ix.netcom.com></para>
++ <para>Julianne Frances Haugh (jfh@austin.ibm.com)</para>
+ </refsect1>
+ </refentry>
+Index: shadow-4.0.10/man/useradd.8
+===================================================================
+--- shadow-4.0.10.orig/man/useradd.8 2005-06-16 21:02:28.000000000 +0200
++++ shadow-4.0.10/man/useradd.8 2005-07-04 17:02:14.000000000 +0200
+@@ -79,6 +79,7 @@
+ .TP
+ \fB\-m\fR
+ The user's home directory will be created if it does not exist\&. The files contained in \fIskeleton_dir\fR will be copied to the home directory if the \fB\-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR will be used instead\&. Any directories contained in \fI skeleton_dir\fR or \fI/etc/skel\fR will be created in the user's home directory as well\&. The \fB\-k\fR option is only valid in conjunction with the \fB\-m\fR option\&. The default is to not create the directory and to not copy any files\&.
+This option may not function correctly if the username has a / in it.
- .IP "\fB\-o\fR"
- Allow create user with duplicate (non\-unique) UID.
- .IP "\fB\-p\fR \fIpasswd\fR"
+
+ .TP
+ \fB\-o\fR
+Index: shadow-4.0.10/man/useradd.8.xml
+===================================================================
+--- shadow-4.0.10.orig/man/useradd.8.xml 2005-06-16 20:58:43.000000000 +0200
++++ shadow-4.0.10/man/useradd.8.xml 2005-07-04 17:02:30.000000000 +0200
+@@ -181,6 +181,7 @@
+ <option>-k</option> option is only valid in conjunction with the
+ <option>-m</option> option. The default is to not create the
+ directory and to not copy any files.
++ This option may not function correctly if the username has a / in it.
+ </para>
+ </listitem>
+ </varlistentry>