diff options
Diffstat (limited to 'sys-auth/nss_ldap')
| -rw-r--r-- | sys-auth/nss_ldap/ChangeLog | 13 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/Manifest | 7 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/files/nss_ldap-254-soname.patch | 12 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch | 57 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/nss_ldap-264-r1.ebuild | 104 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/nss_ldap-265.ebuild | 108 |
6 files changed, 298 insertions, 3 deletions
diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog index d3372f01a581..cbac8ebffd05 100644 --- a/sys-auth/nss_ldap/ChangeLog +++ b/sys-auth/nss_ldap/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-auth/nss_ldap -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.58 2009/07/28 18:45:51 robbat2 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.59 2010/02/19 19:24:14 robbat2 Exp $ + +*nss_ldap-265 (19 Feb 2010) +*nss_ldap-264-r1 (19 Feb 2010) + + 19 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> + +files/nss_ldap-254-soname.patch, +nss_ldap-264-r1.ebuild, + +nss_ldap-265.ebuild, +files/nss_ldap-265-reconnect-timeouts.patch: + Bug #161195, add an SONAME: Added to 264-r1 as stable candidate. Bug + #302914: Version bump to 265. *nss_ldap-264 (28 Jul 2009) diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest index fe50cb5b340d..e681fca8eb36 100644 --- a/sys-auth/nss_ldap/Manifest +++ b/sys-auth/nss_ldap/Manifest @@ -2,19 +2,24 @@ AUX nss_ldap-239-tls-security-bug.patch 1022 RMD160 9b48ef4eee157b4b3bfa8a531bbe AUX nss_ldap-249-sasl-compile.patch 282 RMD160 dcca3b25794db3d5db82ec6b9ed423af829f2de0 SHA1 abb3e6e027a564e981a3a7208e94cc61f89ee301 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6 AUX nss_ldap-252-reconnect-timeouts.patch 3169 RMD160 f442c89e3065db02aef6fd60235e20db9baadb16 SHA1 d8f3acd6b118d34223e93991431acf05fcacdc08 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f AUX nss_ldap-254-nss_getgrent_skipmembers.patch 7921 RMD160 e9479d357c28e63f24b08fd73023322e8107a632 SHA1 c95b986c02a23a60509ae82c0e4caa155043b8c4 SHA256 4ea143c1c33c771a1868f46a349a71ba2c904a14d8ec23320fa2d500a72c9882 +AUX nss_ldap-254-soname.patch 604 RMD160 e34ad542de2c838efca8690e35438814570d3561 SHA1 6c1e158491fdfa9b46371cdb3e281c6e72e079b0 SHA256 b07482163f238d843a3a7a31008890e523dd17825bb35caaf30716c896a5bc05 AUX nss_ldap-257-nss_max_group_depth.patch 3551 RMD160 8d23cd290f23808f14e1e5308280de00fb9cb9f0 SHA1 625edf664eb66bece8bc420f50c95b9ca279ea9d SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37 AUX nss_ldap-257.2-gssapi-headers.patch 2343 RMD160 b99b79b7cf9a423aceb350bfcc7d692b5bfa4ead SHA1 b7a3577b4db4f1c87c55935c2f6493bc704c82c2 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5 AUX nss_ldap-264-disable-automagic.patch 4357 RMD160 b0174c8d28bb514a799dce163d4f6757104efeab SHA1 d5847f1a512f4a2c901043f01917119528d1f881 SHA256 7e8fbaa80a3174b68991d232a214af9e6f7eae7e7aaedd92d200828a8510d0e6 +AUX nss_ldap-265-reconnect-timeouts.patch 2806 RMD160 937a8863a1ad2cb04601a3e1d1ce1d4a4f69f37a SHA1 0660a98e4e7dfd52cd8931738d7c6dc4fea52ecf SHA256 f1d3a308aac80fc1f33d4087a7839e01e45ece3aed284378adecb537bdcc53c3 AUX nsswitch.ldap.diff 575 RMD160 6c429261de3f99eccfb6f613e0d8a499fa798245 SHA1 a2aada398f1db0eb162633d39992646ce513a3b6 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e DIST nss_ldap-258.tar.gz 274694 RMD160 ee52775b9612f780908b3c8363ab2b18e7f4ea1c SHA1 50a5128db5a4d894fba35aeb092685605fba578d SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346 DIST nss_ldap-259.tar.gz 274878 RMD160 95b7fe2a4c28c4d8e86cf7d0d2e61e5e585b5a06 SHA1 0644d06be11b01e45d7a2a153e247b1203704d25 SHA256 8b65a32717f6173911aaea8e89b2c89ccb901f14f1063f5e49b5ab77d45f1790 DIST nss_ldap-261.tar.gz 276065 RMD160 abf3f7d100f9d2ede62397538c1fd472855ec587 SHA1 85058bfca645f88a177bcde7fb3f1bea23c6e8f1 SHA256 7e9a6e8e1f07607b63f5f61fda755778fb1257e6599ac467327b6e817de5aad7 DIST nss_ldap-262.tar.gz 274927 RMD160 db3419cf987a74bf00a84cec6c8651f3ea433dd0 SHA1 846419cc10fbcccc173744176bdd88f9607e7f28 SHA256 179cd8458ae3cc23cb726cf15afb94089482dd22559ac503e7df5fd6fc2c4cbf DIST nss_ldap-264.tar.gz 278134 RMD160 ab8f0de0cc9023232cbb08adcb92307028d57fb5 SHA1 b06a8ac04bf1cf6a4aaeef8ae6dbb3fad097a668 SHA256 556198f2774bdb61a597da3fa8a5ecc80a3271ed9ab177760df7c4f22d6b1d25 +DIST nss_ldap-265.tar.gz 280976 RMD160 0513f1b62aface531145f739ec8e9867c77eb3ce SHA1 743581914fc8c9b4d33955c2cc7acd0c3c44a430 SHA256 77b54d905f50d774f28d5559d49126f1bc76720f741b0864a64bb4936ec226a8 EBUILD nss_ldap-258.ebuild 2372 RMD160 a4869b6d13e033eb35b26dfdcf2cdb71edf35826 SHA1 169f695b92bbd02500f76c117f75007e5c6e4ab8 SHA256 91491630930b3b752c40659937dcce431b315f39253812d8443c971ed8ae00a7 EBUILD nss_ldap-259.ebuild 2379 RMD160 3df6c70a17527bf60a545915c149f68bbd66724d SHA1 72e3c24e7ba468dc33f70cfcc1e6d1b9eff3fd02 SHA256 53cf4f8aabc230fb3a948d905ae4c51f6f65aabdf12e6042064853a4c3f3f620 EBUILD nss_ldap-261.ebuild 2499 RMD160 139eeb95880f741e493b019eeb6a6ece367f5e2b SHA1 fd7bbf290da758f396d9c0853f4ee60d6648a054 SHA256 1cd3978bcf73de9da6175f39d6f2f272f0d6259037e7edd97e7604cb2b411d8b EBUILD nss_ldap-262.ebuild 2499 RMD160 a3bb810de2c68961ab6120d2870104687b36e61a SHA1 8dda9cd9d3635ea89d2fb07bf08cc6c5fe0308d8 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29 +EBUILD nss_ldap-264-r1.ebuild 2753 RMD160 817ae21affb52dae190787a79aa3966290907a8d SHA1 bb9a3f7426f512b971749e241df764af8a1fed13 SHA256 0965a2544ff3e0f274f50b61746bdd2d76977212f11ec57aad7564e0bb94bdf0 EBUILD nss_ldap-264.ebuild 2682 RMD160 72a730a33ed6d26619d49c29114f958e40db2088 SHA1 cdb2df42054833cff0473869472ec0c6d1e20679 SHA256 0f44b822126d30da14e268ea64a80839260392f9f3f0e6ffc4f7745c70e24b45 -MISC ChangeLog 15548 RMD160 0796df7599667b3006feafd4b9cfcb554132e64a SHA1 2a2ee71656a69db881c2003a5ba01a81861b7a47 SHA256 d5ae96944e1323a45f7db81f8c073118156230a0dc34cd3106489b2915fc228e +EBUILD nss_ldap-265.ebuild 2825 RMD160 723addc888ba59a53d857799e7ab5b1aa47d38b1 SHA1 a831244346ebf646227bdba2af81778807a0a7c6 SHA256 d0edd7729b0a78a898b96f8e422ac3c35416a9c57128f1b7f2a23fbe51ab4d25 +MISC ChangeLog 15896 RMD160 3afc979b6ebbca36102bb1e1b7d88063d809c69b SHA1 57adee27fdf65cacffd01c71efcd4d8866a77c68 SHA256 eb9059714ba857538d5c73a768208b0c5e7405a493ff74d46e6265c23d342b8c MISC metadata.xml 374 RMD160 d093200b154cb3766f818bb06ab05fb29d45af0c SHA1 0e6b6cc539b9c537d3a5464884ca2ca9c1717134 SHA256 72f6eb7d9ee256d2edb0336e03b71674bf17d2828222ca8722fdb48a88304365 diff --git a/sys-auth/nss_ldap/files/nss_ldap-254-soname.patch b/sys-auth/nss_ldap/files/nss_ldap-254-soname.patch new file mode 100644 index 000000000000..e832c2f0d218 --- /dev/null +++ b/sys-auth/nss_ldap/files/nss_ldap-254-soname.patch @@ -0,0 +1,12 @@ +Set the soname which glibc expects us to have. +--- nss_ldap-254/configure.in 2007-02-26 16:40:53.000000000 -0500 ++++ nss_ldap-254/configure.in 2007-02-26 16:40:47.000000000 -0500 +@@ -92,7 +92,7 @@ + nss_ldap_so_LDFLAGS="-b -dynamic -G `cat exports.hpux`" + CPPFLAGS="$CPPFLAGS -I. -DHPUX" + TARGET_OS=HPUX ;; +-linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;; ++linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux -Wl,-soname=libnss_ldap.so.2" ;; + *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;; + esac + diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch b/sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch new file mode 100644 index 000000000000..b377ad7bb326 --- /dev/null +++ b/sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch @@ -0,0 +1,57 @@ +diff -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap.conf nss_ldap-265/ldap.conf +--- nss_ldap-265.orig/ldap.conf 2009-11-06 10:28:08.000000000 +0000 ++++ nss_ldap-265/ldap.conf 2010-02-19 18:36:58.272236290 +0000 +@@ -279,7 +279,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) +@@ -311,3 +312,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 -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap-nss.h nss_ldap-265/ldap-nss.h +--- nss_ldap-265.orig/ldap-nss.h 2009-11-06 10:28:08.000000000 +0000 ++++ nss_ldap-265/ldap-nss.h 2010-02-19 18:37:49.278474888 +0000 +@@ -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 --git a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild new file mode 100644 index 000000000000..7c4c554be870 --- /dev/null +++ b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild,v 1.1 2010/02/19 19:24:14 robbat2 Exp $ + +EAPI=2 +inherit fixheadtails eutils multilib autotools + +IUSE="debug ssl sasl kerberos" + +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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=">=net-nds/openldap-2.1.30-r5 + sasl? ( dev-libs/cyrus-sasl ) + kerberos? ( virtual/krb5 ) + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND} + !<net-fs/autofs-4.1.3" + +src_prepare() { + cd "${S}" + + epatch "${FILESDIR}"/nsswitch.ldap.diff + + # Applied by upstream + #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 + + # Applied by upstream + #EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch + + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.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 + + epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch + + # Bug #214750, no automagic deps + epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch + + # Upstream forgets the version number sometimes + #sed -i \ + # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \ + # "${S}"/configure.in + + # Include an SONAME + epatch "${FILESDIR}"/${PN}-254-soname.patch + + eautoreconf +} + +src_configure() { + local myconf="" + use debug && myconf="${myconf} --enable-debugging" + use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi" + # --enable-schema-mapping \ + econf \ + --with-ldap-lib=openldap \ + --libdir=/$(get_libdir) \ + --enable-paged-results \ + --enable-rfc2307bis \ + $(use_enable ssl) \ + $(use_enable sasl) \ + $(use_enable kerberos krb) \ + ${myconf} || die "configure 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/* +} + +pkg_postinst() { + elog "If you use a ldaps:// string in the 'uri' setting of" + elog "your /etc/ldap.conf, you must set 'ssl on'!" +} diff --git a/sys-auth/nss_ldap/nss_ldap-265.ebuild b/sys-auth/nss_ldap/nss_ldap-265.ebuild new file mode 100644 index 000000000000..1fa6d565bca3 --- /dev/null +++ b/sys-auth/nss_ldap/nss_ldap-265.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-265.ebuild,v 1.1 2010/02/19 19:24:14 robbat2 Exp $ + +EAPI=2 +inherit fixheadtails eutils multilib autotools + +IUSE="debug ssl sasl kerberos" + +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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=">=net-nds/openldap-2.1.30-r5 + sasl? ( dev-libs/cyrus-sasl ) + kerberos? ( virtual/krb5 ) + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND} + !<net-fs/autofs-4.1.3" + +src_prepare() { + cd "${S}" + + epatch "${FILESDIR}"/nsswitch.ldap.diff + + # Applied by upstream + #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch + + epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch + + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch + + # Applied by upstream + #EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch + + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.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 + + epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch + + # Bug #214750, no automagic deps + epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch + + # Upstream forgets the version number sometimes + #sed -i \ + # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \ + # "${S}"/configure.in + + # Include an SONAME + epatch "${FILESDIR}"/${PN}-254-soname.patch + + sed -i \ + -e 's, vers_string , ./vers_string ,g' \ + "${S}"/Makefile.am + + eautoreconf +} + +src_configure() { + local myconf="" + use debug && myconf="${myconf} --enable-debugging" + use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi" + # --enable-schema-mapping \ + econf \ + --with-ldap-lib=openldap \ + --libdir=/$(get_libdir) \ + --enable-paged-results \ + --enable-rfc2307bis \ + $(use_enable ssl) \ + $(use_enable sasl) \ + $(use_enable kerberos krb) \ + ${myconf} || die "configure 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/* +} + +pkg_postinst() { + elog "If you use a ldaps:// string in the 'uri' setting of" + elog "your /etc/ldap.conf, you must set 'ssl on'!" +} |