diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-06-08 10:48:47 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-06-08 10:49:12 -0700 |
| commit | 66c2c7c046adce70edfde5dc7c9d8256b4dd8ccb (patch) | |
| tree | 26332ef8383a24a6bb92e7f277118ecce91d7f16 /net-misc/openssh/files | |
| parent | dev-util/edb-debugger: tweak for qt-5.15 (diff) | |
| download | gentoo-66c2c7c046adce70edfde5dc7c9d8256b4dd8ccb.tar.gz gentoo-66c2c7c046adce70edfde5dc7c9d8256b4dd8ccb.tar.bz2 gentoo-66c2c7c046adce70edfde5dc7c9d8256b4dd8ccb.zip | |
net-misc/openssh-8.3_p1-r2: revbump, bump X509 patch to 12.5.1
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch (renamed from net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch) | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch index d0de761fb80b..d1651bc187f1 100644 --- a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch +++ b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch @@ -1,11 +1,13 @@ ---- a/openssh-8.3p1+x509-12.5.diff 2020-05-31 11:50:58.817094112 -0700 -+++ b/openssh-8.3p1+x509-12.5.diff 2020-05-31 12:29:49.165030176 -0700 -@@ -35457,12 +35457,11 @@ +Only in b: .openssh-8.3p1+x509-12.5.1.diff.un~ +diff -u a/openssh-8.3p1+x509-12.5.1.diff b/openssh-8.3p1+x509-12.5.1.diff +--- a/openssh-8.3p1+x509-12.5.1.diff 2020-06-08 10:13:08.937543708 -0700 ++++ b/openssh-8.3p1+x509-12.5.1.diff 2020-06-08 10:16:33.417271984 -0700 +@@ -35541,12 +35541,11 @@ install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf --@@ -382,6 +361,8 @@ -+@@ -382,6 +361,7 @@ +-@@ -382,6 +363,8 @@ ++@@ -382,6 +363,7 @@ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 $(MKDIR_P) $(DESTDIR)$(libexecdir) @@ -14,13 +16,13 @@ $(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) -@@ -96530,16 +96529,6 @@ +@@ -97028,16 +97027,6 @@ +int asnmprintf(char **, size_t, int *, const char *, ...) __attribute__((format(printf, 4, 5))); void msetlocale(void); --diff -ruN openssh-8.3p1/version.h openssh-8.3p1+x509-12.5/version.h +-diff -ruN openssh-8.3p1/version.h openssh-8.3p1+x509-12.5.1/version.h ---- openssh-8.3p1/version.h 2020-05-27 03:38:00.000000000 +0300 --+++ openssh-8.3p1+x509-12.5/version.h 2020-05-31 18:07:00.000000000 +0300 +-+++ openssh-8.3p1+x509-12.5.1/version.h 2020-06-07 11:07:00.000000000 +0300 -@@ -2,5 +2,4 @@ - - #define SSH_VERSION "OpenSSH_8.3" @@ -28,6 +30,6 @@ --#define SSH_PORTABLE "p1" --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE -+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.3p1/version.m4 openssh-8.3p1+x509-12.5/version.m4 + diff -ruN openssh-8.3p1/version.m4 openssh-8.3p1+x509-12.5.1/version.m4 --- openssh-8.3p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.3p1+x509-12.5/version.m4 2020-05-31 18:07:00.000000000 +0300 + +++ openssh-8.3p1+x509-12.5.1/version.m4 2020-06-07 11:07:00.000000000 +0300 |