From edaf006f9cf7b6f968b9ae6cdbb284a3238c4afa Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 15 Jul 2015 15:08:37 -0300 Subject: openssh-knock-6.9p1-1: updating version --- pcr/openssh-knock/PKGBUILD | 20 ++++++---- pcr/openssh-knock/dispatch.patch | 81 ++++++++++++++++++++++++++++++++++++++++ pcr/openssh-knock/error.patch | 25 +++++++++++++ pcr/openssh-knock/sshd.conf | 1 + 4 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 pcr/openssh-knock/dispatch.patch create mode 100644 pcr/openssh-knock/error.patch create mode 100644 pcr/openssh-knock/sshd.conf (limited to 'pcr') diff --git a/pcr/openssh-knock/PKGBUILD b/pcr/openssh-knock/PKGBUILD index bae0ee03d..2ade20dea 100644 --- a/pcr/openssh-knock/PKGBUILD +++ b/pcr/openssh-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 223946 2014-10-07 02:36:53Z bisson $ +# $Id: PKGBUILD 241658 2015-07-01 05:21:46Z bisson $ # Maintainer (Arch): Gaetan Bisson # Contributor (Arch): Aaron Griffin # Contributor (Arch): judd @@ -7,7 +7,7 @@ _pkgname=openssh pkgname=openssh-knock -pkgver=6.7p1 +pkgver=6.9p1 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools, with support for stealth TCP sockets' url='http://www.openssh.org/portable.html' @@ -15,23 +15,28 @@ license=('custom:BSD') arch=('i686' 'x86_64') conflicts=(${_pkgname}) provides=(${_pkgname}) -makedepends=('linux-headers') +makedepends=('linux-libre-headers') depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') +validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30' + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc} - "http://gnunet.org/sites/default/files/${_pkgname}-linux-knock-patch_0.diff" + #"http://gnunet.org/sites/default/files/${_pkgname}-linux-knock-patch_0.diff" + "https://repo.parabola.nu/other/knock/patches/openssh/${_pkgname}-${pkgver}-linux-knock-patch.diff"{,.sig} 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' + 'sshd.conf' 'sshd.pam') -sha1sums=('14e5fbed710ade334d65925e080d1aaeb9c85bf6' 'SKIP' - 'f9ea1f6411548e5c29383664b5a57866bc2579f4' +sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP' + '149450fd40099e274a09b033cd2ff6e7439e64e8' 'SKIP' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' + 'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f' 'd93dca5ebda4610ff7647187f8928a3de28703f3') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') @@ -41,7 +46,7 @@ install=install prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}"/${_pkgname}-linux-knock-patch_0.diff + patch -Np1 -i "${srcdir}"/${_pkgname}-${pkgver}-linux-knock-patch.diff } build() { @@ -89,6 +94,7 @@ package() { install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh diff --git a/pcr/openssh-knock/dispatch.patch b/pcr/openssh-knock/dispatch.patch new file mode 100644 index 000000000..9350d8ff6 --- /dev/null +++ b/pcr/openssh-knock/dispatch.patch @@ -0,0 +1,81 @@ +From 639d6bc57b1942393ed12fb48f00bc05d4e093e4 Mon Sep 17 00:00:00 2001 +From: djm@openbsd.org +Date: Fri, 01 May 2015 07:10:01 +0000 +Subject: upstream commit + +refactor ssh_dispatch_run_fatal() to use sshpkt_fatal() + to better report error conditions. Teach sshpkt_fatal() about ECONNRESET. + +Improves error messages on TCP connection resets. bz#2257 + +ok dtucker@ +--- +diff --git a/dispatch.c b/dispatch.c +index afe6182..aac933e 100644 +--- a/dispatch.c ++++ b/dispatch.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */ ++/* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */ + /* + * Copyright (c) 2000 Markus Friedl. All rights reserved. + * +@@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, + { + int r; + +- if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) { +- switch (r) { +- case SSH_ERR_CONN_CLOSED: +- logit("Connection closed by %.200s", +- ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- case SSH_ERR_CONN_TIMEOUT: +- logit("Connection to %.200s timed out while " +- "waiting to read", ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- case SSH_ERR_DISCONNECTED: +- logit("Disconnected from %.200s", +- ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- default: +- fatal("%s: %s", __func__, ssh_err(r)); +- } +- } ++ if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) ++ sshpkt_fatal(ssh, __func__, r); + } +diff --git a/packet.c b/packet.c +index 4922573..a7727ef 100644 +--- a/packet.c ++++ b/packet.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */ ++/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */ + /* + * Author: Tatu Ylonen + * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland +@@ -1920,9 +1920,19 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r) + logit("Connection closed by %.200s", ssh_remote_ipaddr(ssh)); + cleanup_exit(255); + case SSH_ERR_CONN_TIMEOUT: +- logit("Connection to %.200s timed out while " +- "waiting to write", ssh_remote_ipaddr(ssh)); ++ logit("Connection to %.200s timed out", ssh_remote_ipaddr(ssh)); + cleanup_exit(255); ++ case SSH_ERR_DISCONNECTED: ++ logit("Disconnected from %.200s", ++ ssh_remote_ipaddr(ssh)); ++ cleanup_exit(255); ++ case SSH_ERR_SYSTEM_ERROR: ++ if (errno == ECONNRESET) { ++ logit("Connection reset by %.200s", ++ ssh_remote_ipaddr(ssh)); ++ cleanup_exit(255); ++ } ++ /* FALLTHROUGH */ + default: + fatal("%s%sConnection to %.200s: %s", + tag != NULL ? tag : "", tag != NULL ? ": " : "", +-- +cgit v0.9.2 diff --git a/pcr/openssh-knock/error.patch b/pcr/openssh-knock/error.patch new file mode 100644 index 000000000..1616ba363 --- /dev/null +++ b/pcr/openssh-knock/error.patch @@ -0,0 +1,25 @@ +From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001 +From: Damien Miller +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 diff --git a/pcr/openssh-knock/sshd.conf b/pcr/openssh-knock/sshd.conf new file mode 100644 index 000000000..ca2a39354 --- /dev/null +++ b/pcr/openssh-knock/sshd.conf @@ -0,0 +1 @@ +d /var/empty 0755 root root -- cgit v1.2.3