From f0d3b7ec892bb15e0594c2c30d7cfc2156e1ebb7 Mon Sep 17 00:00:00 2001 From: ghen Date: Sat, 19 Jul 2008 21:08:42 +0000 Subject: [PATCH] Update openldap packages to 2.4.11. OpenLDAP 2.4.11 Release (2008/07/16) Fixed liblber ber_get_next length decoding (ITS#5580) Added libldap assertion control (ITS#5560) Fixed libldap GnuTLS CRL result handling (ITS#5577) Fixed libldap GnuTLS SSF computation (ITS#5585) Fixed liblutil missing return code (ITS#5615) Fixed slapd cert serial number parsing (ITS#5588) Fixed slapd check for structural_class failures (ITS#5540) Fixed slapd config backend renumbering (ITS#5571) Fixed slapd configContext OID (ITS#5383) Fixed slapd crash with no listeners (ITS#5563) Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540) Fixed slapd sets memory leak (ITS#5557) Fixed slapd sortvals binary search (ITS#5578) Fixed slapd syncrepl updates with multiple masters (ITS#5597) Fixed slapd syncrepl superior objectClass delete/add (ITS#5600) Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596) Added slapd-ldap/slapd-meta option to filter out search references (ITS#5593) Fixed slapd-meta link to slapd-ldap (ITS#5355) Fixed slapd-sock, back-shell buffer count (ITS#5558) Fixed slapo-dynlist dg attrs lookup (ITS#5583) Fixed slapo-dynlist entry release (ITS#5135) Fixed slapo-memberof replace handling (ITS#5584) Added slapo-nssov contrib module Fixed slapo-pcache handling of negative search caches (ITS#5546) Fixed slapo-ppolicy DNs with whitespaces (ITS#5552) Fixed slapo-ppolicy modify with internal ops (ITS#5569) Fixed slapo-syncprov ACL evaluation (ITS#5548) Fixed slapo-syncprov crash with delcsn (ITS#5589) Fixed slapo-syncprov full reload (ITS#5564) Fixed slapo-syncprov missing olcSpReloadHint attr(ITS#5591) Fixed slapo-unique filter normalization (ITS#5581) Fixed contrib smbk5pwd terminator (ITS#5575) Build Environment Fixed test048 to skip if threads is not available (ITS#5529) Documentation Added slapo-pcache(5) sizelimit caching (ITS#5559) Added slapd-access(5) add and delete privs (ITS#5566) admin24 GnuTLS documentation (ITS#5554) OpenLDAP 2.4.10 Release (2008/06/08) Fixed libldap file descriptor leak with SELinux (ITS#5507) Fixed libldap ld_defconn cleanup if it was freed (ITS#5518, ITS#5525) Fixed libldap msgid handling (ITS#5318) Fixed libldap t61 infinite loop (ITS#5542) Fixed libldap_r missing stubs (ITS#5519) Fixed slapd initialization of sr_msgid, rs->sr_tag (ITS#5461) Fixed slapd missing termination of integerFilter keys (ITS#5503) Fixed slapd multiple attrs in URI (ITS#5516) Fixed slapd sasl_ssf retrieval (ITS#5403) Fixed slapd socket assert (ITS#5489) Fixed slapd syncrepl cookie (ITS#5536) Fixed slapd-bdb/hdb MAXPATHLEN (ITS#5531) Fixed slapd-bdb indexing in single ADD/MOD (ITS#5521) Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513) Fixed slapd-meta quarantine crasher (ITS#5522) Fixed slapo-refint to allow setting modifiers name (ITS#5505) Fixed slapo-syncprov contextCSN passing on syncprov consumers (ITS#5488) Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493) Fixed slapo-syncprov op2.o_extra reset (ITS#5501, #5506) Fixed slapo-syncprov searching wrong backend (ITS#5487) Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465) Fixed slapo-syncprov max csn search on startup (ITS#5537) Fixed slapo-unique config structs (ITS#5526) Fixed slapo-unique filter terminator (ITS#5511) Documentation Add search privileges documentation (ITS#5512) admin24 security document updates (ITS#5524) --- databases/openldap-client/Makefile | 3 +-- databases/openldap-doc/Makefile | 11 ++++++----- databases/openldap-doc/PLIST | 4 +++- databases/openldap/Makefile | 4 ++-- databases/openldap/Makefile.common | 4 ++-- databases/openldap/distinfo | 10 +++++----- databases/openldap/patches/patch-bb | 8 ++++---- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile index 395c1d0834db..f9417e64477e 100644 --- a/databases/openldap-client/Makefile +++ b/databases/openldap-client/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2008/07/03 22:14:50 tonnerre Exp $ +# $NetBSD: Makefile,v 1.10 2008/07/19 21:08:42 ghen Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Lightweight Directory Access Protocol libraries and client programs -PKGREVISION= 1 CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile index 3d6d9aa939aa..caab38369e76 100644 --- a/databases/openldap-doc/Makefile +++ b/databases/openldap-doc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2008/06/09 09:07:38 ghen Exp $ +# $NetBSD: Makefile,v 1.13 2008/07/19 21:08:42 ghen Exp $ -DISTNAME= openldap-2.4.9 +DISTNAME= openldap-2.4.11 PKGNAME= ${DISTNAME:S/-/-doc-/} CATEGORIES= databases MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ @@ -34,9 +34,10 @@ NO_BUILD= yes DOCDIR= ${PREFIX}/share/doc/openldap IMAGES= allmail-en.png allusersgroup-en.png config_dit.png IMAGES+= config_local.png config_ref.png config_repl.png -IMAGES+= dual_dc.png intro_dctree.png intro_tree.png refint.png -IMAGES+= set-following-references.png set-memberUid.png -IMAGES+= set-recursivegroup.png +IMAGES+= dual_dc.png intro_dctree.png intro_tree.png +IMAGES+= push-based-complete.png push-based-standalone.png +IMAGES+= refint.png set-following-references.png +IMAGES+= set-memberUid.png set-recursivegroup.png do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} diff --git a/databases/openldap-doc/PLIST b/databases/openldap-doc/PLIST index 49f3097efbd0..ff0bf70f5bbc 100644 --- a/databases/openldap-doc/PLIST +++ b/databases/openldap-doc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/06/09 09:07:38 ghen Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/07/19 21:08:42 ghen Exp $ share/doc/openldap/COPYRIGHT share/doc/openldap/LICENSE share/doc/openldap/README @@ -12,6 +12,8 @@ share/doc/openldap/admin/dual_dc.png share/doc/openldap/admin/guide.html share/doc/openldap/admin/intro_dctree.png share/doc/openldap/admin/intro_tree.png +share/doc/openldap/admin/push-based-complete.png +share/doc/openldap/admin/push-based-standalone.png share/doc/openldap/admin/refint.png share/doc/openldap/admin/set-following-references.png share/doc/openldap/admin/set-memberUid.png diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index c5e0bdac6308..5e3dda37cb79 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.127 2008/06/09 09:07:38 ghen Exp $ +# $NetBSD: Makefile,v 1.128 2008/07/19 21:08:42 ghen Exp $ DISTNAME= openldap-${OPENLDAP_VERSION} -OPENLDAP_VERSION= 2.4.9 +OPENLDAP_VERSION= 2.4.11 CATEGORIES= databases MASTER_SITES= # empty DISTFILES= # empty diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index 5aca0383f5fa..44fa36c63d0f 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.16 2008/06/09 09:07:38 ghen Exp $ +# $NetBSD: Makefile.common,v 1.17 2008/07/19 21:08:42 ghen Exp $ # please stick to the "stable" releases as much as possible! -DISTNAME= openldap-2.4.9 +DISTNAME= openldap-2.4.11 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 aeb1347a1be1..a119ac6525bd 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.64 2008/07/03 22:14:50 tonnerre Exp $ +$NetBSD: distinfo,v 1.65 2008/07/19 21:08:42 ghen Exp $ -SHA1 (openldap-2.4.9.tgz) = 7c63d8552fd97e2e2e20310ef8c75e0202a624ee -RMD160 (openldap-2.4.9.tgz) = bd6f9a4cf0d36c7def4ee002f2a2b445a8a1e711 -Size (openldap-2.4.9.tgz) = 4440456 bytes +SHA1 (openldap-2.4.11.tgz) = 5a7d2d8824d8d2671a781a2fc24b629a145b919d +RMD160 (openldap-2.4.11.tgz) = 27959c4111f6ba5b7c4b1344c2cb27d9f69cd628 +Size (openldap-2.4.11.tgz) = 4941654 bytes SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf @@ -14,7 +14,7 @@ SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0 SHA1 (patch-ba) = 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77 -SHA1 (patch-bb) = 5014662e475e4b9f51d444f01ce45fdeb5f36951 +SHA1 (patch-bb) = 0a6c451b501f8fcd98f990aa39cadc5e885cbf4a SHA1 (patch-bd) = e26f7964a71c9b6df216984860acaa22b5a4ba04 SHA1 (patch-be) = fb828f59b4ff21009c24be94a18c01276feab0b5 SHA1 (patch-bf) = 09874cc5fcd476b4bc37bcb1ad5b7f833cfcdb94 diff --git a/databases/openldap/patches/patch-bb b/databases/openldap/patches/patch-bb index 6aba188af4cc..041b01479cc1 100644 --- a/databases/openldap/patches/patch-bb +++ b/databases/openldap/patches/patch-bb @@ -1,14 +1,14 @@ -$NetBSD: patch-bb,v 1.2 2007/08/28 14:08:22 tron Exp $ +$NetBSD: patch-bb,v 1.3 2008/07/19 21:08:42 ghen Exp $ ---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2007-08-24 18:52:03.000000000 +0200 -+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2007-08-24 18:52:18.000000000 +0200 +--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2008-07-10 00:59:00.000000000 +0200 ++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2008-07-19 23:03:28.000000000 +0200 @@ -32,8 +32,12 @@ #include #include "config.h" +#ifdef __NetBSD__ -+#include ++#include +#endif + #ifdef DO_KRB5