diff options
| -rw-r--r-- | databases/openldap-client/PLIST | 6 | ||||
| -rw-r--r-- | databases/openldap-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/openldap-server/PLIST | 3 | ||||
| -rw-r--r-- | databases/openldap/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 9 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-aa | 23 |
6 files changed, 14 insertions, 34 deletions
diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST index d599f6963fc..d1c44658fc7 100644 --- a/databases/openldap-client/PLIST +++ b/databases/openldap-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2010/07/24 11:15:16 ghen Exp $ +@comment $NetBSD: PLIST,v 1.9 2011/03/17 14:09:21 drochner Exp $ bin/ldapadd bin/ldapcompare bin/ldapdelete @@ -104,10 +104,12 @@ man/man3/ldap_delete.3 man/man3/ldap_delete_ext.3 man/man3/ldap_delete_ext_s.3 man/man3/ldap_delete_s.3 +man/man3/ldap_destroy.3 man/man3/ldap_dn2ad_canonical.3 man/man3/ldap_dn2dcedn.3 man/man3/ldap_dn2str.3 man/man3/ldap_dn2ufn.3 +man/man3/ldap_dup.3 man/man3/ldap_err2string.3 man/man3/ldap_errlist.3 man/man3/ldap_error.3 @@ -125,6 +127,7 @@ man/man3/ldap_get_option.3 man/man3/ldap_get_values.3 man/man3/ldap_get_values_len.3 man/man3/ldap_init.3 +man/man3/ldap_init_fd.3 man/man3/ldap_initialize.3 man/man3/ldap_install_tls.3 man/man3/ldap_is_ldap_url.3 @@ -179,6 +182,7 @@ man/man3/ldap_search_s.3 man/man3/ldap_search_st.3 man/man3/ldap_set_option.3 man/man3/ldap_set_rebind_proc.3 +man/man3/ldap_set_urllist_proc.3 man/man3/ldap_simple_bind.3 man/man3/ldap_simple_bind_s.3 man/man3/ldap_sort.3 diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 255ac2637d6..e00d516fb4b 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2010/09/16 08:04:14 adam Exp $ +# $NetBSD: Makefile,v 1.28 2011/03/17 14:09:21 drochner Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 1 COMMENT= Lightweight Directory Access Protocol server suite CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST index 3f1667ab95e..7dd30582561 100644 --- a/databases/openldap-server/PLIST +++ b/databases/openldap-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2009/10/29 15:50:17 ghen Exp $ +@comment $NetBSD: PLIST,v 1.9 2011/03/17 14:09:21 drochner Exp $ libexec/slapd sbin/slapacl sbin/slapadd @@ -18,6 +18,7 @@ share/examples/openldap/schema/core.schema share/examples/openldap/schema/cosine.ldif share/examples/openldap/schema/cosine.schema share/examples/openldap/schema/duaconf.schema +share/examples/openldap/schema/dyngroup.ldif share/examples/openldap/schema/dyngroup.schema share/examples/openldap/schema/inetorgperson.ldif share/examples/openldap/schema/inetorgperson.schema diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index e216a4b0409..bd3ae8fc3ea 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2010/12/17 10:20:51 adam Exp $ +# $NetBSD: Makefile.common,v 1.28 2011/03/17 14:09:20 drochner Exp $ # # used by databases/openldap-client/Makefile # used by databases/openldap-nops/Makefile @@ -6,7 +6,7 @@ # used by databases/openldap-smbk5pwd/Makefile # please stick to the "stable" releases as much as possible! -DISTNAME= openldap-2.4.23 +DISTNAME= openldap-2.4.24 CATEGORIES= databases MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/ diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 0e3138154b4..a825abcb316 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.79 2010/12/17 10:20:51 adam Exp $ +$NetBSD: distinfo,v 1.80 2011/03/17 14:09:20 drochner Exp $ -SHA1 (openldap-2.4.23.tgz) = 26027e7020256c5f47e17787f17ee8b31af42378 -RMD160 (openldap-2.4.23.tgz) = d2268e8fb894680d1d9926fedca736f195e0a0be -Size (openldap-2.4.23.tgz) = 5182440 bytes -SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49 +SHA1 (openldap-2.4.24.tgz) = a4baad3d45ae5810ba5fee48603210697c70d52f +RMD160 (openldap-2.4.24.tgz) = b9df6a5a562b83fe4ad92f8779909b36fab65c52 +Size (openldap-2.4.24.tgz) = 5240643 bytes SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5 diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa deleted file mode 100644 index fb76e2d2cc8..00000000000 --- a/databases/openldap/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.10 2008/07/03 22:14:50 tonnerre Exp $ - ---- libraries/liblber/io.c.orig 2008-02-12 00:26:41.000000000 +0100 -+++ libraries/liblber/io.c -@@ -584,13 +584,11 @@ ber_get_next( - return LBER_DEFAULT; - } - /* Not enough bytes? */ -- if (ber->ber_rwptr - (char *)p < llen) { --#if defined( EWOULDBLOCK ) -- sock_errset(EWOULDBLOCK); --#elif defined( EAGAIN ) -- sock_errset(EAGAIN); --#endif -- return LBER_DEFAULT; -+ i = ber->ber_rwptr - (char *)p; -+ if (i < llen) { -+ sblen=ber_int_sb_read( sb, ber->ber_rwptr, i ); -+ if (sblen<i) return LBER_DEFAULT; -+ ber->ber_rwptr += sblen; - } - for (i=0; i<llen; i++) { - tlen <<=8; |