From b37e755e80c9868dfde8ae55d799daed82483c3f Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Tue, 26 Jan 2021 23:21:22 -1000
Subject: Update openssh to 8.4p1

---
 data/openssh/_metadata/version      |   2 +-
 data/openssh/com.openssh.sshd.plist |   2 ++
 data/openssh/dirent.diff            |  39 ++++++++++--------------------------
 data/openssh/openssh-8.3p1.tar.gz   | Bin 1706358 -> 0 bytes
 data/openssh/openssh-8.4p1.tar.gz   | Bin 0 -> 1742201 bytes
 5 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 data/openssh/openssh-8.3p1.tar.gz
 create mode 100644 data/openssh/openssh-8.4p1.tar.gz

diff --git a/data/openssh/_metadata/version b/data/openssh/_metadata/version
index cf022018d..c9dc04908 100644
--- a/data/openssh/_metadata/version
+++ b/data/openssh/_metadata/version
@@ -1 +1 @@
-8.3
+8.4
diff --git a/data/openssh/com.openssh.sshd.plist b/data/openssh/com.openssh.sshd.plist
index 5a655eb19..450056bd6 100644
--- a/data/openssh/com.openssh.sshd.plist
+++ b/data/openssh/com.openssh.sshd.plist
@@ -8,6 +8,8 @@
 	<string>com.openssh.sshd</string>
 	<key>POSIXSpawnType</key>
 	<string>Interactive</string>
+        <key>EnablePressuredExit</key>
+        <false/>
 	<key>Program</key>
 	<string>/bin/sh</string>
 	<key>ProgramArguments</key>
diff --git a/data/openssh/dirent.diff b/data/openssh/dirent.diff
index 68f851767..2d5238250 100644
--- a/data/openssh/dirent.diff
+++ b/data/openssh/dirent.diff
@@ -1,31 +1,14 @@
-diff -ru openssh-6.0p1/configure.ac openssh-6.0p1+iPhone/configure.ac
---- openssh-6.0p1/configure.ac	2012-04-19 11:46:38.000000000 +0000
-+++ openssh-6.0p1+iPhone/configure.ac	2012-05-15 09:18:25.000000000 +0000
-@@ -1235,26 +1235,7 @@
- AC_CHECK_DECLS([GLOB_NOMATCH], , , [#include <glob.h>])
- 
- AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([[
--#include <sys/types.h>
--#include <dirent.h>]],
--	[[
--	struct dirent d;
--	exit(sizeof(d.d_name)<=sizeof(char));
--	]])],
--	[AC_MSG_RESULT([yes])],
--	[
--		AC_MSG_RESULT([no])
--		AC_DEFINE([BROKEN_ONE_BYTE_DIRENT_D_NAME], [1],
--			[Define if your struct dirent expects you to
--			allocate extra space for d_name])
--	],
--	[
+diff -ur openssh-8.4p1/configure.ac openssh-8.4p1+iOS/configure.ac
+--- openssh-8.4p1/configure.ac	2021-01-26 23:09:30.000000000 -1000
++++ openssh-8.4p1+iOS/configure.ac	2020-09-26 21:25:01.000000000 -1000
+@@ -1534,8 +1534,8 @@
+ 			allocate extra space for d_name])
+ 	],
+ 	[
 -		AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME])
 -		AC_DEFINE([BROKEN_ONE_BYTE_DIRENT_D_NAME])
--	]
--)
-+AC_MSG_RESULT([yes])
++		AC_MSG_WARN([cross compiling: assuming yes])
++		AC_MSG_RESULT([yes])
+ 	]
+ )
  
- AC_MSG_CHECKING([for /proc/pid/fd directory])
- if test -d "/proc/$$/fd" ; then
diff --git a/data/openssh/openssh-8.3p1.tar.gz b/data/openssh/openssh-8.3p1.tar.gz
deleted file mode 100644
index 5e94fbfd4..000000000
Binary files a/data/openssh/openssh-8.3p1.tar.gz and /dev/null differ
diff --git a/data/openssh/openssh-8.4p1.tar.gz b/data/openssh/openssh-8.4p1.tar.gz
new file mode 100644
index 000000000..ec913a33a
Binary files /dev/null and b/data/openssh/openssh-8.4p1.tar.gz differ
-- 
cgit v1.2.3