diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-03-13 11:05:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-03-13 11:05:12 +0000 |
| commit | 28b74564d70034d866c7a16c39b4b65c36ee2d91 (patch) | |
| tree | d261756df196efc702d1005102251574996fe742 /net-misc | |
| parent | Add new Version 0.6d, fixes Bug 84574. (diff) | |
| download | gentoo-2-28b74564d70034d866c7a16c39b4b65c36ee2d91.tar.gz gentoo-2-28b74564d70034d866c7a16c39b4b65c36ee2d91.tar.bz2 gentoo-2-28b74564d70034d866c7a16c39b4b65c36ee2d91.zip | |
Add patch to fix kerberos detection #80811 by Aron Griffis.
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-kerberos-detection.patch | 23 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-3.9_p1-r1.ebuild | 21 |
3 files changed, 39 insertions, 11 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index fb83b113ea3c..f0a44dd00589 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.114 2005/03/13 10:32:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.115 2005/03/13 11:05:12 vapier Exp $ + + 13 Mar 2005; Mike Frysinger <vapier@gentoo.org> + +files/openssh-3.9_p1-kerberos-detection.patch, openssh-3.9_p1-r1.ebuild: + Add patch to fix kerberos detection #80811 by Aron Griffis. 13 Mar 2005; Mike Frysinger <vapier@gentoo.org> +files/openssh-3.9_p1-configure-openct.patch, openssh-3.9_p1-r1.ebuild: diff --git a/net-misc/openssh/files/openssh-3.9_p1-kerberos-detection.patch b/net-misc/openssh/files/openssh-3.9_p1-kerberos-detection.patch new file mode 100644 index 000000000000..850e72ea9ed6 --- /dev/null +++ b/net-misc/openssh/files/openssh-3.9_p1-kerberos-detection.patch @@ -0,0 +1,23 @@ +Seems that even if you do `./configure --without-kerberos`, configure +will still search for some krb headers/libs, evil! + +http://bugs.gentoo.org/show_bug.cgi?id=80811 + +--- configure.ac ++++ configure.ac +@@ -2464,7 +2464,6 @@ + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${KRB5ROOT}/lib" + fi +- fi + + AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h) + AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h) +@@ -2473,6 +2472,7 @@ + LIBS="$LIBS $K5LIBS" + AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) + AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS)) ++ fi + ] + ) + diff --git a/net-misc/openssh/openssh-3.9_p1-r1.ebuild b/net-misc/openssh/openssh-3.9_p1-r1.ebuild index 9832157529a6..6ff7fcf500f4 100644 --- a/net-misc/openssh/openssh-3.9_p1-r1.ebuild +++ b/net-misc/openssh/openssh-3.9_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r1.ebuild,v 1.13 2005/03/13 10:32:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r1.ebuild,v 1.14 2005/03/13 11:05:12 vapier Exp $ inherit eutils flag-o-matic ccc gnuconfig @@ -20,7 +20,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz LICENSE="as-is" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging" RDEPEND="pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) @@ -39,14 +39,15 @@ PROVIDE="virtual/ssh" src_unpack() { unpack ${PARCH}.tar.gz - cd ${S} + cd "${S}" - epatch ${FILESDIR}/${P}-pamfix.patch.bz2 - epatch ${FILESDIR}/${P}-largekey.patch.bz2 - epatch ${FILESDIR}/${P}-fix_suid.patch.bz2 - epatch ${FILESDIR}/${P}-infoleak.patch #59361 - epatch ${FILESDIR}/${P}-terminal_restore.patch.bz2 - epatch ${FILESDIR}/${P}-configure-openct.patch #78730 + epatch "${FILESDIR}"/${P}-pamfix.patch.bz2 + epatch "${FILESDIR}"/${P}-largekey.patch.bz2 + epatch "${FILESDIR}"/${P}-fix_suid.patch.bz2 + epatch "${FILESDIR}"/${P}-infoleak.patch #59361 + epatch "${FILESDIR}"/${P}-terminal_restore.patch.bz2 + epatch "${FILESDIR}"/${P}-configure-openct.patch #78730 + epatch "${FILESDIR}"/${P}-kerberos-detection.patch #80811 use sftplogging && epatch ${FILESDIR}/${P}-sftplogging-1.2-gentoo.patch.bz2 use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch.bz2 @@ -102,7 +103,7 @@ src_install() { make install-files DESTDIR="${D}" || die fperms 600 /etc/ssh/sshd_config dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config - newpamd "${FILESDIR}"/sshd.pam sshd + newpamd "${FILESDIR}"/sshd.pam sshd newinitd "${FILESDIR}"/sshd.rc6 sshd keepdir /var/empty dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config |