From 2fd46d9450af7fd0496add3cc8d241d1b839da36 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Thu, 5 Nov 2020 22:32:30 +0000
Subject: [PATCH] Replace local patch with merged upstream one

While here, pick another fix I submitteed.
---
 sysutils/tmate/Makefile                         |  9 +++++++--
 sysutils/tmate/distinfo                         |  4 ++++
 sysutils/tmate/patches/patch-tmate-session_c    | 15 ---------------
 sysutils/tmate/patches/patch-tmate-ssh-client_c | 15 ---------------
 4 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 sysutils/tmate/patches/patch-tmate-session_c
 delete mode 100644 sysutils/tmate/patches/patch-tmate-ssh-client_c

diff --git a/sysutils/tmate/Makefile b/sysutils/tmate/Makefile
index 92911ec2a2b..5fe409ad05e 100644
--- a/sysutils/tmate/Makefile
+++ b/sysutils/tmate/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2020/04/02 16:09:26 kn Exp $
+# $OpenBSD: Makefile,v 1.15 2020/11/05 22:32:30 kn Exp $
 
 COMMENT =	instant terminal sharing based on tmux
 
@@ -6,7 +6,12 @@ GH_ACCOUNT =	tmate-io
 GH_PROJECT =	tmate
 GH_TAGNAME =	2.4.0
 CATEGORIES =	sysutils
-REVISION =	2
+REVISION =	3
+
+MASTER_SITES0 =	https://github.com/tmate-io/tmate/commit/
+PATCHFILES =	tmate-bad-fingerprint{cbec43f56dfb48c2fb6e00faa2cb85443d4b7d8f}.patch:0 \
+		tmate-include-errno{339e6c43575244f72831654e5dda41c037febde7}.patch:0 \
+PATCH_DIST_STRIP =	-p1
 
 HOMEPAGE =	https://tmate.io
 
diff --git a/sysutils/tmate/distinfo b/sysutils/tmate/distinfo
index 31d10e9467d..b04371298d4 100644
--- a/sysutils/tmate/distinfo
+++ b/sysutils/tmate/distinfo
@@ -1,2 +1,6 @@
 SHA256 (tmate-2.4.0.tar.gz) = YrYesSqzlAEshh9rSLoLwErIdlq8oTvd5aTZEFyxYTg=
+SHA256 (tmate-bad-fingerprint.patch) = cdXuCBvF/ZyNmMl2Hjlifc5tPYY3cbhkE/3jK7qaaww=
+SHA256 (tmate-include-errno.patch) = OJ/d0IlufWPXXjGuHVo7yKoxAVHsDUv6I/Xu0s/6E38=
 SIZE (tmate-2.4.0.tar.gz) = 614179
+SIZE (tmate-bad-fingerprint.patch) = 1314
+SIZE (tmate-include-errno.patch) = 1007
diff --git a/sysutils/tmate/patches/patch-tmate-session_c b/sysutils/tmate/patches/patch-tmate-session_c
deleted file mode 100644
index 6cce6f601a7..00000000000
--- a/sysutils/tmate/patches/patch-tmate-session_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tmate-session_c,v 1.2 2020/03/27 01:32:06 kn Exp $
-
-Add missing <errno.h>, send_authorized_keys() uses it.
-
-Index: tmate-session.c
---- tmate-session.c.orig
-+++ tmate-session.c
-@@ -5,6 +5,7 @@
- #include <netinet/in.h>
- #include <sys/socket.h>
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/sysutils/tmate/patches/patch-tmate-ssh-client_c b/sysutils/tmate/patches/patch-tmate-ssh-client_c
deleted file mode 100644
index 72b4e311782..00000000000
--- a/sysutils/tmate/patches/patch-tmate-ssh-client_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tmate-ssh-client_c,v 1.3 2020/03/28 17:19:09 kn Exp $
-
-Add missing <errno.h>, the SSO() macro uses it.
-
-Index: tmate-ssh-client.c
---- tmate-ssh-client.c.orig
-+++ tmate-ssh-client.c
-@@ -1,6 +1,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <event2/event.h>