From 97d84ba14ae52c183cee94c7e8cf6648bbff80ad Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 20 Apr 2020 11:28:34 +0000
Subject: [PATCH] update to libssh-0.9.4 which addresses CVE-2020-1730. see
 https://www.libssh.org/security/advisories/CVE-2020-1730.txt for more details

ok kn@ rpointel@
---
 security/libssh/Makefile                      |  4 +--
 security/libssh/distinfo                      |  4 +--
 .../patches/patch-include_libssh_priv_h       | 35 -------------------
 3 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 security/libssh/patches/patch-include_libssh_priv_h

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index fbe19db23db..5100832b459 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.21 2020/03/31 18:46:01 kn Exp $
+# $OpenBSD: Makefile,v 1.22 2020/04/20 11:28:34 jasper Exp $
 
 COMMENT =		C library implementing server and client side
-V =			0.9.3
+V =			0.9.4
 DISTNAME =		libssh-${V}
 
 SHARED_LIBS +=  	ssh		4.1 # 4.8
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index b00101d549b..46327d6849c 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.9.3.tar.xz) = LItfiU3O1Ys9Yp8W86+mViwgtL3IlGORY89leDNojww=
-SIZE (libssh-0.9.3.tar.xz) = 500068
+SHA256 (libssh-0.9.4.tar.xz) = FQiXpWmFKsBarIMdxBenuo5hDIbKLgFUqZxq3iSGIms=
+SIZE (libssh-0.9.4.tar.xz) = 500776
diff --git a/security/libssh/patches/patch-include_libssh_priv_h b/security/libssh/patches/patch-include_libssh_priv_h
deleted file mode 100644
index 504c4288b5f..00000000000
--- a/security/libssh/patches/patch-include_libssh_priv_h
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-include_libssh_priv_h,v 1.1 2020/03/31 18:46:01 kn Exp $
-
-Fix macro collision with __attribute__ ((__unused__)) in system-wide headers.
-Problem known upstream: https://bugs.libssh.org/T175
-
-Index: include/libssh/priv.h
---- include/libssh/priv.h.orig
-+++ include/libssh/priv.h
-@@ -405,20 +405,20 @@ void explicit_bzero(void *s, size_t n);
- # endif /* HAVE_FALLTHROUGH_ATTRIBUTE */
- #endif /* FALL_THROUGH */
- 
--#ifndef __unused__
-+#ifndef ssh__unused
- # ifdef HAVE_UNUSED_ATTRIBUTE
--#  define __unused__ __attribute__((unused))
-+#  define ssh__unused __attribute__((unused))
- # else /* HAVE_UNUSED_ATTRIBUTE */
--#  define __unused__
-+#  define ssh__unused
- # endif /* HAVE_UNUSED_ATTRIBUTE */
--#endif /* __unused__ */
-+#endif /* ssh__unused */
- 
- #ifndef UNUSED_PARAM
--#define UNUSED_PARAM(param) param __unused__
-+#define UNUSED_PARAM(param) param ssh__unused
- #endif /* UNUSED_PARAM */
- 
- #ifndef UNUSED_VAR
--#define UNUSED_VAR(var) __unused__ var
-+#define UNUSED_VAR(var) ssh__unused var
- #endif /* UNUSED_VAR */
- 
- void ssh_agent_state_free(void *data);