diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2018-12-19 16:50:43 -0800 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2018-12-19 16:50:43 -0800 |
| commit | 9a5c54094bd4d908968c284152346ff9bdcd0f16 (patch) | |
| tree | ea3a69ac3b5a27abcba26f80e74f84a4f0a4a6ca /net-misc/openssh/files | |
| parent | sys-kernel/vanilla-sources: Version bump to 4.19.11 (diff) | |
| download | gentoo-9a5c54094bd4d908968c284152346ff9bdcd0f16.tar.gz gentoo-9a5c54094bd4d908968c284152346ff9bdcd0f16.tar.bz2 gentoo-9a5c54094bd4d908968c284152346ff9bdcd0f16.zip | |
net-misc/openssh: Revbump to 7.9_p1-r1, update X509 patch to 11.6
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh/files')
3 files changed, 56 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch new file mode 100644 index 000000000000..9766b1594ea0 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch @@ -0,0 +1,12 @@ +diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in +--- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in 2018-10-16 17:01:20.000000000 -0700 ++++ openssh-7.9p1/openbsd-compat/regress/Makefile.in 2018-12-19 11:03:14.421028691 -0800 +@@ -7,7 +7,7 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ ++CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@ + EXEEXT=@EXEEXT@ + LIBCOMPAT=../libopenbsd-compat.a + LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch new file mode 100644 index 000000000000..487b239639a1 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch @@ -0,0 +1,16 @@ +--- a/openssh-7.9p1+x509-11.6.diff 2018-12-07 17:24:03.211328918 -0800 ++++ b/openssh-7.9p1+x509-11.6.diff 2018-12-07 17:24:13.399262277 -0800 +@@ -40681,12 +40681,11 @@ + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf +-@@ -333,6 +351,8 @@ ++@@ -333,6 +351,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) diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch new file mode 100644 index 000000000000..b807ac45f79f --- /dev/null +++ b/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch @@ -0,0 +1,28 @@ +--- a/openssh-7.9p1+x509-11.6.diff 2018-12-19 10:42:01.241775036 -0800 ++++ b/openssh-7.9p1+x509-11.6.diff 2018-12-19 10:43:33.383140818 -0800 +@@ -45862,7 +45862,7 @@ + ENGINE_register_all_complete(); + +#endif + +--#if OPENSSL_VERSION_NUMBER < 0x10001000L ++-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + /* OPENSSL_config will load buildin engines and engines + + * specified in configuration file, i.e. method call + + * ENGINE_load_builtin_engines. Latter is only for +@@ -81123,16 +81123,6 @@ + setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL)) + return; + setlocale(LC_CTYPE, "C"); +-diff -ruN openssh-7.9p1/version.h openssh-7.9p1+x509-11.6/version.h +---- openssh-7.9p1/version.h 2018-10-17 03:01:20.000000000 +0300 +-+++ openssh-7.9p1+x509-11.6/version.h 2018-12-18 20:07:00.000000000 +0200 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_7.9" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-7.9p1/version.m4 openssh-7.9p1+x509-11.6/version.m4 + --- openssh-7.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-7.9p1+x509-11.6/version.m4 2018-12-18 20:07:00.000000000 +0200 |