diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-01 01:43:23 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-01 01:43:23 +0000 |
| commit | 1743665a1afab78698d10e47cfd046ee7f7df3c9 (patch) | |
| tree | 0da832084fd3080b8885d1034a899bacad84c048 /net-misc | |
| parent | Code cleanup and add x11-libs/libX11 to dependencies. (bug #153606) (diff) | |
| download | gentoo-2-1743665a1afab78698d10e47cfd046ee7f7df3c9.tar.gz gentoo-2-1743665a1afab78698d10e47cfd046ee7f7df3c9.tar.bz2 gentoo-2-1743665a1afab78698d10e47cfd046ee7f7df3c9.zip | |
Tweak X509 a little so HPN can apply at the sametime #151527 by Bob Reveley.
(Portage version: 2.1.2_rc1-r1)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch | 38 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.4_p1-r5.ebuild | 4 |
3 files changed, 45 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 6200b93eaa9c..203c7fb9e369 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.214 2006/10/31 19:45:29 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.215 2006/11/01 01:43:23 vapier Exp $ + + 01 Nov 2006; Mike Frysinger <vapier@gentoo.org> + +files/openssh-4.4_p1-x509-hpn-glue.patch, openssh-4.4_p1-r5.ebuild: + Tweak X509 a little so HPN can apply at the sametime #151527 by Bob Reveley. 31 Oct 2006; Danny van Dyk <kugelfang@gentoo.org> openssh-4.4_p1-r5.ebuild: diff --git a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch new file mode 100644 index 000000000000..e10365e5ec19 --- /dev/null +++ b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch @@ -0,0 +1,38 @@ +move things around so hpn applies cleanly when using X509 + +--- servconf.c ++++ servconf.c +@@ -329,6 +329,16 @@ + /* Portable-specific options */ + sUsePAM, + /* Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, ++ sX509KeyAlgorithm, ++ sAllowedClientCertPurpose, ++ sKeyAllowSelfIssued, sMandatoryCRL, ++ sCACertificateFile, sCACertificatePath, ++ sCARevocationFile, sCARevocationPath, ++ sCAldapVersion, sCAldapURL, ++ sVAType, sVACertificateFile, ++ sVAOCSPResponderURL, + sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, + sPermitRootLogin, sLogFacility, sLogLevel, + sRhostsRSAAuthentication, sRSAAuthentication, +@@ -351,16 +361,6 @@ + sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, + sMatch, sPermitOpen, sForceCommand, + sUsePrivilegeSeparation, +- sHostbasedAlgorithms, +- sPubkeyAlgorithms, +- sX509KeyAlgorithm, +- sAllowedClientCertPurpose, +- sKeyAllowSelfIssued, sMandatoryCRL, +- sCACertificateFile, sCACertificatePath, +- sCARevocationFile, sCARevocationPath, +- sCAldapVersion, sCAldapURL, +- sVAType, sVACertificateFile, +- sVAOCSPResponderURL, + sDeprecated, sUnsupported + } ServerOpCodes; + diff --git a/net-misc/openssh/openssh-4.4_p1-r5.ebuild b/net-misc/openssh/openssh-4.4_p1-r5.ebuild index 2e28891ca6a5..d7f9031a05a2 100644 --- a/net-misc/openssh/openssh-4.4_p1-r5.ebuild +++ b/net-misc/openssh/openssh-4.4_p1-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r5.ebuild,v 1.4 2006/10/31 19:45:29 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r5.ebuild,v 1.5 2006/11/01 01:43:23 vapier Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -75,7 +75,7 @@ src_unpack() { # fix autoconf lib checking for SELinux epatch "${FILESDIR}/openssh-4.4p1-selinux-ac.diff" - use X509 && epatch "${DISTDIR}"/${X509_PATCH} + use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch if ! use X509 ; then |