diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | error.patch | 25 |
3 files changed, 44 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = openssh-selinux pkgdesc = Free version of the SSH connectivity tools with SELinux support - pkgver = 6.7p1 - pkgrel = 2 + pkgver = 6.8p1 + pkgrel = 1 url = http://www.openssh.org/portable.html install = install arch = i686 @@ -16,22 +16,24 @@ pkgbase = openssh-selinux depends = libselinux optdepends = xorg-xauth: X11 forwarding optdepends = x11-ssh-askpass: input passphrase in X - provides = openssh=6.7p1-2 - provides = selinux-openssh=6.7p1-2 + provides = openssh=6.8p1-1 + provides = selinux-openssh=6.8p1-1 conflicts = openssh conflicts = selinux-openssh backup = etc/ssh/ssh_config backup = etc/ssh/sshd_config backup = etc/pam.d/sshd - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.7p1.tar.gz - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.7p1.tar.gz.asc + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.8p1.tar.gz + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.8p1.tar.gz.asc + source = error.patch source = sshdgenkeys.service source = sshd@.service source = sshd.service source = sshd.socket source = sshd.pam - sha1sums = 14e5fbed710ade334d65925e080d1aaeb9c85bf6 + sha1sums = cdbc51e46a902b30d263b05fdc71340920e91c92 sha1sums = SKIP + sha1sums = 1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8 sha1sums = cc1ceec606c98c7407e7ac21ade23aed81e31405 sha1sums = 6a0ff3305692cf83aca96e10f3bb51e1c26fccda sha1sums = ec49c6beba923e201505f5669cea48cad29014db @@ -7,8 +7,8 @@ # SELinux Contributor: Nicky726 <Nicky726@gmail.com> pkgname=openssh-selinux -pkgver=6.7p1 -pkgrel=2 +pkgver=6.8p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools with SELinux support' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -23,12 +23,14 @@ provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" groups=('selinux') validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz"{,.asc} + 'error.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.pam') -sha1sums=('14e5fbed710ade334d65925e080d1aaeb9c85bf6' 'SKIP' +sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP' + '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -39,6 +41,11 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') install=install +prepare() { + cd "${srcdir}/${pkgname/-selinux}-${pkgver}" + patch -p1 -i ../error.patch +} + build() { cd "${srcdir}/${pkgname/-selinux}-${pkgver}" diff --git a/error.patch b/error.patch new file mode 100644 index 000000000000..1616ba3630ef --- /dev/null +++ b/error.patch @@ -0,0 +1,25 @@ +From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001 +From: Damien Miller <djm@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 |