22 files changed, 10 insertions, 20 deletions

diff --git a/security/openssh/files/patch-Makefile b/security/openssh/files/patch-Makefile
new file mode 100644
index 000000000000..9eb818815b35
--- /dev/null
+++ b/security/openssh/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile.orig	Tue Mar 12 08:36:18 2002
++++ Makefile	Tue Mar 12 08:52:48 2002
+@@ -1,6 +1,7 @@
+ #	$OpenBSD: Makefile,v 1.10 2002/02/09 17:37:34 deraadt Exp $
+ 
+ .include <bsd.own.mk>
++.include "Makefile.inc"
+ 
+ SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
+ 	ssh-keyscan sftp scard
diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-Makefile.inc
index d4874c8b85c7..d4874c8b85c7 100644
--- a/security/openssh/files/patch-ab
+++ b/security/openssh/files/patch-Makefile.inc
diff --git a/security/openssh/files/patch-aa b/security/openssh/files/patch-aa
deleted file mode 100644
index f3ef9a1aac9d..000000000000
--- a/security/openssh/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Thu Jun 28 23:55:27 2001
-+++ Makefile	Wed Oct  3 12:17:35 2001
-@@ -1,14 +1,15 @@
- #	$OpenBSD: Makefile,v 1.9 2001/06/28 21:55:27 markus Exp $
- 
- .include <bsd.own.mk>
-+.include "Makefile.inc"
- 
- SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
- 	ssh-keyscan sftp scard
- 
- distribution:
--	install -C -o root -g wheel -m 0644 ${.CURDIR}/ssh_config \
-+	install -c -o root -g wheel -m 0644 ${.CURDIR}/ssh_config \
- 	    ${DESTDIR}/etc/ssh_config
--	install -C -o root -g wheel -m 0644 ${.CURDIR}/sshd_config \
-+	install -c -o root -g wheel -m 0644 ${.CURDIR}/sshd_config \
- 	    ${DESTDIR}/etc/sshd_config
- 
- .include <bsd.subdir.mk>
diff --git a/security/openssh/files/patch-av b/security/openssh/files/patch-auth.c
index 446b88f8c8a3..446b88f8c8a3 100644
--- a/security/openssh/files/patch-av
+++ b/security/openssh/files/patch-auth.c
diff --git a/security/openssh/files/patch-ap b/security/openssh/files/patch-clientloop.c
index 67fc4dcb4f6b..67fc4dcb4f6b 100644
--- a/security/openssh/files/patch-ap
+++ b/security/openssh/files/patch-clientloop.c
diff --git a/security/openssh/files/patch-ac b/security/openssh/files/patch-includes.h
index f110376005d8..f110376005d8 100644
--- a/security/openssh/files/patch-ac
+++ b/security/openssh/files/patch-includes.h
diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-lib-Makefile
index f3bbcbbe37d3..f3bbcbbe37d3 100644
--- a/security/openssh/files/patch-ad
+++ b/security/openssh/files/patch-lib-Makefile
diff --git a/security/openssh/files/patch-al b/security/openssh/files/patch-pathnames.h
index 0eb763623833..0eb763623833 100644
--- a/security/openssh/files/patch-al
+++ b/security/openssh/files/patch-pathnames.h
diff --git a/security/openssh/files/patch-af b/security/openssh/files/patch-scp-Makefile
index 0c181dd81cd0..0c181dd81cd0 100644
--- a/security/openssh/files/patch-af
+++ b/security/openssh/files/patch-scp-Makefile
diff --git a/security/openssh/files/patch-au b/security/openssh/files/patch-session.c
index abb20c8ac770..abb20c8ac770 100644
--- a/security/openssh/files/patch-au
+++ b/security/openssh/files/patch-session.c
diff --git a/security/openssh/files/patch-ag b/security/openssh/files/patch-ssh-Makefile
index 6971b0cfacf1..6971b0cfacf1 100644
--- a/security/openssh/files/patch-ag
+++ b/security/openssh/files/patch-ssh-Makefile
diff --git a/security/openssh/files/patch-ah b/security/openssh/files/patch-ssh-add-Makefile
index e8998f956c92..e8998f956c92 100644
--- a/security/openssh/files/patch-ah
+++ b/security/openssh/files/patch-ssh-add-Makefile
diff --git a/security/openssh/files/patch-ai b/security/openssh/files/patch-ssh-agent-Makefile
index c1a75662404e..c1a75662404e 100644
--- a/security/openssh/files/patch-ai
+++ b/security/openssh/files/patch-ssh-agent-Makefile
diff --git a/security/openssh/files/patch-aj b/security/openssh/files/patch-ssh-keygen-Makefile
index 1ed89ae0966e..1ed89ae0966e 100644
--- a/security/openssh/files/patch-aj
+++ b/security/openssh/files/patch-ssh-keygen-Makefile
diff --git a/security/openssh/files/patch-ak b/security/openssh/files/patch-ssh.c
index a55517683cfa..a55517683cfa 100644
--- a/security/openssh/files/patch-ak
+++ b/security/openssh/files/patch-ssh.c
diff --git a/security/openssh/files/patch-at b/security/openssh/files/patch-sshconnect.c
index 3b0017faab5b..3b0017faab5b 100644
--- a/security/openssh/files/patch-at
+++ b/security/openssh/files/patch-sshconnect.c
diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-sshd-Makefile
index 07528232bb5a..07528232bb5a 100644
--- a/security/openssh/files/patch-am
+++ b/security/openssh/files/patch-sshd-Makefile
diff --git a/security/openssh/files/patch-ar b/security/openssh/files/patch-sshd.8
index 18d5e5dd73f6..18d5e5dd73f6 100644
--- a/security/openssh/files/patch-ar
+++ b/security/openssh/files/patch-sshd.8
diff --git a/security/openssh/files/patch-an b/security/openssh/files/patch-sshd.c
index e5f14e469d89..e5f14e469d89 100644
--- a/security/openssh/files/patch-an
+++ b/security/openssh/files/patch-sshd.c
diff --git a/security/openssh/files/patch-ao b/security/openssh/files/patch-sshd_config
index 13df05806802..13df05806802 100644
--- a/security/openssh/files/patch-ao
+++ b/security/openssh/files/patch-sshd_config
diff --git a/security/openssh/files/patch-ae b/security/openssh/files/patch-sshlogin.c
index 91b4d3f1ebdd..91b4d3f1ebdd 100644
--- a/security/openssh/files/patch-ae
+++ b/security/openssh/files/patch-sshlogin.c
diff --git a/security/openssh/files/patch-as b/security/openssh/files/patch-sshpty.c
index 779f890a1493..779f890a1493 100644
--- a/security/openssh/files/patch-as
+++ b/security/openssh/files/patch-sshpty.c