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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-06-09 23:43:23 +0000 (Thu, 09 Jun 2005)
New Revision: 232

Added:
   trunk/debian/patches/006_libmisc_chowntty_ro_root_fs
Modified:
   trunk/debian/patches/006_libmisc.dpatch
   trunk/debian/patches/series
Log:
Split the 006_libmisc patch.


Modified: trunk/debian/patches/006_libmisc.dpatch
===================================================================
--- trunk/debian/patches/006_libmisc.dpatch	2005-06-09 23:13:27 UTC (rev 231)
+++ trunk/debian/patches/006_libmisc.dpatch	2005-06-09 23:43:23 UTC (rev 232)
@@ -24,21 +24,10 @@
 
 @DPATCH@
 
-diff -Nru shadow-4.0.3/libmisc/chowntty.c shadow-4.0.3_30.4/libmisc/chowntty.c
---- shadow-4.0.3/libmisc/chowntty.c	2001-06-23 13:09:02.000000000 +0200
-+++ shadow-4.0.3_30.4/libmisc/chowntty.c	2004-11-02 22:17:35.000000000 +0100
-@@ -116,7 +116,7 @@
- 			tty, info->pw_name));
- 		closelog();
- 
--		if (!(err == EROFS && info->pw_uid == 0))
-+		if (err != EROFS)
- 			exit(1);
- 	}
- 
-diff -Nru shadow-4.0.3/libmisc/failure.c shadow-4.0.3_30.4/libmisc/failure.c
---- shadow-4.0.3/libmisc/failure.c	1998-12-28 21:34:46.000000000 +0100
-+++ shadow-4.0.3_30.4/libmisc/failure.c	2004-11-02 22:17:35.000000000 +0100
+Index: shadow-4.0.3/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"
@@ -66,9 +55,10 @@
  {
  	char *ftmp;
  	int fd;
-diff -Nru shadow-4.0.3/libmisc/failure.h shadow-4.0.3_30.4/libmisc/failure.h
---- shadow-4.0.3/libmisc/failure.h	2000-08-26 20:27:17.000000000 +0200
-+++ shadow-4.0.3_30.4/libmisc/failure.h	2004-11-02 22:17:35.000000000 +0100
+Index: shadow-4.0.3/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
 @@ -4,7 +4,11 @@
  
  #include "defines.h"

Added: trunk/debian/patches/006_libmisc_chowntty_ro_root_fs
===================================================================
--- trunk/debian/patches/006_libmisc_chowntty_ro_root_fs	2005-06-09 23:13:27 UTC (rev 231)
+++ trunk/debian/patches/006_libmisc_chowntty_ro_root_fs	2005-06-09 23:43:23 UTC (rev 232)
@@ -0,0 +1,19 @@
+Goal: allow regular user to login on read-only root file system.
+Fixes: #52069
+       (in fact, the patch proposed in the bug report has evolved a lot)
+
+Status wrt upstream: submitted upstream.
+
+Index: shadow-4.0.3/libmisc/chowntty.c
+===================================================================
+--- shadow-4.0.3.orig/libmisc/chowntty.c	2005-06-10 01:16:39.262729000 +0200
++++ shadow-4.0.3/libmisc/chowntty.c	2005-06-10 01:17:42.422729000 +0200
+@@ -116,7 +116,7 @@
+ 			tty, info->pw_name));
+ 		closelog();
+ 
+-		if (!(err == EROFS && info->pw_uid == 0))
++		if (err != EROFS)
+ 			exit(1);
+ 	}
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-09 23:13:27 UTC (rev 231)
+++ trunk/debian/patches/series	2005-06-09 23:43:23 UTC (rev 232)
@@ -20,6 +20,7 @@
 352_userdel.8
 353_groupdel.8
 006_libmisc.dpatch
+006_libmisc_chowntty_ro_root_fs
 008_su_addenv_HOME_and_SHELL
 008_su_uid_0_not_root
 008_su_add_GNU_options