From 3bc2c036d4d7b4df42617e82c1c3d5192f7d4860 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Tue, 20 Nov 2007 18:54:58 +0000 Subject: [PATCH] Tag patches as fixed in the next release. Next release will be 4.1.0-1. #451518 and #451521 will also be closed by this new release. --- debian/changelog | 22 +++++++++++++++++++ debian/patches/405_su_no_pam_end_before_exec | 2 +- debian/patches/409_man_generate_from_PO | 2 +- debian/patches/410_newgrp_man_mention_sg | 3 +-- debian/patches/411_chpasswd_document_no_pam | 4 ++-- debian/patches/417_passwd_warndays | 2 +- .../468_duplicate_passwd_struct_before_usage | 3 ++- debian/patches/493_pwck_no_SHADOWPWD | 2 +- debian/patches/494_passwd_lock | 2 ++ debian/patches/495_salt_stack_smash | 3 ++- debian/patches/497_newgrp_primary_group | 2 +- debian/patches/series | 11 ---------- 12 files changed, 36 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f5f391f..4b5d7c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +shadow (1:4.1.0-1) UNRELEASED; urgency=low + + * New upstream release. This closes the following bugs: + - usermod: Make usermod options independent of the argument order. + Closes: #451518 + - login: Improve logging of login when the user's passwd entry could not + be retrieved. Closes: #451521 + - Remove patches applied upstream: + + 468_duplicate_passwd_struct_before_usage + + 495_salt_stack_smash + + 397_non_numerical_identifier + + 405_su_no_pam_end_before_exec + + 493_pwck_no_SHADOWPWD + + 497_newgrp_primary_group + + 409_man_generate_from_PO + + 410_newgrp_man_mention_sg + + 411_chpasswd_document_no_pam + + 494_passwd_lock + + 417_passwd_warndays + + -- Nicolas FRANCOIS (Nekral) Sat, 17 Nov 2007 18:33:26 +0100 + shadow (1:4.0.18.2-1) unstable; urgency=low * The "Vacherin" release. diff --git a/debian/patches/405_su_no_pam_end_before_exec b/debian/patches/405_su_no_pam_end_before_exec index 3601ac32..c6ec67c2 100644 --- a/debian/patches/405_su_no_pam_end_before_exec +++ b/debian/patches/405_su_no_pam_end_before_exec @@ -7,7 +7,7 @@ anyway. Fixes: #412061 -Status wrt upstream: not reported yet. +Status wrt upstream: Will be fixed in 4.0.19. Index: shadow-4.0.18.1/src/su.c =================================================================== diff --git a/debian/patches/409_man_generate_from_PO b/debian/patches/409_man_generate_from_PO index 5e588886..a6e97899 100644 --- a/debian/patches/409_man_generate_from_PO +++ b/debian/patches/409_man_generate_from_PO @@ -3,7 +3,7 @@ Goal: Build the translated man pages at build time. Note: Translators must list the manpages which are translated in the man_MANS (and man_nopam) variables. -Status wrt upstream: not reported yet. +Status wrt upstream: Will be fixed in 4.0.19. Index: shadow-4.0.18.2/man/Makefile.am =================================================================== diff --git a/debian/patches/410_newgrp_man_mention_sg b/debian/patches/410_newgrp_man_mention_sg index d1ed5ba5..d98f7def 100644 --- a/debian/patches/410_newgrp_man_mention_sg +++ b/debian/patches/410_newgrp_man_mention_sg @@ -4,8 +4,7 @@ Fixes: #396690 Note: -Status wrt upstream: not applied yet. Tomasz applied the same for - su(1) but not for newgrp(1) +Status wrt upstream: Will be fixed in 4.0.19. Index: shadow-4.0.18.1/man/newgrp.1.xml =================================================================== diff --git a/debian/patches/411_chpasswd_document_no_pam b/debian/patches/411_chpasswd_document_no_pam index ba3e646e..9c873028 100644 --- a/debian/patches/411_chpasswd_document_no_pam +++ b/debian/patches/411_chpasswd_document_no_pam @@ -1,7 +1,7 @@ -Goal: Document that chpasswd foes not use PAM. +Goal: Document that chpasswd does not use PAM. Fixes: #396726 -Status wrt upstream: Not reported yet. +Status wrt upstream: Will be fixed in 4.0.19. Note: Even when PAM support is activated in chpasswd, this patch is valid. The PAM support is only for the authentication of the caller. diff --git a/debian/patches/417_passwd_warndays b/debian/patches/417_passwd_warndays index f5ccff75..645285a6 100644 --- a/debian/patches/417_passwd_warndays +++ b/debian/patches/417_passwd_warndays @@ -2,7 +2,7 @@ Goal: Use "warndays as long option for "-w" and not "warning" Fixes: #445481 -Status wrt upstream: Not reported yet. Should be applied +Status wrt upstream: Will be fixed in 4.0.19. Note: diff --git a/debian/patches/468_duplicate_passwd_struct_before_usage b/debian/patches/468_duplicate_passwd_struct_before_usage index efd5a1bd..6ed27a5d 100644 --- a/debian/patches/468_duplicate_passwd_struct_before_usage +++ b/debian/patches/468_duplicate_passwd_struct_before_usage @@ -25,7 +25,8 @@ Goal: Fixes: #341230 -Status wrt upstream: +Status wrt upstream: Fixed differently in 4.0.19. (all the getpwnam, ... + reviewed) Index: shadow-4.0.18.1/src/chfn.c =================================================================== diff --git a/debian/patches/493_pwck_no_SHADOWPWD b/debian/patches/493_pwck_no_SHADOWPWD index 05936998..96eab0ff 100644 --- a/debian/patches/493_pwck_no_SHADOWPWD +++ b/debian/patches/493_pwck_no_SHADOWPWD @@ -2,7 +2,7 @@ Goal: SHADOWPWD is now assumed (no more defined). Fixes: pwck do not detect missing users in /etc/shadow. -Status wrt upstream: Not proposed to upstream yet. +Status wrt upstream: Will be fixed in 4.0.19. Index: shadow-4.0.18.1/src/pwck.c =================================================================== diff --git a/debian/patches/494_passwd_lock b/debian/patches/494_passwd_lock index 92b109c9..a8cfdb12 100644 --- a/debian/patches/494_passwd_lock +++ b/debian/patches/494_passwd_lock @@ -1,3 +1,5 @@ +Status wrt upstream: Will be fixed in 4.0.19. + Index: shadow-4.0.18.1/man/passwd.1.xml =================================================================== --- shadow-4.0.18.1.orig/man/passwd.1.xml 2007-06-21 02:04:59.531851133 +0200 diff --git a/debian/patches/495_salt_stack_smash b/debian/patches/495_salt_stack_smash index c4fd11bb..735fb53a 100644 --- a/debian/patches/495_salt_stack_smash +++ b/debian/patches/495_salt_stack_smash @@ -6,7 +6,8 @@ Fix: #377825 Author: Colin Watson -Status wrt upstream: reported, not applied yet +Status wrt upstream: Will be fixed in 4.0.19 + This upstream section changed a lot. Index: shadow-4.0.18.1/libmisc/salt.c =================================================================== diff --git a/debian/patches/497_newgrp_primary_group b/debian/patches/497_newgrp_primary_group index 23357f92..0fe8b929 100644 --- a/debian/patches/497_newgrp_primary_group +++ b/debian/patches/497_newgrp_primary_group @@ -3,7 +3,7 @@ Goal: Do not request a password when a user uses newgrp to switch to her Fixes: #396691 -Status wrt upstream: not forwarded yet. +Status wrt upstream: Will be fixed in 4.0.19 Index: shadow-4.0.18.1/src/newgrp.c =================================================================== diff --git a/debian/patches/series b/debian/patches/series index 045f62f8..bb9b2ea9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,7 +21,6 @@ 463_login_delay_obeys_to_PAM 467_useradd_-r_LSB 466_fflush-prompt -468_duplicate_passwd_struct_before_usage 523_su_arguments_are_concatenated 523_su_arguments_are_no_more_concatenated_by_default 479_chowntty_debug @@ -32,21 +31,11 @@ 487_passwd_chauthtok_failed_message 403_fix_PATH-MAX_hurd 508_nologin_in_usr_sbin -495_salt_stack_smash 496_login_init_session -397_non_numerical_identifier -405_su_no_pam_end_before_exec -493_pwck_no_SHADOWPWD 505_useradd_recommend_adduser 406_vipw_resume_properly -497_newgrp_primary_group 407_adduser_disable_PUG_with-n 408_passwd_check_arguments -409_man_generate_from_PO -410_newgrp_man_mention_sg -411_chpasswd_document_no_pam 412_lastlog_-u_numerical_range 414_remove-unwise-advices -494_passwd_lock 415_login_put-echoctl-back -417_passwd_warndays