[Pkg-shadow-commits] sid/debian/patches 313_pam_access_with_preauth.dpatch,1.1,1.2 323_passwd.1-typo.dpatch,1.1,1.2

[Christian Perrier]

Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv22336

Modified Files:
	313_pam_access_with_preauth.dpatch 323_passwd.1-typo.dpatch 
Log Message:
Update patch 323 so that it applies cleanly
Changes to 313 are not significant (user error)


Index: 313_pam_access_with_preauth.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/313_pam_access_with_preauth.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 313_pam_access_with_preauth.dpatch	12 Apr 2005 20:16:14 -0000	1.1
+++ 313_pam_access_with_preauth.dpatch	8 May 2005 11:04:09 -0000	1.2
@@ -24,10 +24,10 @@
 exit 0
 
 @DPATCH@
-
---- shadow-4.0.3/src/login.c.orig	2004-08-04 11:03:14.967848591 +0200
-+++ shadow-4.0.3/src/login.c	2004-08-04 11:04:43.950147350 +0200
-@@ -895,6 +895,11 @@
+diff -urNad shadow-4.0.3/src/login.c /tmp/dpep.nSdEUO/shadow-4.0.3/src/login.c
+--- shadow-4.0.3/src/login.c	2005-05-08 12:59:10.000000000 +0200
++++ /tmp/dpep.nSdEUO/shadow-4.0.3/src/login.c	2005-05-08 12:59:14.000000000 +0200
+@@ -887,6 +887,11 @@
  		setpwent ();
  		pwd = getpwnam (pam_user);
  

Index: 323_passwd.1-typo.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/323_passwd.1-typo.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 323_passwd.1-typo.dpatch	8 May 2005 07:08:36 -0000	1.1
+++ 323_passwd.1-typo.dpatch	8 May 2005 11:04:09 -0000	1.2
@@ -5,15 +5,36 @@
 ## DP: Correct typo in passwd.1. Closes: #302740
 
 @DPATCH@
-diff -urNad shadow-4.0.3/man/passwd.1 /tmp/dpep.Ma0LvF/shadow-4.0.3/man/passwd.1
---- shadow-4.0.3/man/passwd.1	2002-03-13 18:52:15.000000000 +0100
-+++ /tmp/dpep.Ma0LvF/shadow-4.0.3/man/passwd.1	2005-05-08 09:01:28.000000000 +0200
+diff -urNad shadow-4.0.3/man/passwd.1 /tmp/dpep.q7OddP/shadow-4.0.3/man/passwd.1
+--- shadow-4.0.3/man/passwd.1	2005-05-08 13:01:56.000000000 +0200
++++ /tmp/dpep.q7OddP/shadow-4.0.3/man/passwd.1	2005-05-08 13:02:23.000000000 +0200
 @@ -47,7 +47,7 @@
  .PP
- The \fB-s\fR option makes passwd call chsh 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
+ 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 the
++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.
+diff -urNad shadow-4.0.3/man/passwd.1.rej /tmp/dpep.q7OddP/shadow-4.0.3/man/passwd.1.rej
+--- shadow-4.0.3/man/passwd.1.rej	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.q7OddP/shadow-4.0.3/man/passwd.1.rej	2005-05-08 13:01:57.000000000 +0200
+@@ -0,0 +1,17 @@
++***************
++*** 47,53 ****
++  .PP
++  The \fB-s\fR option makes passwd call chsh 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
++  other programs can be called directly.
++  .SS Password Changes
++  The user is first prompted for his/her old password, if one is present.
++--- 47,53 ----
++  .PP
++  The \fB-s\fR option makes passwd call chsh 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 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.