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

Thu Jun 21 00:13:29 UTC 2007

Author: bubulle
Date: 2007-06-21 00:13:29 +0000 (Thu, 21 Jun 2007)
New Revision: 1205

Added:
   trunk/debian/patches/413_no-sorry-in-passwd
   trunk/debian/patches/414_remove-unwise-advices
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Two more patches to fix some trivial issues


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2007-06-19 15:01:37 UTC (rev 1204)
+++ trunk/debian/changelog	2007-06-21 00:13:29 UTC (rev 1205)
@@ -15,6 +15,10 @@
       /etc/security/opasswd). Closes: #396726
     - 412_lastlog_-u_numerical_range: allow numerical UID and range of IDs in
       argument to lastog -u. Closes: #259494
+    - 413_no-sorry-in-passwd: No longer print 'Sorry' when something
+      fails in passwd, su and newgrp. Closes: #384164
+    - 414_remove-unwise-advices: Remove not so wise advices about choosing
+      passwords. Closes: #386818
   * Debian packaging fixes:
     - 506_relaxed_usernames: do not allow spaces in usernames. This was at
       least broken with username starting with a space or tabulation (the user

Added: trunk/debian/patches/413_no-sorry-in-passwd
===================================================================
--- trunk/debian/patches/413_no-sorry-in-passwd	                        (rev 0)
+++ trunk/debian/patches/413_no-sorry-in-passwd	2007-06-21 00:13:29 UTC (rev 1205)
@@ -0,0 +1,53 @@
+Goal: No longer print "sorry" and apologize to users
+Fixes: #384164
+
+Status wrt upstream: not reported yet.
+
+Note: 
+
+Index: shadow-4.0.18.1/src/newgrp.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/newgrp.c	2007-06-21 01:51:59.071588730 +0200
++++ shadow-4.0.18.1/src/newgrp.c	2007-06-21 01:54:18.564486366 +0200
+@@ -403,7 +403,7 @@
+ 			 * there is no password, print out "Sorry" and give up
+ 			 */
+ 			sleep (1);
+-			fputs (_("Sorry.\n"), stderr);
++			fputs (_("No password.\n"), stderr);
+ 			goto failure;
+ 		}
+ 
+@@ -412,7 +412,6 @@
+ 				 "Invalid password for group `%s' from `%s'",
+ 				 group, name));
+ 			sleep (1);
+-			fputs (_("Sorry.\n"), stderr);
+ 			goto failure;
+ 		}
+ 	}
+Index: shadow-4.0.18.1/src/passwd.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/passwd.c	2007-06-21 01:49:56.577825572 +0200
++++ shadow-4.0.18.1/src/passwd.c	2007-06-21 01:50:57.074745336 +0200
+@@ -350,7 +350,7 @@
+ 	if (now < ok) {
+ 		fprintf (stderr,
+ 			 _
+-			 ("Sorry, the password for %s cannot be changed yet.\n"),
++			 ("The password for %s cannot be changed yet.\n"),
+ 			 pw->pw_name);
+ 		SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name));
+ 		closelog ();
+Index: shadow-4.0.18.1/src/su.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/su.c	2007-06-21 01:51:35.072810642 +0200
++++ shadow-4.0.18.1/src/su.c	2007-06-21 01:51:50.572021491 +0200
+@@ -171,7 +171,6 @@
+ 			 oldname[0] ? oldname : "???", name[0] ? name : "???"));
+ 	closelog ();
+ #endif
+-	puts (_("Sorry."));
+ 	exit (1);
+ }
+ 

Added: trunk/debian/patches/414_remove-unwise-advices
===================================================================
--- trunk/debian/patches/414_remove-unwise-advices	                        (rev 0)
+++ trunk/debian/patches/414_remove-unwise-advices	2007-06-21 00:13:29 UTC (rev 1205)
@@ -0,0 +1,48 @@
+Goal: Remove quite unwise password choice advices in passwd manpage
+Fixes: #386818
+
+Status wrt upstream: Forwarded without patch but ignored up to now
+
+Note: 
+
+Index: shadow-4.0.18.1/man/passwd.1.xml
+===================================================================
+--- shadow-4.0.18.1.orig/man/passwd.1.xml	2007-06-21 02:06:42.026632551 +0200
++++ shadow-4.0.18.1/man/passwd.1.xml	2007-06-21 02:04:59.531851133 +0200
+@@ -104,35 +104,9 @@
+ 
+       <para>
+ 	Your password must be easily remembered so that you will not be forced
+-	to write it on a piece of paper. This can be accomplished by
+-	appending two small words together and separating each with a
+-	special character or digit. For example, Pass%word.
++	to write it on a piece of paper.
+       </para>
+ 
+-      <para>
+-	Other methods of construction involve selecting an easily remembered
+-	phrase from literature and selecting the first or last letter from
+-	each word. An example of this is:
+-      </para>
+-
+-      <itemizedlist mark='bullet'>
+-	<listitem>
+-	  <para>Ask not for whom the bell tolls</para>
+-	</listitem>
+-	<listitem>
+-	  <para>which produces</para>
+-	</listitem>
+-	<listitem>
+-	  <para>An4wtbt</para>
+-	</listitem>
+-      </itemizedlist>
+-
+-      <para>
+-	You may be reasonably sure few crackers will have included this in
+-	their dictionaries. You should, however, select your own methods for
+-	constructing passwords and not rely exclusively on the methods given
+-	here.
+-      </para>
+     </refsect2>
+   </refsect1>
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2007-06-19 15:01:37 UTC (rev 1204)
+++ trunk/debian/patches/series	2007-06-21 00:13:29 UTC (rev 1205)
@@ -59,5 +59,7 @@
 303_wording_fixes_in_su_man
 201_fix_man_su_fr
 202_it_man_uses_gettext
+413_no-sorry-in-passwd
 411_chpasswd_document_no_pam
 412_lastlog_-u_numerical_range
+414_remove-unwise-advices


