55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
|
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
|