diff options
Diffstat (limited to 'net-misc/openssh/files')
-rw-r--r-- | net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch | 54 | ||||
-rw-r--r-- | net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch | 12 |
2 files changed, 66 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch new file mode 100644 index 000000000000..dc93182e1d4c --- /dev/null +++ b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch @@ -0,0 +1,54 @@ +diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.4.1.diff b/openssh-9.0p1+x509-13.4.1.diff +--- a/openssh-9.0p1+x509-13.4.1.diff 2022-06-23 10:43:33.957093896 -0700 ++++ b/openssh-9.0p1+x509-13.4.1.diff 2022-06-23 10:44:17.232396805 -0700 +@@ -48941,8 +48941,8 @@ + gss_create_empty_oid_set(&status, &oidset); + gss_add_oid_set_member(&status, ctx->oid, &oidset); + +-- if (gethostname(lname, MAXHOSTNAMELEN)) { +-+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { ++- if (gethostname(lname, HOST_NAME_MAX)) { +++ if (gethostname(lname, HOST_NAME_MAX) == -1) { + gss_release_oid_set(&status, &oidset); + return (-1); + } +@@ -57102,12 +57102,11 @@ + + install-files: + $(MKDIR_P) $(DESTDIR)$(bindir) +-@@ -395,6 +372,8 @@ ++@@ -395,6 +372,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) +@@ -78638,7 +78637,7 @@ + +if test "$sshd_type" = "pkix" ; then + + unset_arg='' + +else +-+ unset_arg=none +++ unset_arg='' + +fi + + + cat > $OBJ/sshd_config.i << _EOF +@@ -143777,16 +143776,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) + __attribute__((format(printf, 4, 5))); + void msetlocale(void); +-diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.4.1/version.h +---- openssh-9.0p1/version.h 2022-04-06 03:47:48.000000000 +0300 +-+++ openssh-9.0p1+x509-13.4.1/version.h 2022-06-23 09:07:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_9.0" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.4.1/version.m4 + --- openssh-9.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-9.0p1+x509-13.4.1/version.m4 2022-06-23 09:07:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch new file mode 100644 index 000000000000..2a83ed37d138 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch @@ -0,0 +1,12 @@ +diff -ur a/auth2.c b/auth2.c +--- a/auth2.c 2022-05-19 15:59:32.875160028 -0700 ++++ b/auth2.c 2022-05-19 16:03:44.291594908 -0700 +@@ -226,7 +226,7 @@ + int digest_alg; + size_t len; + u_char *hash; +- double delay; ++ double delay = 0; + + digest_alg = ssh_digest_maxbytes(); + if (len = ssh_digest_bytes(digest_alg) > 0) { |