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

Christian Perrier pkg-shadow-devel@lists.alioth.debian.org
Thu, 09 Jun 2005 20:53:14 +0000


Author: bubulle
Date: 2005-06-09 20:53:13 +0000 (Thu, 09 Jun 2005)
New Revision: 214

Added:
   trunk/debian/patches/005_manpages-login.1
Modified:
   trunk/debian/patches/005_manpages.dpatch
   trunk/debian/patches/421_login.1_pishing
   trunk/debian/patches/series
Log:
Split out the patch for login.1 from the manpages patch
Correct the 421_login.1_phising patch which patched login.1 incorrectly


Added: trunk/debian/patches/005_manpages-login.1
===================================================================
--- trunk/debian/patches/005_manpages-login.1	2005-06-09 19:02:29 UTC (rev 213)
+++ trunk/debian/patches/005_manpages-login.1	2005-06-09 20:53:13 UTC (rev 214)
@@ -0,0 +1,46 @@
+Goal: Better explain the respective roles of login, init and getty with regards
+      to the utmp file
+      Give correct location of some files
+
+Status wrt upstream: Forwarded but not completely applied yet 
+		     (the files locations patches are already applied)
+
+Index: shadow-4.0.3/man/login.1
+===================================================================
+--- shadow-4.0.3.orig/man/login.1	2005-05-12 12:12:08.887059874 +0200
++++ shadow-4.0.3/man/login.1	2005-05-12 12:12:18.802578367 +0200
+@@ -95,9 +95,9 @@ executed.
+ Please see the appropriate manual section for more information on
+ this function.
+ .PP
+-A subsystem login is indicated by the presense of a "*" as the first
++A subsystem login is indicated by the presence 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.
++the root of a new file system which the user is actually logged into.
+ .SH OPTIONS
+ .TP
+ .B -p
+@@ -119,11 +119,20 @@ This version of \fBlogin\fR has many com
+ may be in use at any particular site.
+ .PP
+ The location of files is subject to differences in system configuration.
++.PP
++The \fBlogin\fR program is NOT responsible for removing users from the utmp file.
++It is the responsibility of
++.BR getty (8)
++and
++.BR init (8)
++to clean up apparent ownership of a terminal session.  If you use \fBlogin\fR
++from the shell prompt without \fBexec\fR, the user you use will
++continue to appear to be logged in even after you log out of the "subsession".
+ .SH FILES
+ .br
+-/etc/utmp \- list of current login sessions
++/var/run/utmp \- list of current login sessions
+ .br
+-/etc/wtmp \- list of previous login sessions
++/var/log/wtmp \- list of previous login sessions
+ .br
+ /etc/passwd \- user account information
+ .br

Modified: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch	2005-06-09 19:02:29 UTC (rev 213)
+++ trunk/debian/patches/005_manpages.dpatch	2005-06-09 20:53:13 UTC (rev 214)
@@ -23,58 +23,6 @@
 
 @DPATCH@
 
-Index: shadow-4.0.3/man/login.1
-===================================================================
---- shadow-4.0.3.orig/man/login.1	2005-05-12 12:12:08.887059874 +0200
-+++ shadow-4.0.3/man/login.1	2005-05-12 12:12:18.802578367 +0200
-@@ -95,9 +95,9 @@ executed.
- Please see the appropriate manual section for more information on
- this function.
- .PP
--A subsystem login is indicated by the presense of a "*" as the first
-+A subsystem login is indicated by the presence 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.
-+the root of a new file system which the user is actually logged into.
- .SH OPTIONS
- .TP
- .B -p
-@@ -119,11 +119,20 @@ This version of \fBlogin\fR has many com
- may be in use at any particular site.
- .PP
- The location of files is subject to differences in system configuration.
-+.PP
-+The \fBlogin\fR program is NOT responsible for removing users from the utmp file.
-+It is the responsibility of
-+.BR getty (8)
-+and
-+.BR init (8)
-+to clean up apparent ownership of a terminal session.  If you use \fBlogin\fR
-+from the shell prompt without \fBexec\fR, the user you use will
-+continue to appear to be logged in even after you log out of the "subsession".
- .SH FILES
- .br
--/etc/utmp \- list of current login sessions
-+/var/run/utmp \- list of current login sessions
- .br
--/etc/wtmp \- list of previous login sessions
-+/var/log/wtmp \- list of previous login sessions
- .br
- /etc/passwd \- user account information
- .br
-Index: shadow-4.0.3/man/newgrp.1
-===================================================================
---- shadow-4.0.3.orig/man/newgrp.1	2005-05-12 12:12:08.887059874 +0200
-+++ shadow-4.0.3/man/newgrp.1	2005-05-12 12:12:18.803578217 +0200
-@@ -48,7 +48,7 @@ group does, or if the user is not listed
- password. The user will be denied access if the group password is empty and
- the user is not listed as a member.
- .PP
--The \fBsg\fR command works similiar to \fBnewgrp\fR but accepts a command.
-+The \fBsg\fR command works similar to \fBnewgrp\fR but accepts a command.
- The command will be executed with the Bourne shell.  With most shells you
- may run \fBsg\fR from, you need to enclose multi-word commands in quotes.
- Another difference between \fBnewgrp\fR and \fBsg\fR is that some shells
 Index: shadow-4.0.3/man/newusers.8
 ===================================================================
 --- shadow-4.0.3.orig/man/newusers.8	2005-05-12 12:12:08.887059874 +0200

Modified: trunk/debian/patches/421_login.1_pishing
===================================================================
--- trunk/debian/patches/421_login.1_pishing	2005-06-09 19:02:29 UTC (rev 213)
+++ trunk/debian/patches/421_login.1_pishing	2005-06-09 20:53:13 UTC (rev 214)
@@ -1,22 +1,22 @@
 Goal: document how to initiate a trusted path on linux.
 Fixes: #305600 by documenting that the answer is in the kernel.
 
-Status wrt upstream: unknown
+Status wrt upstream: Not applied
 
 Index: shadow-4.0.3/man/login.1
 ===================================================================
---- shadow-4.0.3.orig/man/login.1	2005-05-13 22:37:38.939127155 +0200
-+++ shadow-4.0.3/man/login.1	2005-05-13 22:47:54.019226226 +0200
-@@ -122,6 +122,12 @@ The location of files is subject to diff
- .PP
- The \fBlogin\fR program is NOT responsible for removing users from the utmp file.
- It is the responsibility of
+--- shadow-4.0.3.orig/man/login.1	2005-06-09 19:36:10.000000000 +0200
++++ shadow-4.0.3/man/login.1	2005-06-09 22:51:42.000000000 +0200
+@@ -128,6 +128,12 @@
+ to clean up apparent ownership of a terminal session.  If you use \fBlogin\fR
+ from the shell prompt without \fBexec\fR, the user you use will
+ continue to appear to be logged in even after you log out of the "subsession".
 +.PP
 +As any program, \fBlogin\fR appearance could be faked. If non-trusted users have a
 +physical access to the machine, an attacker could use this to obtain the
 +password of the next person sitting in front of the machine. Under Linux,
 +the SAK mecanism can be used by users to initiate of a trusted path and
 +prevent this kind of attack. 
- .BR getty (8)
- and
- .BR init (8)
+ .SH FILES
+ .br
+ /var/run/utmp \- list of current login sessions

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-09 19:02:29 UTC (rev 213)
+++ trunk/debian/patches/series	2005-06-09 20:53:13 UTC (rev 214)
@@ -8,6 +8,7 @@
 338_lastlog.8
 005_manpages-shadow.5
 335_usermod.8-better-document--f
+005_manpages-login.1
 006_libmisc.dpatch
 008_su_addenv_HOME_and_SHELL
 008_su_uid_0_not_root