From 4ae7035e867c640c4aca0ac9aae5062790d175a0 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 25 Jul 2018 17:12:35 +0000
Subject: [PATCH] Don't redefine Makefile choices which come correct from
 bsd.*.mk ok markus

---
 usr.bin/ssh/scp/Makefile               | 5 +----
 usr.bin/ssh/sftp-server/Makefile       | 5 +----
 usr.bin/ssh/sftp/Makefile              | 5 +----
 usr.bin/ssh/ssh-add/Makefile           | 5 +----
 usr.bin/ssh/ssh-agent/Makefile         | 5 ++---
 usr.bin/ssh/ssh-keygen/Makefile        | 5 +----
 usr.bin/ssh/ssh-keyscan/Makefile       | 5 +----
 usr.bin/ssh/ssh-keysign/Makefile       | 5 ++---
 usr.bin/ssh/ssh-pkcs11-helper/Makefile | 5 +----
 usr.bin/ssh/ssh/Makefile               | 5 +----
 usr.bin/ssh/sshd/Makefile              | 4 +---
 11 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/usr.bin/ssh/scp/Makefile b/usr.bin/ssh/scp/Makefile
index 369bfa5416c..4f0c3f4f980 100644
--- a/usr.bin/ssh/scp/Makefile
+++ b/usr.bin/ssh/scp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2018/01/08 15:37:22 markus Exp $
+#	$OpenBSD: Makefile,v 1.21 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	atomicio.c cleanup.c fatal.c progressmeter.c utf8.c
 SRCS+=	${SRCS_BASE}
 
 PROG=	scp
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/sftp-server/Makefile b/usr.bin/ssh/sftp-server/Makefile
index 3db4d11418a..7a0c3f87861 100644
--- a/usr.bin/ssh/sftp-server/Makefile
+++ b/usr.bin/ssh/sftp-server/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2018/01/08 15:37:23 markus Exp $
+#	$OpenBSD: Makefile,v 1.12 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	fatal.c
 SRCS+=	${SRCS_BASE} ${SRCS_UTL}
 
 PROG=	sftp-server
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/libexec
 MAN=	sftp-server.8
diff --git a/usr.bin/ssh/sftp/Makefile b/usr.bin/ssh/sftp/Makefile
index d7b48beaa44..35f907e46a4 100644
--- a/usr.bin/ssh/sftp/Makefile
+++ b/usr.bin/ssh/sftp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2018/01/08 15:37:24 markus Exp $
+#	$OpenBSD: Makefile,v 1.17 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	atomicio.c cleanup.c fatal.c progressmeter.c utf8.c
 SRCS+=	${SRCS_BASE}
 
 PROG=	sftp
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/ssh-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
index a3fe494a19d..da778a9f060 100644
--- a/usr.bin/ssh/ssh-add/Makefile
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2018/01/08 15:37:25 markus Exp $
+#	$OpenBSD: Makefile,v 1.25 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	atomicio.c authfd.c cleanup.c fatal.c readpass.c
 SRCS+=	${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL}
 
 PROG=	ssh-add
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile
index 17730f4be33..dadb2226eba 100644
--- a/usr.bin/ssh/ssh-agent/Makefile
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2018/07/11 18:53:29 markus Exp $
+#	$OpenBSD: Makefile,v 1.31 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -8,8 +8,7 @@ SRCS+=	${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL}
 PROG=	ssh-agent
 BINOWN=	root
 BINGRP=	_sshagnt
-
-BINMODE?=2555
+BINMODE=2555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/ssh-keygen/Makefile b/usr.bin/ssh/ssh-keygen/Makefile
index e7325fecbcf..4eb9d612145 100644
--- a/usr.bin/ssh/ssh-keygen/Makefile
+++ b/usr.bin/ssh/ssh-keygen/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2018/01/08 15:37:27 markus Exp $
+#	$OpenBSD: Makefile,v 1.27 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -9,9 +9,6 @@ SRCS+=	${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL} \
 	${SRCS_PKCS11}
 
 PROG=	ssh-keygen
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/ssh-keyscan/Makefile b/usr.bin/ssh/ssh-keyscan/Makefile
index 22759ec944f..fee2b045c71 100644
--- a/usr.bin/ssh/ssh-keyscan/Makefile
+++ b/usr.bin/ssh/ssh-keyscan/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2018/02/23 05:14:05 djm Exp $
+#	$OpenBSD: Makefile,v 1.13 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	atomicio.c cleanup.c compat.c hostfile.c ssh_api.c dns.c
 SRCS+=	${SRCS_BASE} ${SRCS_KEX} ${SRCS_KEXC} ${SRCS_KEXS} ${SRCS_KEY} \
 	${SRCS_PKT} ${SRCS_UTL}
 PROG=	ssh-keyscan
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/bin
 
diff --git a/usr.bin/ssh/ssh-keysign/Makefile b/usr.bin/ssh/ssh-keysign/Makefile
index ef3ea8f390d..aaaacd244da 100644
--- a/usr.bin/ssh/ssh-keysign/Makefile
+++ b/usr.bin/ssh/ssh-keysign/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2018/07/18 11:34:05 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.15 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -9,8 +9,7 @@ SRCS+=	${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_PKT} \
 	${SRCS_UTL}
 PROG=	ssh-keysign
 BINOWN=	root
-
-BINMODE?=4555
+BINMODE=4555
 
 BINDIR=	/usr/libexec
 MAN=	ssh-keysign.8
diff --git a/usr.bin/ssh/ssh-pkcs11-helper/Makefile b/usr.bin/ssh/ssh-pkcs11-helper/Makefile
index 78da16530e4..72cf97c8753 100644
--- a/usr.bin/ssh/ssh-pkcs11-helper/Makefile
+++ b/usr.bin/ssh/ssh-pkcs11-helper/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2018/07/09 21:56:06 markus Exp $
+#	$OpenBSD: Makefile,v 1.8 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -7,9 +7,6 @@ SRCS+=	atomicio.c compat.c fatal.c readpass.c
 SRCS+=	${SRCS_KEY} ${SRCS_UTL} ${SRCS_BASE}
 
 PROG=	ssh-pkcs11-helper
-BINOWN=	root
-
-BINMODE?=555
 
 BINDIR=	/usr/libexec
 MAN=	ssh-pkcs11-helper.8
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 19b8110f4bf..cdfe5c58ce4 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.74 2018/07/11 18:53:29 markus Exp $
+#	$OpenBSD: Makefile,v 1.75 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -9,9 +9,6 @@ SRCS+=	${SRCS_BASE} ${SRCS_KEX} ${SRCS_KEXC} ${SRCS_KEY} ${SRCS_KEYP} \
 	${SRCS_KRL} ${SRCS_PROT} ${SRCS_PKT} ${SRCS_UTL} ${SRCS_PKCS11}
 
 PROG=	ssh
-BINOWN=	root
-
-#BINMODE?=4555
 
 BINDIR=	/usr/bin
 MAN=	ssh.1 ssh_config.5
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index c8ad0a11149..09aad4c0d4b 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.98 2018/07/18 11:34:05 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.99 2018/07/25 17:12:35 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -13,8 +13,6 @@ SRCS+=	${SRCS_BASE} ${SRCS_KEX} ${SRCS_KEXS} ${SRCS_KEY} ${SRCS_KEYP} \
 	${SRCS_KRL} ${SRCS_PROT} ${SRCS_PKT} ${SRCS_UTL} ${SRCS_PKCS11}
 
 PROG=	sshd
-BINOWN=	root
-BINMODE=555
 BINDIR=	/usr/sbin
 MAN=	sshd.8 sshd_config.5
 
-- 
2.20.1