diff --git a/debian/changelog b/debian/changelog index 690d4fc7..8533172f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ shadow (1:4.1.2-1) experimental; urgency=low + debian/patches/008_login_log_failure_in_FTMP + debian/patches/429_login_FAILLOG_ENAB + debian/patches/507_32char_grnames.dpatch + * debian/patches/454_userdel_no_MAIL_FILE: Patch removed. If MAIL_FILE is + defined, the mailbox is not in MAIL_SPOOL_DIR. * debian/patches/506_relaxed_usernames: Use an extra paragraph for the note on username with a '/'. * debian/patches/504_undef_USE_PAM.dpatch: diff --git a/debian/patches/454_userdel_no_MAIL_FILE b/debian/patches/454_userdel_no_MAIL_FILE deleted file mode 100644 index 79b84788..00000000 --- a/debian/patches/454_userdel_no_MAIL_FILE +++ /dev/null @@ -1,21 +0,0 @@ -Goal: do not use MAIL_FILE in userdel: - When MAIL_FILE is used, the mail spool is in the home directory, so - it do not need to be removed (in addition to the user's home - directory) - -Note: usermod should be checked also. Maybe MAIL_FILE can be removed from - login.defs - -Index: shadow-4.1.0/src/userdel.c -=================================================================== ---- shadow-4.1.0.orig/src/userdel.c -+++ shadow-4.1.0/src/userdel.c -@@ -566,7 +566,7 @@ - - maildir = getdef_str ("MAIL_DIR"); - #ifdef MAIL_SPOOL_DIR -- if (!maildir && !getdef_str ("MAIL_FILE")) -+ if (!maildir) - maildir = MAIL_SPOOL_DIR; - #endif - if (!maildir)