Date: Friday, March 20, 2015 @ 06:05:03 Author: bisson Revision: 234192
fix FS#44267 Added: openssh/trunk/error.patch Modified: openssh/trunk/PKGBUILD -------------+ PKGBUILD | 9 ++++++++- error.patch | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-20 03:34:00 UTC (rev 234191) +++ PKGBUILD 2015-03-20 05:05:03 UTC (rev 234192) @@ -5,7 +5,7 @@ pkgname=openssh pkgver=6.8p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -16,6 +16,7 @@ 'x11-ssh-askpass: input passphrase in X') validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'error.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' @@ -22,6 +23,7 @@ 'sshd.socket' 'sshd.pam') sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP' + '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -32,6 +34,11 @@ install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../error.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" Added: error.patch =================================================================== --- error.patch (rev 0) +++ error.patch 2015-03-20 05:05:03 UTC (rev 234192) @@ -0,0 +1,25 @@ +From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001 +From: Damien Miller <d...@mindrot.org> +Date: Thu, 19 Mar 2015 22:11:59 +0000 +Subject: remove error() accidentally inserted for debugging + +pointed out by Christian Hesse +--- +diff --git a/monitor_wrap.c b/monitor_wrap.c +index b379f05..d39d491 100644 +--- a/monitor_wrap.c ++++ b/monitor_wrap.c +@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m) + debug3("%s entering", __func__); + + if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) { +- if (errno == EPIPE) { +- error("%s: socket closed", __func__); ++ if (errno == EPIPE) + cleanup_exit(255); +- } + fatal("%s: read: %s", __func__, strerror(errno)); + } + msg_len = get_u32(buf); +-- +cgit v0.9.2
