| 1 |
commit: eaf0a3123c2d98d8a7c6f3a46f6565577cf0d11a |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Fri Jul 31 18:41:04 2020 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 31 18:41:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf0a312 |
| 7 |
|
| 8 |
net-misc/openssh-8.3_p1-r4: Add workaround libmd bug 734984 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/734984 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch | 13 +++++++++++++ |
| 16 |
net-misc/openssh/openssh-8.3_p1-r4.ebuild | 3 +++ |
| 17 |
2 files changed, 16 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..6bd71661970 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch |
| 24 |
@@ -0,0 +1,13 @@ |
| 25 |
+diff --git a/Makefile.in b/Makefile.in |
| 26 |
+index c9e4294d..2dbfac24 100644 |
| 27 |
+--- a/Makefile.in |
| 28 |
++++ b/Makefile.in |
| 29 |
+@@ -44,7 +44,7 @@ CC=@CC@ |
| 30 |
+ LD=@LD@ |
| 31 |
+ CFLAGS=@CFLAGS@ |
| 32 |
+ CFLAGS_NOPIE=@CFLAGS_NOPIE@ |
| 33 |
+-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
| 34 |
++CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@ |
| 35 |
+ PICFLAG=@PICFLAG@ |
| 36 |
+ LIBS=@LIBS@ |
| 37 |
+ K5LIBS=@K5LIBS@ |
| 38 |
|
| 39 |
diff --git a/net-misc/openssh/openssh-8.3_p1-r4.ebuild b/net-misc/openssh/openssh-8.3_p1-r4.ebuild |
| 40 |
index a3d261036a7..6e93d57cf89 100644 |
| 41 |
--- a/net-misc/openssh/openssh-8.3_p1-r4.ebuild |
| 42 |
+++ b/net-misc/openssh/openssh-8.3_p1-r4.ebuild |
| 43 |
@@ -137,6 +137,9 @@ src_prepare() { |
| 44 |
eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch |
| 45 |
eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch |
| 46 |
|
| 47 |
+ # workaround for https://bugs.gentoo.org/734984 |
| 48 |
+ use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch |
| 49 |
+ |
| 50 |
[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches |
| 51 |
|
| 52 |
local PATCHSET_VERSION_MACROS=() |
Archives