diff -ur '--exclude=.*.un~' '--exclude=*.rej' '--exclude=*.orig' a/openssh-9.7p1+x509-15.0.diff b/openssh-9.7p1+x509-15.0.diff
--- a/openssh-9.7p1+x509-15.0.diff	2024-03-21 11:31:14.820721883 -0700
+++ b/openssh-9.7p1+x509-15.0.diff	2024-03-21 12:01:21.694512034 -0700
@@ -72421,12 +72421,11 @@
  
  install-files:
  	$(MKDIR_P) $(DESTDIR)$(bindir)
-@@ -391,6 +373,8 @@
+@@ -391,6 +373,7 @@
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
 +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
-+	$(MKDIR_P) $(DESTDIR)$(piddir)
  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
@@ -90390,7 +90389,7 @@
 -if ! [ -t 0 ]; then
 -	skip "conch interop tests requires a controlling terminal"
 -fi
-+$REGRESS_INTEROP_CONCH || { RESULT=1; skip "conch interop tests are not enabled"; }
++$REGRESS_INTEROP_CONCH || { RESULT=0; skip "conch interop tests are not enabled"; }
 +echo "CONCH: $CONCH" >&2
  
  start_sshd
@@ -90632,7 +90631,7 @@
 -PubkeyAcceptedAlgorithms +ssh-rsa,ssh-dss
 -HostkeyAlgorithms +ssh-rsa,ssh-dss
 -EOD
-+$REGRESS_INTEROP_DROPBEAR || { RESULT=1; skip "dropbear interop tests are not enabled"; }
++$REGRESS_INTEROP_DROPBEAR || { RESULT=0; skip "dropbear interop tests are not enabled"; }
  
  ciphers=`$DBCLIENT -c help 2>&1 | awk '/ ciphers: /{print $4}' | tr ',' ' '`
  macs=`$DBCLIENT -m help 2>&1 | awk '/ MACs: /{print $4}' | tr ',' ' '`
@@ -90682,7 +90681,7 @@
 -HostkeyAlgorithms +ssh-rsa,ssh-dss
 -EOD
 -cp $OBJ/sshd_proxy $OBJ/sshd_proxy.bak
-+$REGRESS_INTEROP_DROPBEAR || { RESULT=1; skip "dropbear interop tests are not enabled"; }
++$REGRESS_INTEROP_DROPBEAR || { RESULT=0; skip "dropbear interop tests are not enabled"; }
 +
 +cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
  
@@ -96179,7 +96178,7 @@
 +if test "$sshd_type" = "pkix" ; then
 +  unset_arg=''
 +else
-+  unset_arg=none
++  unset_arg=''
 +fi
 +
  cat > $OBJ/sshd_config.i << _EOF
@@ -98024,7 +98023,7 @@
 -	if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
 -		skip "putty interop tests not enabled"
 +	if ! $REGRESS_INTEROP_PUTTY ; then
-+		RESULT=1
++		RESULT=0
 +		skip "putty interop tests are not enabled"
  	fi
 +	echo "PLINK: $PLINK" >&2
@@ -103096,7 +103095,7 @@
  #include <linux/net.h>
  #include <linux/audit.h>
  #include <linux/filter.h>
-@@ -134,71 +132,6 @@
+@@ -134,73 +132,6 @@
  	/* reload syscall number; all rules expect it in accumulator */ \
  	BPF_STMT(BPF_LD+BPF_W+BPF_ABS, \
  		offsetof(struct seccomp_data, nr))
@@ -103156,9 +103155,11 @@
 -
 -#if defined(__NR_mmap) || defined(__NR_mmap2)
 -# ifdef MAP_FIXED_NOREPLACE
--#  define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_FIXED_NOREPLACE
+-#  define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \
+-		|MAP_NORESERVE|MAP_FIXED_NOREPLACE
 -# else
--#  define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED
+-#  define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \
+-		|MAP_NORESERVE
 -# endif /* MAP_FIXED_NOREPLACE */
 -/* Use this for both __NR_mmap and __NR_mmap2 variants */
 -# define SC_MMAP(_nr) \
@@ -168576,16 +168577,6 @@
 +int	 asnmprintf(char **, size_t, int *, const char *, ...)
  	    __attribute__((format(printf, 4, 5)));
  void	 msetlocale(void);
-diff -ruN openssh-9.7p1/version.h openssh-9.7p1+x509-15.0/version.h
---- openssh-9.7p1/version.h	2024-03-11 07:20:49.000000000 +0200
-+++ openssh-9.7p1+x509-15.0/version.h	2024-03-12 20:07:00.000000000 +0200
-@@ -2,5 +2,4 @@
- 
- #define SSH_VERSION	"OpenSSH_9.7"
- 
--#define SSH_PORTABLE	"p1"
--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
 diff -ruN openssh-9.7p1/version.m4 openssh-9.7p1+x509-15.0/version.m4
 --- openssh-9.7p1/version.m4	1970-01-01 02:00:00.000000000 +0200
 +++ openssh-9.7p1+x509-15.0/version.m4	2024-03-12 20:07:00.000000000 +0200
