Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/vsftpd: add patch to fix hang
Date: Thu, 7 Mar 2019 22:29:00 +0100	[thread overview]
Message-ID: <20190307222900.07e5c3be@windsurf> (raw)
In-Reply-To: <20190305195440.25074-1-abdelmalek.benelouezzane@savoirfairelinux.com>

Hello,

On Tue,  5 Mar 2019 14:54:40 -0500
Abdelmalek Benelouezzane <abdelmalek.benelouezzane@savoirfairelinux.com> wrote:

> This fixes a hang due to SIGCHLD not being handled correctly by
> vsftpd. The patch comes from fedora and didn't make its way to
> upstream yet.
> 
> More information about the bug can be found in:
>  - https://bugzilla.redhat.com/show_bug.cgi?id=1198259
> 
> Signed-off-by: Abdelmalek Benelouezzane <abdelmalek.benelouezzane@savoirfairelinux.com>

Thanks, I've applied, but had to reformat your patch a bit, see below.

> ---
>  ...0004-Prevent-hang-in-SIGCHLD-handler.patch | 90 +++++++++++++++++++
>  1 file changed, 90 insertions(+)
>  create mode 100644 package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
> 
> diff --git a/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch b/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
> new file mode 100644
> index 0000000000..221720b6e3
> --- /dev/null
> +++ b/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
> @@ -0,0 +1,90 @@
> +Prevent hang in SIGCHLD handler
> +
> +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1198259
> +
> +Fetch from:
> +https://src.fedoraproject.org/cgit/rpms/vsftpd.git/plain/0026-Prevent-hanging-in-SIGCHLD-handler.patch
> +
> +Signed-off-by: Abdelmalek Benelouezzane <abdelmalek.benelouezzane@savoirfairelinux.com>

Those details....

> +
> +From 1e65a0a15f819b8bf1b551bd84f71d0da1f5a00c Mon Sep 17 00:00:00 2001
> +From: Martin Sehnoutka <msehnout@redhat.com>
> +Date: Thu, 17 Nov 2016 13:02:27 +0100
> +Subject: [PATCH 26/59] Prevent hanging in SIGCHLD handler.
> +
> +vsftpd can now handle pam_exec.so in pam.d config without hanging
> +in SIGCHLD handler.

Should go here. Otherwise the patch is no longer properly formatted to
be applied with "git am".

I've fixed that and applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

  reply	other threads:[~2019-03-07 21:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05 19:54 [Buildroot] [PATCH 1/1] package/vsftpd: add patch to fix hang Abdelmalek Benelouezzane
2019-03-07 21:29 ` Thomas Petazzoni [this message]
2019-03-19 20:31 ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190307222900.07e5c3be@windsurf \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox