From 646cad4e854e85d59e6bb7ffff10b030b0281024 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 21 Aug 2021 08:59:33 +0200
Subject: [PATCH] openssh: update to 8.7p1

---
 openssh/build.sh       | 6 +++---
 openssh/meta/ChangeLog | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/openssh/build.sh b/openssh/build.sh
index 54f3de0..ad884a1 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -6,11 +6,11 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=8.6p1
+version=8.7p1
 pkgver=1
 source[0]=https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=openssh-8.6-no-stdint_h.patch
+#patch[0]=
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -18,7 +18,7 @@ patch[0]=openssh-8.6-no-stdint_h.patch
 # Global settings
 export LDFLAGS="-R$prefix/lib -L$prefix/lib"
 export CPPFLAGS="-I$prefix/include"
-export CC="gcc -D__EXTENSIONS__ -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
+export CC=gcc
 make_check_target="tests"
 
 configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=man --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check)
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
index 508f6b5..9d76f2e 100644
--- a/openssh/meta/ChangeLog
+++ b/openssh/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Fri Aug 20 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 8.7p1-1
+- Update to 8.7p1
+
 * Sat May 08 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 8.6p1-1
 - Update to 8.6p1