Index: Makefile.in
--- Makefile.in.orig	2019-04-18 00:52:57.000000000 +0200
+++ Makefile.in	2019-04-19 21:08:15.407634000 +0200
@@ -320,7 +320,7 @@
 	$(AUTORECONF)
 	-rm -rf autom4te.cache .depend.bak
 
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
 install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
 install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
 
Index: auth-pam.c
--- auth-pam.c.orig	2019-04-18 00:52:57.000000000 +0200
+++ auth-pam.c	2019-04-19 21:08:15.408369000 +0200
@@ -68,7 +68,7 @@
 
 #if !defined(SSHD_PAM_SERVICE)
 extern char *__progname;
-# define SSHD_PAM_SERVICE		__progname
+# define SSHD_PAM_SERVICE		"openssh"
 #endif
 
 /* OpenGroup RFC86.0 and XSSO specify no "const" on arguments */
Index: configure
--- configure.orig	2019-04-18 00:54:02.000000000 +0200
+++ configure	2019-04-19 21:08:15.412544000 +0200
@@ -10920,7 +10920,6 @@
 	strmode \
 	strndup \
 	strnlen \
-	strnvis \
 	strptime \
 	strsignal \
 	strtonum \
Index: openbsd-compat/bsd-openpty.c
--- openbsd-compat/bsd-openpty.c.orig	2019-04-18 00:52:57.000000000 +0200
+++ openbsd-compat/bsd-openpty.c	2019-04-19 21:08:15.413039000 +0200
@@ -90,7 +90,7 @@
 	}
 	return (0);
 
-#elif defined(HAVE_DEV_PTMX)
+#elif defined(HAVE_DEV_PTMX) && defined(I_PUSH)
 	/*
 	 * This code is used e.g. on Solaris 2.x.  (Note that Solaris 2.3
 	 * also has bsd-style ptys, but they simply do not work.)
Index: version.h
--- version.h.orig	2019-04-18 00:52:57.000000000 +0200
+++ version.h	2019-04-19 21:08:15.413378000 +0200
@@ -3,4 +3,4 @@
 #define SSH_VERSION	"OpenSSH_8.0"
 
 #define SSH_PORTABLE	"p1"
-#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"