[Pkg-shadow-commits] r1197 - in trunk/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sun Jun 17 07:34:33 UTC 2007
Author: bubulle
Date: 2007-06-17 07:34:33 +0000 (Sun, 17 Jun 2007)
New Revision: 1197
Added:
trunk/debian/patches/302_su_man_mention_sg
trunk/debian/patches/303_wording_fixes_in_su_man
trunk/debian/patches/410_newgrp_man_mention_sg
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
Various changes related to #396690
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-05-17 17:59:41 UTC (rev 1196)
+++ trunk/debian/changelog 2007-06-17 07:34:33 UTC (rev 1197)
@@ -1,8 +1,13 @@
shadow (1:4.0.18.1-10) UNRELEASED; urgency=low
* The "Trappe d'Échourgnac" release
+ * Upstream bugs fixed in upstream's CVS:
+ - 302_su_man_mention_sg: mention sg(1) in su man page. Closes: #/396690
+ - 303_wording_fixes_in_su_man: minor wording fixes in su(1)
+ * Upstream bugs not fixed in upstream's CVS:
+ - 410_newgrp_man_mention_sg: mention sg(1) in newgrp man page
- -- Christian Perrier <bubulle at debian.org> Thu, 17 May 2007 19:59:06 +0200
+ -- Christian Perrier <bubulle at debian.org> Sun, 17 Jun 2007 07:38:14 +0200
shadow (1:4.0.18.1-9) unstable; urgency=low
Added: trunk/debian/patches/302_su_man_mention_sg
===================================================================
--- trunk/debian/patches/302_su_man_mention_sg (rev 0)
+++ trunk/debian/patches/302_su_man_mention_sg 2007-06-17 07:34:33 UTC (rev 1197)
@@ -0,0 +1,22 @@
+Goal: Mention sg(1) in su(1)
+
+Fixes: #396690
+
+Note:
+
+Status wrt upstream: Applied in CVS
+
+Index: shadow-4.0.18.1/man/su.1.xml
+===================================================================
+--- shadow-4.0.18.1.orig/man/su.1.xml 2007-06-17 07:30:14.492480422 +0200
++++ shadow-4.0.18.1/man/su.1.xml 2007-06-17 07:31:15.989379347 +0200
+@@ -199,6 +199,9 @@
+ <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
++ <refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum>
++ </citerefentry>,
++ <citerefentry>
+ <refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
Added: trunk/debian/patches/303_wording_fixes_in_su_man
===================================================================
--- trunk/debian/patches/303_wording_fixes_in_su_man (rev 0)
+++ trunk/debian/patches/303_wording_fixes_in_su_man 2007-06-17 07:34:33 UTC (rev 1197)
@@ -0,0 +1,88 @@
+Goal: Fix some wording in su(1)
+
+Fixes:
+
+Note:
+
+Status wrt upstream: Applied in CVS
+
+Index: shadow-4.0.18.1/man/su.1.xml
+===================================================================
+--- shadow-4.0.18.1.orig/man/su.1.xml 2007-06-17 07:30:14.492480422 +0200
++++ shadow-4.0.18.1/man/su.1.xml 2007-06-17 07:31:15.989379347 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <refentry id='su.1'>
+- <!-- $Id: su.1.xml,v 1.26 2006/07/18 17:02:01 kloczek Exp $ -->
++ <!-- $Id: su.1.xml,v 1.30 2006/11/12 19:20:34 kloczek Exp $ -->
+ <refmeta>
+ <refentrytitle>su</refentrytitle>
+ <manvolnum>1</manvolnum>
+@@ -8,7 +8,7 @@
+ </refmeta>
+ <refnamediv id='name'>
+ <refname>su</refname>
+- <refpurpose>change user ID or become super-user</refpurpose>
++ <refpurpose>change user ID or become superuser</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv id='synopsis'>
+ <cmdsynopsis>
+@@ -27,10 +27,10 @@
+ <refsect1 id='description'>
+ <title>DESCRIPTION</title>
+ <para>
+- <command>su</command> is used to become another user during a login
+- session. Invoked without a <option>username</option>,
++ The <command>su</command> command is used to become another user during
++ a login session. Invoked without a <option>username</option>,
+ <command>su</command> defaults to
+- becoming the super user. The optional argument <option>-</option> may
++ becoming the superuser. The optional argument <option>-</option> may
+ be used to provide an environment similar to what the user would
+ expect had the user logged in directly.
+ </para>
+@@ -58,7 +58,7 @@
+ The current environment is passed to the new shell. The value of
+ <envar>$PATH</envar> is reset to <filename>/bin:/usr/bin</filename>
+ for normal users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename>
+- for the super user. This may be changed with the
++ for the superuser. This may be changed with the
+ <emphasis>ENV_PATH</emphasis> and <emphasis>ENV_SUPATH</emphasis>
+ definitions in <filename>/etc/login.defs</filename>.
+ </para>
+@@ -78,7 +78,7 @@
+ <varlistentry>
+ <term>
+ <option>-c</option>, <option>--command</option>
+- <replaceable>SHELL</replaceable>
++ <replaceable>COMMAND</replaceable>
+ </term>
+ <listitem>
+ <para>
+@@ -112,10 +112,10 @@
+ <listitem>
+ <para>The shell that will be invoked.</para>
+ <para>
+- The invoked shell is choosen among (higest priority first):
++ The invoked shell is chosen from (highest priority first):
+ <itemizedlist>
+ <listitem>
+- <para>The shell specified with --shell</para>
++ <para>The shell specified with --shell.</para>
+ </listitem>
+ <listitem>
+ <para>
+@@ -141,10 +141,10 @@
+ <para>
+ If the target user has a restricted shell (i.e. the shell field of
+ this user's entry in <filename>/etc/passwd</filename> is not
+- specified in <filename>/etc/shell</filename>), then the
++ listed in <filename>/etc/shell</filename>), then the
+ <option>--shell</option> option or the <envar>$SHELL</envar>
+- environment variable won't be taken into account unless
+- <command>su</command> is called by the root.
++ environment variable won't be taken into account, unless
++ <command>su</command> is called by root.
+ </para>
+ </listitem>
+ </varlistentry>
Added: trunk/debian/patches/410_newgrp_man_mention_sg
===================================================================
--- trunk/debian/patches/410_newgrp_man_mention_sg (rev 0)
+++ trunk/debian/patches/410_newgrp_man_mention_sg 2007-06-17 07:34:33 UTC (rev 1197)
@@ -0,0 +1,23 @@
+Goal: Mention sg(1) in newgrp(1)
+
+Fixes: #396690
+
+Note:
+
+Status wrt upstream: not applied yet. Tomasz applied the same for
+ su(1) but not for newgrp(1)
+
+Index: shadow-4.0.18.1/man/newgrp.1.xml
+===================================================================
+--- shadow-4.0.18.1.orig/man/newgrp.1.xml 2007-06-17 07:37:04.471806587 +0200
++++ shadow-4.0.18.1/man/newgrp.1.xml 2007-06-17 07:37:32.970369504 +0200
+@@ -93,6 +93,9 @@
+ <refentrytitle>su</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
++ <refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum>
++ </citerefentry>,
++ <citerefentry>
+ <refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2007-05-17 17:59:41 UTC (rev 1196)
+++ trunk/debian/patches/series 2007-06-17 07:34:33 UTC (rev 1197)
@@ -54,3 +54,6 @@
407_adduser_disable_PUG_with-n
408_passwd_check_arguments
409_man_generate_from_PO
+302_su_man_mention_sg
+410_newgrp_man_mention_sg
+303_wording_fixes_in_su_man
More information about the Pkg-shadow-commits
mailing list