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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:50:46 +0000 (Sat, 13 Sep 2008)
New Revision: 2401

Removed:
   debian/trunk/debian/patches/414_remove-unwise-advices
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
    - Remove patches applied upstream:
      + debian/patches/414_remove-unwise-advices


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:49:05 UTC (rev 2400)
+++ debian/trunk/debian/changelog	2008-09-13 17:50:46 UTC (rev 2401)
@@ -7,6 +7,7 @@
       + debian/patches/491_configure.in_friendly_selinux_detection
       + debian/patches/487_passwd_chauthtok_failed_message
       + debian/patches/406_vipw_resume_properly
+      + debian/patches/414_remove-unwise-advices
     - Updated patches:
       + debian/patches/431_su_uid_0_not_root
       + debian/patches/463_login_delay_obeys_to_PAM

Deleted: debian/trunk/debian/patches/414_remove-unwise-advices
===================================================================
--- debian/trunk/debian/patches/414_remove-unwise-advices	2008-09-13 17:49:05 UTC (rev 2400)
+++ debian/trunk/debian/patches/414_remove-unwise-advices	2008-09-13 17:50:46 UTC (rev 2401)
@@ -1,50 +0,0 @@
-Goal: Remove quite unwise password choice advices in passwd manpage
-Fixes: #386818
-
-Status wrt upstream: Applied upstream
-
-Note: 
-
-Index: shadow-4.1.0/man/passwd.1.xml
-===================================================================
---- shadow-4.1.0.orig/man/passwd.1.xml
-+++ shadow-4.1.0/man/passwd.1.xml
-@@ -113,36 +113,10 @@
-       </para>
- 
-       <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.
-+	You can find advices on how to choose a strong password on
-+	http://en.wikipedia.org/wiki/Password_strength
-       </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: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2008-09-13 17:49:05 UTC (rev 2400)
+++ debian/trunk/debian/patches/series	2008-09-13 17:50:46 UTC (rev 2401)
@@ -25,7 +25,6 @@
 403_fix_PATH-MAX_hurd
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
-414_remove-unwise-advices
 415_login_put-echoctl-back
 300_SHA_crypt_method
 301_manpages_missing_options