| 1 |
commit: fe272e74d62b707e8083fecac8ca667760d0dc16 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Sat Dec 8 01:27:20 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 01:27:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe272e74 |
| 7 |
|
| 8 |
net-misc/openssh: Fix X509+libressl-2.8 and remove /run in 7.9_p1 |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/openssh-7.9_p1-X509-dont-make-piddir.patch | 16 ++++++++++++++++ |
| 15 |
net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch | 16 ++++++++++++++++ |
| 16 |
net-misc/openssh/openssh-7.9_p1.ebuild | 3 +++ |
| 17 |
3 files changed, 35 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..c30ca278544 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+--- a/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:03.211328918 -0800 |
| 26 |
++++ b/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:13.399262277 -0800 |
| 27 |
+@@ -40681,12 +40681,11 @@ |
| 28 |
+ |
| 29 |
+ install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
| 30 |
+ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf |
| 31 |
+-@@ -333,6 +351,8 @@ |
| 32 |
++@@ -333,6 +351,7 @@ |
| 33 |
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
| 34 |
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
| 35 |
+ $(MKDIR_P) $(DESTDIR)$(libexecdir) |
| 36 |
+ + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
| 37 |
+-+ $(MKDIR_P) $(DESTDIR)$(piddir) |
| 38 |
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| 39 |
+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| 40 |
+ $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| 41 |
|
| 42 |
diff --git a/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch b/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch |
| 43 |
new file mode 100644 |
| 44 |
index 00000000000..58f3ce2922e |
| 45 |
--- /dev/null |
| 46 |
+++ b/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch |
| 47 |
@@ -0,0 +1,16 @@ |
| 48 |
+--- openssh-7.9p1.orig/evp-compat.h 2018-12-07 17:07:37.929762570 -0800 |
| 49 |
++++ openssh-7.9p1/evp-compat.h 2018-12-07 17:08:03.923592845 -0800 |
| 50 |
+@@ -100,11 +100,13 @@ |
| 51 |
+ } |
| 52 |
+ |
| 53 |
+ |
| 54 |
++#if LIBRESSL_VERSION_NUMBER < 0x20800000L |
| 55 |
+ static inline int |
| 56 |
+ EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) |
| 57 |
+ { |
| 58 |
+ return(ctx->encrypt); |
| 59 |
+ } |
| 60 |
++#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */ |
| 61 |
+ |
| 62 |
+ |
| 63 |
+ static inline void* |
| 64 |
|
| 65 |
diff --git a/net-misc/openssh/openssh-7.9_p1.ebuild b/net-misc/openssh/openssh-7.9_p1.ebuild |
| 66 |
index 83ff7a4d299..a8cacd6542e 100644 |
| 67 |
--- a/net-misc/openssh/openssh-7.9_p1.ebuild |
| 68 |
+++ b/net-misc/openssh/openssh-7.9_p1.ebuild |
| 69 |
@@ -124,9 +124,11 @@ src_prepare() { |
| 70 |
if use X509 ; then |
| 71 |
pushd "${WORKDIR}" || die |
| 72 |
eapply "${FILESDIR}/${P}-X509-glue.patch" |
| 73 |
+ eapply "${FILESDIR}/${P}-X509-dont-make-piddir.patch" |
| 74 |
popd || die |
| 75 |
|
| 76 |
eapply "${WORKDIR}"/${X509_PATCH%.*} |
| 77 |
+ eapply "${FILESDIR}"/${PN}-7.9_p1-libressl-2.8.patch |
| 78 |
|
| 79 |
# We need to patch package version or any X.509 sshd will reject our ssh client |
| 80 |
# with "userauth_pubkey: could not parse key: string is too large [preauth]" |
| 81 |
@@ -389,6 +391,7 @@ src_install() { |
| 82 |
|
| 83 |
systemd_dounit "${FILESDIR}"/sshd.{service,socket} |
| 84 |
systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' |
| 85 |
+ ls -la "${D}"/run |
| 86 |
} |
| 87 |
|
| 88 |
pkg_preinst() { |
Archives