diff --git a/debian/changelog b/debian/changelog index 706451d7..382c0a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ shadow (1:4.1.2-1) experimental; urgency=low + 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 diff --git a/debian/patches/414_remove-unwise-advices b/debian/patches/414_remove-unwise-advices deleted file mode 100644 index 215bdc6c..00000000 --- a/debian/patches/414_remove-unwise-advices +++ /dev/null @@ -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 @@ - - - -- 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 - - -- -- 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: -- -- -- -- -- Ask not for whom the bell tolls -- -- -- which produces -- -- -- An4wtbt -- -- -- -- -- 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. -- - - - diff --git a/debian/patches/series b/debian/patches/series index 4dd9b712..52cd414b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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