openssh: update to 7.4p1

Signed-off-by: Peter Wagner <tripolar@gmx.at>

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 73e7e676593a9ee06ab47fa7ed5750a33e6390f3..27c92f39b737e0c3e3796a4ec8e4788edfc8b11f 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,13 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=7.3p1
-PKG_RELEASE:=3
+PKG_VERSION:=7.4p1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
-               http://ftp.belnet.be/pub/OpenBSD/OpenSSH/portable/
-PKG_MD5SUM:=dfadd9f035d38ce5d58a3bf130b86d08
+PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
+PKG_MD5SUM:=b2db2a83caf66a208bb78d6d287cdaa3
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE

diff --git a/net/openssh/patches/100-openssh-7.3_p1-NEWKEYS_null_deref.patch b/net/openssh/patches/100-openssh-7.3_p1-NEWKEYS_null_deref.patch
deleted file mode 100644 (file)
index 27e99b2..0000000
--- a/net/openssh/patches/100-openssh-7.3_p1-NEWKEYS_null_deref.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Backport of
-https://anongit.mindrot.org/openssh.git/patch/?id=28652bca29046f62c7045e933e6b931de1d16737
-
---- openssh-7.3p1/kex.c
-+++ openssh-7.3p1/kex.c
-@@ -419,6 +419,8 @@
-       ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
-       if ((r = sshpkt_get_end(ssh)) != 0)
-               return r;
-+      if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
-+              return r;
-       kex->done = 1;
-       sshbuf_reset(kex->peer);
-       /* sshbuf_reset(kex->my); */
---- openssh-7.3p1/packet.c
-+++ openssh-7.3p1/packet.c
-@@ -1919,9 +1919,7 @@
-                       return r;
-               return SSH_ERR_PROTOCOL_ERROR;
-       }
--      if (*typep == SSH2_MSG_NEWKEYS)
--              r = ssh_set_newkeys(ssh, MODE_IN);
--      else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
-+      if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
-               r = ssh_packet_enable_delayed_compress(ssh);
-       else
-               r = 0;

diff --git a/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch b/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch
deleted file mode 100644 (file)
index f7b41dc..0000000
--- a/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/kex.c b/kex.c
-index 50c7a0f..d09c27b 100644
---- a/kex.c
-+++ b/kex.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: kex.c,v 1.118 2016/05/02 10:26:04 djm Exp $ */
-+/* $OpenBSD: kex.c,v 1.127 2016/10/10 19:28:48 markus Exp $ */
- /*
-  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
-  *
-@@ -472,6 +472,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
-       if (kex == NULL)
-               return SSH_ERR_INVALID_ARGUMENT;
- 
-+      ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
-       ptr = sshpkt_ptr(ssh, &dlen);
-       if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
-               return r;