diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:40:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:40:06 +0100 |
| commit | 7a86906b67693cc65671d3e1476835d3a7e13092 (patch) | |
| tree | 9de1b9e2cf77833183d4e5ffab2e94d0403ef725 /net-misc/openssh/files | |
| parent | d56d144655e3785864da43c9acb6c228ef9360ae (diff) | |
gentoo resync : 22.06.2019
Diffstat (limited to 'net-misc/openssh/files')
3 files changed, 46 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.1-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.1-tests.patch new file mode 100644 index 000000000000..67a93fe2a0b1 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.0_p1-X509-12.1-tests.patch @@ -0,0 +1,11 @@ +--- a/openbsd-compat/regress/Makefile.in 2019-06-17 10:59:01.210601434 -0700 ++++ b/openbsd-compat/regress/Makefile.in 2019-06-17 10:59:18.753485852 -0700 +@@ -7,7 +7,7 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ ++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ + EXEEXT=@EXEEXT@ + LIBCOMPAT=../libopenbsd-compat.a + LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch new file mode 100644 index 000000000000..9bb081a50919 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch @@ -0,0 +1,16 @@ +--- a/openssh-8.0p1+x509-12.1.diff 2019-04-29 14:11:55.210175168 -0700 ++++ b/openssh-8.0p1+x509-12.1.diff 2019-04-29 14:12:55.603761971 -0700 +@@ -34176,12 +34176,11 @@ + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf +-@@ -334,6 +352,8 @@ ++@@ -334,6 +352,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-8.0_p1-X509-glue-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch new file mode 100644 index 000000000000..d6b6c5ac2f79 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch @@ -0,0 +1,19 @@ +--- a/openssh-8.0p1+x509-12.1.diff 2019-06-17 10:42:03.233392491 -0700 ++++ b/openssh-8.0p1+x509-12.1.diff 2019-06-17 10:42:24.696248976 -0700 +@@ -78536,16 +78536,6 @@ + + return mbtowc(NULL, s, n); + +} + +#endif +-diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.1/version.h +---- openssh-8.0p1/version.h 2019-04-18 01:52:57.000000000 +0300 +-+++ openssh-8.0p1+x509-12.1/version.h 2019-06-16 15:07:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.0" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.1/version.m4 + --- openssh-8.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.0p1+x509-12.1/version.m4 2019-06-16 15:07:00.000000000 +0300 |