diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-07-31 11:41:04 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-07-31 11:41:19 -0700 |
| commit | eaf0a3123c2d98d8a7c6f3a46f6565577cf0d11a (patch) | |
| tree | b246396980382ee40d520b951d3e156063b352be /net-misc/openssh | |
| parent | games-emulation/zsnes: remove unused patches (diff) | |
| download | gentoo-eaf0a3123c2d98d8a7c6f3a46f6565577cf0d11a.tar.gz gentoo-eaf0a3123c2d98d8a7c6f3a46f6565577cf0d11a.tar.bz2 gentoo-eaf0a3123c2d98d8a7c6f3a46f6565577cf0d11a.zip | |
net-misc/openssh-8.3_p1-r4: Add workaround libmd bug 734984
Bug: https://bugs.gentoo.org/734984
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch | 13 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.3_p1-r4.ebuild | 3 |
2 files changed, 16 insertions, 0 deletions
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 new file mode 100644 index 000000000000..6bd716619701 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index c9e4294d..2dbfac24 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,7 +44,7 @@ CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ + CFLAGS_NOPIE=@CFLAGS_NOPIE@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@ + PICFLAG=@PICFLAG@ + LIBS=@LIBS@ + K5LIBS=@K5LIBS@ diff --git a/net-misc/openssh/openssh-8.3_p1-r4.ebuild b/net-misc/openssh/openssh-8.3_p1-r4.ebuild index a3d261036a76..6e93d57cf890 100644 --- a/net-misc/openssh/openssh-8.3_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.3_p1-r4.ebuild @@ -137,6 +137,9 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + # workaround for https://bugs.gentoo.org/734984 + use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches local PATCHSET_VERSION_MACROS=() |