[Pkg-shadow-commits] r1209 - in trunk/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-06-22 17:34:19 +0000 (Fri, 22 Jun 2007)
New Revision: 1209

Added:
   trunk/debian/patches/415_login_put-echoctl-back
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Reactivate ECHOCTL on login

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-06-21 23:27:41 UTC (rev 1208)
+++ trunk/debian/changelog	2007-06-22 17:34:19 UTC (rev 1209)
@@ -1,3 +1,10 @@
+shadow (1:4.0.18.1-11) unstable; urgency=low
+
+  * The "Baguette laonnaise" release
+  * Reactivate ECHOCTL in login after it disappeared in 4.0.8. Closes: #429758
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 22 Jun 2007 19:33:01 +0200
+
 shadow (1:4.0.18.1-10) unstable; urgency=low
 
   * The "Trappe d'Échourgnac" release

Added: trunk/debian/patches/415_login_put-echoctl-back
===================================================================
--- trunk/debian/patches/415_login_put-echoctl-back	                        (rev 0)
+++ trunk/debian/patches/415_login_put-echoctl-back	2007-06-22 17:34:19 UTC (rev 1209)
@@ -0,0 +1,29 @@
+Goal: Re-activate ECHOCTL in login
+
+Fixes: #429758
+
+Status wrt upstream: Not reported yet. 
+
+Note: Was removed by upstream in 4.0.8 with "remove dead code" comment
+
+Index: shadow-4.0.18.1/src/login.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/login.c	2007-06-22 19:14:00.712717643 +0200
++++ shadow-4.0.18.1/src/login.c	2007-06-22 19:17:24.702331390 +0200
+@@ -175,6 +175,16 @@
+ 	termio.c_lflag |= ISIG | ICANON | ECHO | ECHOE;
+ 	termio.c_iflag |= ICRNL;
+ 
++#if defined(ECHOKE) && defined(ECHOCTL)
++	termio.c_lflag |= ECHOKE | ECHOCTL;
++#endif
++#if defined(ECHOPRT) && defined(NOFLSH) && defined(TOSTOP)
++	termio.c_lflag &= ~(ECHOPRT | NOFLSH | TOSTOP);
++#endif
++#ifdef ONLCR
++	termio.c_oflag |= ONLCR;
++#endif
++
+ 	/* leave these values unchanged if not specified in login.defs */
+ 	termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]);
+ 	termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]);

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2007-06-21 23:27:41 UTC (rev 1208)
+++ trunk/debian/patches/series	2007-06-22 17:34:19 UTC (rev 1209)
@@ -64,3 +64,4 @@
 412_lastlog_-u_numerical_range
 414_remove-unwise-advices
 494_passwd_lock
+415_login_put-echoctl-back