Add support for LDAP and make it mutually exclusive from x509 since they conflict #58579.

(Portage version: 2.0.51.22-r1)

8 files changed, 88 insertions, 28 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index f1353c1df038..5f47268485c3 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.120 2005/05/22 01:20:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.121 2005/05/28 01:28:26 vapier Exp $
+
+  28 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.0_p1-smartcard-ldap-happy.patch,
+  openssh-3.8.1_p1-r1.ebuild, openssh-3.9_p1-r2.ebuild,
+  openssh-4.0_p1-r1.ebuild:
+  Add support for LDAP and make it mutually exclusive from x509 since they
+  conflict #58579.
 
   22 May 2005; Mike Frysinger <vapier@gentoo.org> openssh-4.0_p1-r1.ebuild:
   Add support for RSA SecurID tokens #92233 by Antti Mäkelä.
diff --git a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
index a63345a1d3fc..8c60f849d56b 100644
--- a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
@@ -1,2 +1,3 @@
 MD5 1dbfd40ae683f822ae917eebf171ca42 openssh-3.8.1p1.tar.gz 817932
+MD5 48db8e4857a32aa93506be8abd84b6b4 openssh-lpk-3.8.1p1-0.3.4.patch 44245
 MD5 52e42ecdf2b0498220661d4bf1cfaeae openssh-3.8.1p1+x509h.diff.gz 143652
diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1-r2 b/net-misc/openssh/files/digest-openssh-3.9_p1-r2
index d0b53cdb61cf..fb43f8fc4a91 100644
--- a/net-misc/openssh/files/digest-openssh-3.9_p1-r2
+++ b/net-misc/openssh/files/digest-openssh-3.9_p1-r2
@@ -1,2 +1,3 @@
 MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027
+MD5 e1be73c425cc6893df83ced51ee1df10 openssh-lpk-3.9p1-0.3.4.patch 44563
 MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011
diff --git a/net-misc/openssh/files/digest-openssh-4.0_p1-r1 b/net-misc/openssh/files/digest-openssh-4.0_p1-r1
index 9b8793db598d..9b11ec5a3683 100644
--- a/net-misc/openssh/files/digest-openssh-4.0_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-4.0_p1-r1
@@ -1,3 +1,4 @@
 MD5 7b36f28fc16e1b7f4ba3c1dca191ac92 openssh-4.0p1.tar.gz 889880
+MD5 576d620efda55ded77c973de54803246 openssh-lpk-4.0p1-0.3.4.patch 44122
 MD5 a47391f0b77ad10264950c56363d4317 openssh-4.0p1+x509-5.1.diff.gz 117420
 MD5 79f5648305c8b8a1bc1414e8f6c6134c openssh-4.0p1+SecurID_v1.3.1.patch 610662
diff --git a/net-misc/openssh/files/openssh-4.0_p1-smartcard-ldap-happy.patch b/net-misc/openssh/files/openssh-4.0_p1-smartcard-ldap-happy.patch
new file mode 100644
index 000000000000..f3b0329e0782
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.0_p1-smartcard-ldap-happy.patch
@@ -0,0 +1,14 @@
+Make sure the SecurID and the LDAP patch get along
+
+--- Makefile.in
++++ Makefile.in
+@@ -81,3 +81,3 @@
+ 	auth.o auth1.o auth2.o auth-options.o session.o \
+-	auth-chall.o auth2-chall.o groupaccess.o \
++	auth-chall.o auth2-chall.o groupaccess.o auth-securid.o \
+ 	auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
+@@ -87,3 +87,3 @@
+ 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
+-	loginrec.o auth-pam.o auth-shadow.o auth-sia.o auth-securid.o md5crypt.o \
++	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ 	audit.o audit-bsm.o
diff --git a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
index c22109fb92d2..314246dcd2fd 100644
--- a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.8.1_p1-r1.ebuild,v 1.17 2005/05/02 21:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.18 2005/05/28 01:28:26 vapier Exp $
 
-inherit eutils flag-o-matic ccc gnuconfig
+inherit eutils flag-o-matic ccc
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -10,38 +10,38 @@ PARCH=${P/_/}
 
 X509_PATCH="${PARCH}+x509h.diff.gz"
 SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff"
+LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch"
 
-S=${WORKDIR}/${PARCH}
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard uclibc"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
 # This new rev will use the new openssl.
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.73
-		>=sys-apps/shadow-4.0.2-r2 )
-	!mips? ( kerberos? ( virtual/krb5 ) )
+RDEPEND="pam? ( >=sys-libs/pam-0.73 )
+	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )
-	!ppc64? ( skey? ( >=app-admin/skey-1.1.5-r1 ) )
+	skey? ( >=app-admin/skey-1.1.5-r1 )
+	ldap? ( net-nds/openldap )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.1.4
 	x86? ( smartcard? ( dev-libs/opensc ) )
 	!ppc64? ( tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) )"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	dev-lang/perl
-	!uclibc? ( sys-apps/groff )
-	>=sys-apps/sed-4
+	!nocxx? ( sys-apps/groff )
 	sys-devel/autoconf"
 PROVIDE="virtual/ssh"
 
+S=${WORKDIR}/${PARCH}
+
 src_unpack() {
 	unpack ${PARCH}.tar.gz ; cd ${S}
 
@@ -53,18 +53,29 @@ src_unpack() {
 	use chroot && epatch ${FILESDIR}/${P}-chroot.patch.bz2
 	use X509 && epatch ${DISTDIR}/${X509_PATCH}
 	use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2
+	if use ldap ; then
+		if use X509 ; then
+			ewarn "Sorry, x509 and ldap don't get along"
+		else
+			epatch ${DISTDIR}/${LDAP_PATCH}
+		fi
+	fi
+
+	autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	addwrite /dev/ptmx
-	gnuconfig_update
 
 	# make sure .sbss is large enough
 	use skey && use alpha && append-ldflags -mlarge-data
-	use ldap && filter-flags -funroll-loops
-	use selinux && append-flags "-DWITH_SELINUX"
+	if use ldap ; then
+		filter-flags -funroll-loops
+		append-ldflags -lldap -llber
+		append-flags -DWITH_LDAP_PUBKEY
+	fi
+	use selinux && append-flags -DWITH_SELINUX
 	use static && append-ldflags -static
-	export LDFLAGS
 
 	autoconf
 
diff --git a/net-misc/openssh/openssh-3.9_p1-r2.ebuild b/net-misc/openssh/openssh-3.9_p1-r2.ebuild
index fe8d1248728a..e5fa6a8d2ea2 100644
--- a/net-misc/openssh/openssh-3.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1-r2.ebuild
@@ -1,8 +1,8 @@
 # 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-r2.ebuild,v 1.4 2005/05/20 13:02:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r2.ebuild,v 1.5 2005/05/28 01:28:26 vapier Exp $
 
-inherit eutils flag-o-matic ccc gnuconfig pam
+inherit eutils flag-o-matic ccc pam
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -11,11 +11,12 @@ PARCH=${P/_/}
 SFTPLOG_PATCH_VER="1.2"
 X509_PATCH="${PARCH}+x509h.diff.gz"
 SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
+LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch"
 
-S=${WORKDIR}/${PARCH}
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
 
 LICENSE="as-is"
@@ -27,6 +28,7 @@ RDEPEND="pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 )
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )
 	skey? ( >=app-admin/skey-1.1.5-r1 )
+	ldap? ( net-nds/openldap )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.1.4
 	smartcard? ( dev-libs/opensc )
@@ -37,6 +39,8 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 PROVIDE="virtual/ssh"
 
+S=${WORKDIR}/${PARCH}
+
 src_unpack() {
 	unpack ${PARCH}.tar.gz
 	cd "${S}"
@@ -56,6 +60,13 @@ src_unpack() {
 	use X509 && epatch ${DISTDIR}/${X509_PATCH}
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2
 	use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2
+	if use ldap ; then
+		if use X509 ; then
+			ewarn "Sorry, x509 and ldap don't get along"
+		else
+			epatch ${DISTDIR}/${LDAP_PATCH}
+		fi
+	fi
 
 	autoconf || die "autoconf failed"
 }
@@ -64,11 +75,14 @@ src_compile() {
 	local myconf
 
 	addwrite /dev/ptmx
-	gnuconfig_update
 
 	# make sure .sbss is large enough
 	use skey && use alpha && append-ldflags -mlarge-data
-	use ldap && filter-flags -funroll-loops
+	if use ldap ; then
+		filter-flags -funroll-loops
+		append-ldflags -lldap -llber
+		append-flags -DWITH_LDAP_PUBKEY
+	fi
 	use selinux && append-flags "-DWITH_SELINUX"
 
 	if use static ; then
diff --git a/net-misc/openssh/openssh-4.0_p1-r1.ebuild b/net-misc/openssh/openssh-4.0_p1-r1.ebuild
index c4b5814e535b..d58ae03681ad 100644
--- a/net-misc/openssh/openssh-4.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.0_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-4.0_p1-r1.ebuild,v 1.4 2005/05/22 01:20:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.5 2005/05/28 01:28:26 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -11,12 +11,15 @@ PARCH=${P/_/}
 SFTPLOG_PATCH_VER="1.2"
 X509_PATCH="${PARCH}+x509-5.1.diff.gz"
 SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
+SECURID_PATCH="${PARCH}+SecurID_v1.3.1.patch"
+LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/openssh-4.0p1+SecurID_v1.3.1.patch )"
+	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -27,6 +30,7 @@ RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )
 	skey? ( >=app-admin/skey-1.1.5-r1 )
+	ldap? ( net-nds/openldap )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.1.4
 	smartcard? ( dev-libs/opensc )
@@ -52,9 +56,12 @@ src_unpack() {
 	use skey && epatch ${FILESDIR}/openssh-3.9_p1-skey.patch.bz2
 	use chroot && epatch ${FILESDIR}/openssh-3.9_p1-chroot.patch
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2
-	use smartcard \
-		&& epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 \
-		&& epatch ${DISTDIR}/openssh-4.0p1+SecurID_v1.3.1.patch
+	use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2
+	if ! use X509 ; then
+		use smartcard && epatch ${DISTDIR}/${SECURID_PATCH}
+		use smartcard && use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch
+		use ldap && epatch ${DISTDIR}/${LDAP_PATCH}
+	fi
 
 	sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid"
 
@@ -68,7 +75,11 @@ src_compile() {
 
 	# make sure .sbss is large enough
 	use skey && use alpha && append-ldflags -mlarge-data
-	use ldap && filter-flags -funroll-loops
+	if use ldap ; then
+		filter-flags -funroll-loops
+		append-ldflags -lldap -llber
+		append-flags -DWITH_LDAP_PUBKEY
+	fi
 	use selinux && append-flags "-DWITH_SELINUX"
 
 	if use static ; then