From 19d4c790a818583ad2762682f695256cc8186398 Mon Sep 17 00:00:00 2001 From: "Jan F. Chadima" Date: Tue, 23 Aug 2011 19:01:59 +0200 Subject: [PATCH] ignore SIGPIPE in ssh keyscan --- openssh-5.8p2-sigpipe.patch | 12 ++++++++++++ openssh.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 openssh-5.8p2-sigpipe.patch diff --git a/openssh-5.8p2-sigpipe.patch b/openssh-5.8p2-sigpipe.patch new file mode 100644 index 0000000..56af045 --- /dev/null +++ b/openssh-5.8p2-sigpipe.patch @@ -0,0 +1,12 @@ +diff -up openssh-5.8p2/ssh-keyscan.c.sigpipe openssh-5.8p2/ssh-keyscan.c +--- openssh-5.8p2/ssh-keyscan.c.sigpipe 2011-08-23 18:30:33.873025916 +0200 ++++ openssh-5.8p2/ssh-keyscan.c 2011-08-23 18:32:24.574025362 +0200 +@@ -715,6 +715,8 @@ main(int argc, char **argv) + fdlim_set(maxfd); + fdcon = xcalloc(maxfd, sizeof(con)); + ++ signal(SIGPIPE, SIG_IGN); ++ + read_wait_nfdset = howmany(maxfd, NFDBITS); + read_wait = xcalloc(read_wait_nfdset, sizeof(fd_mask)); + diff --git a/openssh.spec b/openssh.spec index 9121842..fce3b56 100644 --- a/openssh.spec +++ b/openssh.spec @@ -79,7 +79,7 @@ # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 %define openssh_ver 5.8p2 -%define openssh_rel 20 +%define openssh_rel 21 %define pam_ssh_agent_ver 0.9.2 %define pam_ssh_agent_rel 31 @@ -198,6 +198,8 @@ Patch67: openssh-5.8p2-unconfined.patch Patch68: openssh-5.8p2-sesftplog.patch #? Patch69: openssh-5.8p2-askpass-ld.patch +#? +Patch70: openssh-5.8p2-sigpipe.patch #--- #https://bugzilla.mindrot.org/show_bug.cgi?id=1604 # sctp @@ -437,6 +439,7 @@ popd %patch67 -p1 -b .unconfined %patch68 -p1 -b .sesftplog %patch69 -p1 -b .askpass-ld +%patch70 -p1 -b .sigpipe autoreconf pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -774,6 +777,9 @@ fi %endif %changelog +* Tue Aug 23 2011 Jan F. Chadima - 5.8p2-21 + 0.9.2-31 +- ignore SIGPIPE in ssh keyscan + * Tue Aug 9 2011 Jan F. Chadima - 5.8p2-20 + 0.9.2-31 - save ssh-askpass's debuginfo