From af8755d005f84ff828fdcc46fb1e353eaee1168e Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 13 Sep 2008 17:49:05 +0000 Subject: [PATCH] - Remove patches applied upstream: + debian/patches/406_vipw_resume_properly --- debian/changelog | 1 + debian/patches/406_vipw_resume_properly | 21 --------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 debian/patches/406_vipw_resume_properly diff --git a/debian/changelog b/debian/changelog index f22bd200..706451d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ shadow (1:4.1.2-1) experimental; urgency=low + debian/patches/434_login_stop_checking_args_after-- + debian/patches/491_configure.in_friendly_selinux_detection + debian/patches/487_passwd_chauthtok_failed_message + + debian/patches/406_vipw_resume_properly - Updated patches: + debian/patches/431_su_uid_0_not_root + debian/patches/463_login_delay_obeys_to_PAM diff --git a/debian/patches/406_vipw_resume_properly b/debian/patches/406_vipw_resume_properly deleted file mode 100644 index 274d67c0..00000000 --- a/debian/patches/406_vipw_resume_properly +++ /dev/null @@ -1,21 +0,0 @@ -Goal: Resume properly after ^Z - -Fix: #414542 - -Author: dean gaudet - -Status wrt upstream: Fixed upstream - -Index: shadow-4.1.0/src/vipw.c -=================================================================== ---- shadow-4.1.0.orig/src/vipw.c -+++ shadow-4.1.0/src/vipw.c -@@ -208,7 +208,7 @@ - pid = waitpid (pid, &status, WUNTRACED); - if (WIFSTOPPED (status)) { - kill (getpid (), SIGSTOP); -- kill (getpid (), SIGCONT); -+ kill (pid, SIGCONT); - } else - break; - } diff --git a/debian/patches/series b/debian/patches/series index e5a9dad0..4dd9b712 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 -406_vipw_resume_properly 414_remove-unwise-advices 415_login_put-echoctl-back 300_SHA_crypt_method