| --- a/openssh-8.2p1+x509-12.4.3.diff 2020-03-21 11:15:05.939809371 -0700 |
| +++ b/openssh-8.2p1+x509-12.4.3.diff 2020-03-21 11:23:15.424752355 -0700 |
| @@ -39298,16 +39298,15 @@ |
| |
| install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
| install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf |
| -@@ -378,6 +379,8 @@ |
| +@@ -378,6 +379,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) |
| -@@ -386,11 +389,14 @@ |
| +@@ -386,11 +388,14 @@ |
| $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
| $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
| $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
| @@ -39326,7 +39325,7 @@ |
| $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
| $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
| $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
| -@@ -400,12 +406,12 @@ |
| +@@ -400,12 +405,12 @@ |
| $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 |
| $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 |
| $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 |
| @@ -39340,7 +39339,7 @@ |
| |
| install-sysconf: |
| $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
| -@@ -463,10 +469,9 @@ |
| +@@ -463,10 +468,9 @@ |
| -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
| -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
| -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
| @@ -39354,7 +39353,7 @@ |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
| -@@ -478,7 +483,6 @@ |
| +@@ -478,7 +482,6 @@ |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
| -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
| @@ -39362,7 +39361,7 @@ |
| |
| regress-prep: |
| $(MKDIR_P) `pwd`/regress/unittests/test_helper |
| -@@ -491,11 +495,11 @@ |
| +@@ -491,11 +494,11 @@ |
| $(MKDIR_P) `pwd`/regress/unittests/match |
| $(MKDIR_P) `pwd`/regress/unittests/utf8 |
| $(MKDIR_P) `pwd`/regress/misc/kexfuzz |
| @@ -39376,7 +39375,7 @@ |
| |
| regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) |
| $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ |
| -@@ -546,8 +550,7 @@ |
| +@@ -546,8 +549,7 @@ |
| regress/unittests/sshkey/tests.o \ |
| regress/unittests/sshkey/common.o \ |
| regress/unittests/sshkey/test_file.o \ |
| @@ -39406,7 +39405,7 @@ |
| |
| regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ |
| ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ |
| -@@ -618,35 +619,18 @@ |
| +@@ -618,35 +618,18 @@ |
| -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
| |
| MISC_KEX_FUZZ_OBJS=\ |
| @@ -39444,7 +39443,7 @@ |
| regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
| regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
| regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
| -@@ -657,36 +641,29 @@ |
| +@@ -657,36 +640,29 @@ |
| regress/unittests/utf8/test_utf8$(EXEEXT) \ |
| regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
| |
| @@ -39501,7 +39500,7 @@ |
| TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ |
| TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ |
| TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ |
| -@@ -708,8 +685,6 @@ |
| +@@ -708,8 +684,6 @@ |
| TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ |
| TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ |
| TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ |
| @@ -39510,7 +39509,7 @@ |
| TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ |
| TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ |
| TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ |
| -@@ -717,17 +692,35 @@ |
| +@@ -717,17 +691,35 @@ |
| TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ |
| TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ |
| TEST_SSH_ECC="$${TEST_SSH_ECC}" \ |
| @@ -39549,7 +39548,7 @@ |
| |
| survey: survey.sh ssh |
| @$(SHELL) ./survey.sh > survey |
| -@@ -743,4 +736,8 @@ |
| +@@ -743,4 +735,8 @@ |
| sh buildpkg.sh; \ |
| fi |
| |
| @@ -98215,16 +98214,6 @@ |
| + return mbtowc(NULL, s, n); |
| +} |
| +#endif |
| -diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.3/version.h |
| ---- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 |
| -+++ openssh-8.2p1+x509-12.4.3/version.h 2020-03-21 19:07:00.000000000 +0200 |
| -@@ -2,5 +2,4 @@ |
| - |
| - #define SSH_VERSION "OpenSSH_8.2" |
| - |
| --#define SSH_PORTABLE "p1" |
| --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| -+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.3/version.m4 |
| --- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| +++ openssh-8.2p1+x509-12.4.3/version.m4 2020-03-21 19:07:00.000000000 +0200 |
