diff options
Diffstat (limited to 'net-misc/openssh/openssh-5.3_p1-r1.ebuild')
| -rw-r--r-- | net-misc/openssh/openssh-5.3_p1-r1.ebuild | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net-misc/openssh/openssh-5.3_p1-r1.ebuild b/net-misc/openssh/openssh-5.3_p1-r1.ebuild index ec59ec8..d446ff7 100644 --- a/net-misc/openssh/openssh-5.3_p1-r1.ebuild +++ b/net-misc/openssh/openssh-5.3_p1-r1.ebuild @@ -76,6 +76,11 @@ src_unpack() { -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ pathnames.h || die + # <mike> + # Apply Simon Wilkinson's kext patch + patch -p1 < ${FILESDIR}/${PN}-5.3p1-gsskex-all-20100124.patch + # </mike> + if use pkcs11 ; then cd "${WORKDIR}" unpack "${PKCS11_PATCH}" @@ -106,7 +111,13 @@ src_unpack() { else use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap" fi - epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + # <mike> + # Here I comment out the dns.patch, which is incompatible with Simon's patch. + # for more, see: + # https://bugzilla.mindrot.org/show_bug.cgi?id=1008 + # http://bugs.gentoo.org/show_bug.cgi?id=165444 + # epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + # </mike> [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665 epatch "${FILESDIR}"/${PN}-5.2_p1-autoconf.patch |