diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2006-08-21 21:29:18 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2006-08-21 21:29:18 +0000 |
commit | 503065b7f9d04ae50ccaedac1972bf1390963c6e (patch) | |
tree | 532be3d8c32c2a7a78a82245a7909d74e22aed63 /sys-auth/nss_ldap | |
parent | Fix the patch to apply the xml file properly so we don't attempt to connect t... (diff) | |
download | gentoo-2-503065b7f9d04ae50ccaedac1972bf1390963c6e.tar.gz gentoo-2-503065b7f9d04ae50ccaedac1972bf1390963c6e.tar.bz2 gentoo-2-503065b7f9d04ae50ccaedac1972bf1390963c6e.zip |
Bump to 252, with autofs-4.1.3 support changes from upstream. Candidate for stable.
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'sys-auth/nss_ldap')
-rw-r--r-- | sys-auth/nss_ldap/ChangeLog | 9 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-211 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-215 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-215-r1 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-220 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-226 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-226-r1 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-238 | 2 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-252 | 3 | ||||
-rw-r--r-- | sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch | 65 | ||||
-rw-r--r-- | sys-auth/nss_ldap/nss_ldap-252.ebuild | 70 |
11 files changed, 160 insertions, 1 deletions
diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog index fd4cd26d0fdd..ce915bdac3c8 100644 --- a/sys-auth/nss_ldap/ChangeLog +++ b/sys-auth/nss_ldap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-auth/nss_ldap # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.26 2006/06/14 23:35:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.27 2006/08/21 21:29:18 robbat2 Exp $ + +*nss_ldap-252 (21 Aug 2006) + + 21 Aug 2006; Robin H. Johnson <robbat2@gentoo.org> + +files/nss_ldap-252-reconnect-timeouts.patch, +nss_ldap-252.ebuild: + Bump to 252, with autofs-4.1.3 support changes from upstream. Candidate for + stable. 14 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> +files/nss_ldap-250-reconnect-timeouts.patch: diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-211 b/sys-auth/nss_ldap/files/digest-nss_ldap-211 index 13768c73b451..184dbe057a1a 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-211 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-211 @@ -1 +1,3 @@ MD5 34adcab5d46a436617ae686cc7c5e78f nss_ldap-211.tar.gz 221013 +RMD160 933862186299501761412a9b6430f55f0e58c63f nss_ldap-211.tar.gz 221013 +SHA256 0eecf678b125145e462f4dfc9d68564f299088d025a79c498c590c3b839914cf nss_ldap-211.tar.gz 221013 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-215 b/sys-auth/nss_ldap/files/digest-nss_ldap-215 index 38bf07a63446..ef7edc8381d3 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-215 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-215 @@ -1 +1,3 @@ MD5 c642a3f0dbaf2aacc3bfb1a9dc6c29d6 nss_ldap-215.tar.gz 202566 +RMD160 353931ffeae5b1531cf7a933333f69f82203f406 nss_ldap-215.tar.gz 202566 +SHA256 e0dfa153b5a651735d3dd2ba45ab79d16727cc856a9c5d6afcfe16e9fd66cdbd nss_ldap-215.tar.gz 202566 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-215-r1 b/sys-auth/nss_ldap/files/digest-nss_ldap-215-r1 index 38bf07a63446..ef7edc8381d3 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-215-r1 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-215-r1 @@ -1 +1,3 @@ MD5 c642a3f0dbaf2aacc3bfb1a9dc6c29d6 nss_ldap-215.tar.gz 202566 +RMD160 353931ffeae5b1531cf7a933333f69f82203f406 nss_ldap-215.tar.gz 202566 +SHA256 e0dfa153b5a651735d3dd2ba45ab79d16727cc856a9c5d6afcfe16e9fd66cdbd nss_ldap-215.tar.gz 202566 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-220 b/sys-auth/nss_ldap/files/digest-nss_ldap-220 index c97e065818ed..9a2ed6bb7407 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-220 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-220 @@ -1 +1,3 @@ MD5 d401485fcabf4ea40d244c2c9a19247e nss_ldap-220.tar.gz 204826 +RMD160 2bb2158084e0d94904941ff7491adccabe580616 nss_ldap-220.tar.gz 204826 +SHA256 ca54bed68c8006d833030cad7ed914b0bb503717c6858ce8585c9eb61746e38e nss_ldap-220.tar.gz 204826 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-226 b/sys-auth/nss_ldap/files/digest-nss_ldap-226 index 9fca9879a7ff..71634b3fe9b4 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-226 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-226 @@ -1 +1,3 @@ MD5 b741a705c112b8c51f6b32abe2540a5d nss_ldap-226.tar.gz 212923 +RMD160 052f723b501c08a53afb557e52c66bca760f2991 nss_ldap-226.tar.gz 212923 +SHA256 6fb4b2aeae1de14924a38f93b815a4de597b03ee161e64951d55d176d2d17a80 nss_ldap-226.tar.gz 212923 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-226-r1 b/sys-auth/nss_ldap/files/digest-nss_ldap-226-r1 index 9fca9879a7ff..71634b3fe9b4 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-226-r1 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-226-r1 @@ -1 +1,3 @@ MD5 b741a705c112b8c51f6b32abe2540a5d nss_ldap-226.tar.gz 212923 +RMD160 052f723b501c08a53afb557e52c66bca760f2991 nss_ldap-226.tar.gz 212923 +SHA256 6fb4b2aeae1de14924a38f93b815a4de597b03ee161e64951d55d176d2d17a80 nss_ldap-226.tar.gz 212923 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-238 b/sys-auth/nss_ldap/files/digest-nss_ldap-238 index cf5812d6278e..adc4ca093bfe 100644 --- a/sys-auth/nss_ldap/files/digest-nss_ldap-238 +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-238 @@ -1 +1,3 @@ MD5 97fd929b381329b972b3c3ddca5a4bbf nss_ldap-238.tar.gz 219945 +RMD160 0187ad4d2d958aa318be91c4e6faed108d875c05 nss_ldap-238.tar.gz 219945 +SHA256 524e6375146b0c8fffdb67290eba28a70a15d44093fa9bd60d1813a497a2b231 nss_ldap-238.tar.gz 219945 diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-252 b/sys-auth/nss_ldap/files/digest-nss_ldap-252 new file mode 100644 index 000000000000..c56e4716a7b6 --- /dev/null +++ b/sys-auth/nss_ldap/files/digest-nss_ldap-252 @@ -0,0 +1,3 @@ +MD5 e8ef311258dccc33dad2a0afb5d4a29b nss_ldap-252.tar.gz 228027 +RMD160 2748ae6cf76b785bfe5fbab8d650f66d2dd830ef nss_ldap-252.tar.gz 228027 +SHA256 ce9dd91ac056c70fd2608dd0b8dad0627bf942c2b24de7e61ac18c50385fac9d nss_ldap-252.tar.gz 228027 diff --git a/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch b/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch new file mode 100644 index 000000000000..285a34e3df4b --- /dev/null +++ b/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch @@ -0,0 +1,65 @@ +This patch changes the default timeouts, so that they are much lower, and do +not cause major delays when booting a system. This is a workaround until the +core /etc/{passwd,group} contain all of the data needed for a system boot. + +Also add a note that 'ssl on' is broken and TLS should be used instead. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap-nss.h nss_ldap-250/ldap-nss.h +--- nss_ldap-250.orig/ldap-nss.h 2006-04-26 18:19:00.000000000 -0700 ++++ nss_ldap-250/ldap-nss.h 2006-06-14 01:58:01.933005492 -0700 +@@ -96,9 +96,9 @@ + * unacceptable, in which case you may wish to adjust + * the constants below. + */ +-#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect attempts */ +-#define LDAP_NSS_SLEEPTIME 4 /* seconds to sleep; doubled until max */ +-#define LDAP_NSS_MAXSLEEPTIME 64 /* maximum seconds to sleep */ ++#define LDAP_NSS_TRIES 4 /* number of sleeping reconnect attempts */ ++#define LDAP_NSS_SLEEPTIME 1 /* seconds to sleep; doubled until max */ ++#define LDAP_NSS_MAXSLEEPTIME 16 /* maximum seconds to sleep */ + #define LDAP_NSS_MAXCONNTRIES 2 /* reconnect attempts before sleeping */ + + #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H) +diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap.conf nss_ldap-250/ldap.conf +--- nss_ldap-250.orig/ldap.conf 2006-04-26 18:19:00.000000000 -0700 ++++ nss_ldap-250/ldap.conf 2006-06-14 02:12:02.008444745 -0700 +@@ -283,7 +283,8 @@ + # OpenLDAP SSL mechanism + # start_tls mechanism uses the normal LDAP port, LDAPS typically 636 + #ssl start_tls +-#ssl on ++###ssl on ++# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead. + + # OpenLDAP SSL options + # Require and verify server certificate (yes/no) +@@ -315,3 +316,27 @@ + # Override the default Kerberos ticket cache location. + #krb5_ccname FILE:/etc/.ldapcache + ++# Timeout behavior ++# Upstream nss_ldap hard-codes these values: ++#nss_reconnect_tries 5 # number of times to double the sleep time ++#nss_reconnect_sleeptime 4 # initial sleep value ++#nss_reconnect_maxsleeptime 64 # max sleep value to cap at ++#nss_reconnect_maxconntries 2 # how many tries before sleeping ++# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the ++# server is not available. ++ ++# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values ++# (The hardwired constants in the code are changed to them as well): ++nss_reconnect_tries 4 # number of times to double the sleep time ++nss_reconnect_sleeptime 1 # initial sleep value ++nss_reconnect_maxsleeptime 16 # max sleep value to cap at ++nss_reconnect_maxconntries 2 # how many tries before sleeping ++# This leads to a delay of 15 seconds (1+2+4+8=15) ++ ++# If you are impatient, and know your LDAP server is reliable, fast or local, ++# you may wish to use these values instead: ++#nss_reconnect_tries 1 # number of times to double the sleep time ++#nss_reconnect_sleeptime 1 # initial sleep value ++#nss_reconnect_maxsleeptime 1 # max sleep value to cap at ++#nss_reconnect_maxconntries 3 # how many tries before sleeping ++# This leads to a delay of 1 second. diff --git a/sys-auth/nss_ldap/nss_ldap-252.ebuild b/sys-auth/nss_ldap/nss_ldap-252.ebuild new file mode 100644 index 000000000000..81fac1accdec --- /dev/null +++ b/sys-auth/nss_ldap/nss_ldap-252.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-252.ebuild,v 1.1 2006/08/21 21:29:18 robbat2 Exp $ + +inherit fixheadtails eutils gnuconfig multilib + +IUSE="debug sasl" + +DESCRIPTION="NSS LDAP Module" +HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html" +SRC_URI="http://www.padl.com/download/${P}.tar.gz" + +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=">=net-nds/openldap-2.1.30-r5 + sasl? ( dev-libs/cyrus-sasl )" +RDEPEND="${DEPEND} + !<net-fs/autofs-4.1.3" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/nsswitch.ldap.diff + epatch ${FILESDIR}/${PN}-239-tls-security-bug.patch + epatch ${FILESDIR}/${PN}-249-sasl-compile.patch + EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-252-reconnect-timeouts.patch + sed -i.orig \ + -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \ + ${S}/ldap.conf || die "failed to clean up initial version marker" + # fix head/tail stuff + ht_fix_file ${S}/Makefile.am ${S}/Makefile.in ${S}/depcomp + # fix build borkage + for i in Makefile.{in,am}; do + sed -i.orig \ + -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \ + ${S}/$i + done + # update config.{guess,sub} + gnuconfig_update +} + +src_compile() { + local myconf="" + use debug && myconf="${myconf} --enable-debugging" + + econf \ + --with-ldap-lib=openldap \ + --libdir=/$(get_libdir) \ + --enable-schema-mapping \ + --enable-paged-results \ + --enable-rfc2307bis \ + ${myconf} || die "configure failed" + + emake || die "make failed" +} + +src_install() { + dodir /$(get_libdir) + + emake -j1 DESTDIR="${D}" install || die "make install failed" + + insinto /etc + doins ldap.conf + + dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ + COPYING CVSVersionInfo.txt README nsswitch.ldap certutil + docinto docs; dodoc doc/* +} |