diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-02-21 20:48:08 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-02-21 20:48:08 +0000 |
| commit | 284177da3b06d09c6708698c26498059ecea09fb (patch) | |
| tree | 3eea980ef3e3076d98b28b49281d56760465f4df /net-misc/openssh | |
| parent | added perl, ssl and socks to RDEPENDS for livecd irssi to run properly (Manif... (diff) | |
| download | gentoo-2-284177da3b06d09c6708698c26498059ecea09fb.tar.gz gentoo-2-284177da3b06d09c6708698c26498059ecea09fb.tar.bz2 gentoo-2-284177da3b06d09c6708698c26498059ecea09fb.zip | |
Closing #30310.
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.7.1_p2-kerberos.patch | 21 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-3.7.1_p2-r2.ebuild | 9 |
3 files changed, 31 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index bb37784ddc72..bd0d2887eafa 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.63 2004/02/20 19:36:05 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.64 2004/02/21 20:48:08 aliz Exp $ + + 21 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r2.ebuild: + Fix openssh to work with multipe kerbers5 libs. Closing #30310. 20 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r2.ebuild: Filter flag if using ldap. Closing #41727. diff --git a/net-misc/openssh/files/openssh-3.7.1_p2-kerberos.patch b/net-misc/openssh/files/openssh-3.7.1_p2-kerberos.patch new file mode 100644 index 000000000000..810ce1420b34 --- /dev/null +++ b/net-misc/openssh/files/openssh-3.7.1_p2-kerberos.patch @@ -0,0 +1,21 @@ +diff -ur openssh-3.7.1p2.orig/configure.ac openssh-3.7.1p2/configure.ac +--- openssh-3.7.1p2.orig/configure.ac 2003-09-23 10:24:21.000000000 +0100 ++++ openssh-3.7.1p2/configure.ac 2003-10-04 12:51:15.000000000 +0100 +@@ -1992,7 +1992,7 @@ + else + KRB5ROOT=${withval} + fi +- CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" ++ CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include -I/usr/include/heimdal -I/usr/include/gssapi" + LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" + AC_DEFINE(KRB5) + KRB5_MSG="yes" +@@ -2001,7 +2001,7 @@ + [ char *tmp = heimdal_version; ], + [ AC_MSG_RESULT(yes) + AC_DEFINE(HEIMDAL) +- K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" ++ K5LIBS="-lkrb5 -lcom_err -lasn1 -lroken -lresolv" + ], + [ AC_MSG_RESULT(no) + K5LIBS="-lkrb5 -lk5crypto -lcom_err" diff --git a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild index d586b114ba90..615696c43fda 100644 --- a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild +++ b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.5 2004/02/20 19:36:05 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.6 2004/02/21 20:48:08 aliz Exp $ inherit eutils flag-o-matic ccc gnuconfig @@ -27,7 +27,7 @@ IUSE="ipv6 static pam tcpd kerberos skey selinux X509 chroot" RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) - !mips? ( kerberos? ( app-crypt/mit-krb5 ) ) + !mips? ( kerberos? ( virtual/krb5 ) ) selinux? ( sys-libs/libselinux ) !ppc64? ( skey? ( >=app-admin/skey-1.1.5-r1 ) ) >=dev-libs/openssl-0.9.6d @@ -42,6 +42,8 @@ PROVIDE="virtual/ssh" src_unpack() { unpack ${PARCH}.tar.gz ; cd ${S} + epatch ${FILESDIR}/${P}-kerberos.patch + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch use X509 && epatch ${DISTDIR}/${X509_PATCH} @@ -62,9 +64,10 @@ src_unpack() { } src_compile() { - use kerberos && append-flags -I/usr/include/gssapi use ldap && filter-flags -funroll-loops + autoconf + local myconf # Allow OpenSSH to detect mips systems |