pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/databases/openldap Pullup ticket 1632 - reques...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5accbd88b026
branches: pkgsrc-2006Q1
changeset: 510279:5accbd88b026
user: salo <salo%pkgsrc.org@localhost>
date: Mon May 22 12:58:24 2006 +0000
description:
Pullup ticket 1632 - requested by ghen
security update for openldap
Revisions pulled up:
- pkgsrc/databases/openldap/Makefile 1.111, 1.112, 1.113
- pkgsrc/databases/openldap/PLIST 1.26
- pkgsrc/databases/openldap/distinfo 1.45, 1.46, 1.47
- pkgsrc/databases/openldap/patches/patch-ac 1.11
- pkgsrc/databases/openldap/patches/patch-ad 1.7
- pkgsrc/databases/openldap/patches/patch-ah 1.5
- pkgsrc/databases/openldap/patches/patch-am 1.5
Module Name: pkgsrc
Committed By: grant
Date: Fri Apr 7 00:35:02 UTC 2006
Modified Files:
pkgsrc/databases/openldap: Makefile
Log Message:
fix avl_* function prototype conflicts on Solaris, so this now builds
on Solaris.
---
Module Name: pkgsrc
Committed By: ghen
Date: Mon May 15 19:01:23 UTC 2006
Modified Files:
pkgsrc/databases/openldap: Makefile PLIST distinfo
pkgsrc/databases/openldap/patches: patch-ac patch-ah patch-am
Log Message:
Update OpenLDAP from 2.3.11 to 2.3.21. Ok with joerg.
Here are all the changes:
OpenLDAP 2.3.21 Release
Fixed libldap referral chasing issue (ITS#4448)
Fixed libldap invalid free bug (ITS#4436)
Fixed libldap mutex leak (ITS#4441)
Fixed libldap_r thr_yield(2) return handling (ITS#4469)
Fixed slapd syncprov/glue interaction issue (ITS#4323, ITS#4417)
Fixed slapd operational attrs in presence of global overlays (ITS#4431)
Fixed slapd "threads" config value checking (ITS#4433)
Fixed slapd connection index bound check (ITS#4449)
Fixed slapd connection cleanup (ITS#4465)
Fixed slapd slap_realloc misuse (ITS#4477)
Fixed slapd size limit check when pagesize=3D1 (ITS#4479)
Fixed slapd-bdb/hdb cache issue (ITS#4439)
Fixed slapd-ldbm crash on modify bug (ITS#4464)
Fixed slapd-ldap potential bind deadlock (ITS#4409)
Fixed slapd-ldap/meta conn expiration concurrency (ITS#4429)
Fixed slapd-ldap failed bind connection trashing (ITS#4428)
Fixed slapd-ldap/meta chase-referrals disabling (ITS#4447)
Fixed slapd-ldap controls forwarding (ITS#4457)
Fixed slapd-ldap pretty DN in proxied requests (ITS#4456)
Fixed slapd-ldbm crash on modify bug (ITS#4464)
Fixed slapd-meta write error mapping (ITS#4419)
Removed lint
Build Environment
Added slapo-auditlog build support (ITS#4372)
Fixed multi-precision sizeof detection (ITS#4416)
Fixed liblunicode build (ITS#4435)
Updated libtool to version 1.5.22 (ITS#4471)
Updated shtool to version 2.0.5
OpenLDAP 2.3.20 Release
Added libldap SASL workaround for broken LDAP servers (ITS#4391)
Fixed libldap/slapd valuesReturnFilter OID (ITS#4404)
Fixed slapd config_generic_wrapper missing parameter bug (ITS#4376)
Fixed slapd extensible filter value normalization bug (ITS#4380)
Fixed slapd context CSN not updating issue (ITS#4384)
Fixed slapd non-read/write epoll event handling (ITS#4395)
Fixed slapd syncrepl de-normalize UUID issue
Fixed slapd syncrepl dynamic reconfig issue (ITS#4401)
Added slapd syncrepl log messages (ITS#4369)
Added slapd permissive modify/increment support
Added slapd dynamically registered debug level support
Fixed slapd connectionless LDAP support
Fixed slapd cn=3Dconfig error on create failure issue (ITS#4407)
Fixed slapd-bdb/hdb wake listener on runqueue submit (ITS#4385)
Fixed slapd-ldap/meta resources leaks on multiple binds (ITS#4387)
Fixed slapd-ldap/meta assert on connection shutdown (ITS#4390)
Added slapd-meta subtree-exclude feature
Fixed slapo-syncprov update latency issue (ITS#4385)
Fixed slapo-auditlog crash (ITS#4394)
Fixed slapo-accesslog unbind crash (ITS#4386)
Fixed slurpd reject error formating (ITS#4382)
Fixed ldappasswd unbind issue (ITS#4403)
Fixed slapo-pcache assert on attrsonly search (ITS#4406)
Added slapo-pcache max_queries enhancement (ITS#4225)
Added slapo-pcache negative caching enhancement
Build Environment
Fixed liblunicode cross compiling problem (ITS#4363)
Updated <netinet/tcp.h> detection for AIX (ITS#4312)
Updated multi-precision library detection
Documentation
Updated misc. manual pages
OpenLDAP 2.3.19 Release
Fixed libldap disable DH key exchange with DH params (ITS#4354)
Fixed libldap_r thread pool destroy hang (ITS#4349,ITS#4368)
Fixed slapd slap_daemon destroy issue (ITS#4370)
Fixed slapd-hdb livelock issue (ITS#4360)
Fixed slapd-bdb/hdb auto-recovery issue (ITS#4361,ITS#4373)
Fixed slapd-bdb/hdb BDB 4.4 compatibility issues (ITS#4362)
Fixed slapo-ppolicy modify issue (ITS#4355)
Fixed slapo-syncprov/pcache filter dup issue (ITS#4364)
Fixed slapo-syncprov playlog nentries reset issue (ITS#4365)
Build environment
Fixed slaptools when --disable-debug (ITS#4351)
Fixed slapd(8) solaris select(2) issue (ITS#4357)
OpenLDAP 2.3.18 Release
Fixed slapd syncrepl variable used before set bug (ITS#4331)
Updated slapd-meta retry capabilities (ITS#4328)
Fixed slapd-bdb slapcat autorecover bug (ITS#4324)
Fixed slapo-chain search limits (ITS#4336)
Fixed slapo-pcache attrsets issues (ITS#4316)
Fixed slapo-translucent connection destroy (ITS#4334)
Fixed slapd-config handling of attribute options (ITS#4339)
Fixed slapd-ldap idassert resource leak (ITS#4326)
Fixed slapd-meta nretries issue (ITS#4059)
Fixed slapd wake_listener loses wakes (ITS#4343)
Fixed slapd connection manager issue (ITS#4338)
Fixed slapd handling of old style configuration directives (ITS#4341)
Removed slapd-bdb/hdb extraneous yields (ITS#3950)
Build Environment
Removed problematic Linux sched_yield(2) workarounds (ITS#3950)
Documentation
Updated release documents
Updated misc. manual pages
OpenLDAP 2.3.17 Release
Fixed slapd anonymous proxy authorization issue (ITS#4320)
Fixed slapd-ldap/meta session reuse issue (ITS#4315)
Fixed slapd-ldap idassert anon-to-anon issue (ITS#4321)
Fixed slapd-monitor thread issue (ITS#4318)
Build environment
Updated Linux sched_yield(2) workaround to use nanosleep(2) (ITS#3950)
Fixed configure report-to URL
OpenLDAP 2.3.16 Release
Fixed slapd-bdb reindexing via cn=3Dconfig not noticed issue (ITS#4260)
Fixed slapd-monitor connection search crash (ITS#4300)
Flapd slapd cn=3Dconfig bad ACL syntax modify crash (ITS#4306)
Fixed slapd ACL/suffix configuration issue (ITS#4307)
Fixed slapd-bdb/hdb cache issue (ITS#4308)
Fixed slapd-bdb/hdb/ldbm suffix add with default referral issue (ITS#4310)
Fixed slapd-ldbm compare cache release issue (ITS#4313)
Fixed slapd syncrepl time/size limit parsing
Fixed slapi slapi_op_bind_callback fix (ITS#4311)
Fixed slapi pluginlog fix (ITS#4291)
Fixed ldapsearch response control handling issue
Build environment
Replace sched_yield(2) on Linux with select(2) (ITS#3950)
Documentation
Added slapd-bdb(5) cachefree description
Updated misc. manual pages
OpenLDAP 2.3.15 Release
Fixed slapd strerror logging bug (ITS#4292)
Fixed slapd ACL add/delete fraction issue (ITS#4295)
Fixed slapd ACL users selfwrite issue (ITS#4299)
Fixed slapd attrs/objectclass replog issues (ITS#4298)
Fixed slapd-ldap password modify exop password return (ITS#4294)
Build environment
Disable test030-relay when threads are unavailable (ITS#4297)
OpenLDAP 2.3.14 Release
Fixed slapd assertion control restrictions
Fixed slapd sc_prev update after free bug (ITS#4237)
Fixed slapd pid file creation (ITS#4241,4251)
Fixed slapd DEBUG dependency (ITS#4245)
Added slapd warning for excessive threads number (ITS#4249)
Fixed slapd passwd incomplete mod structure issue (ITS#4278)
Fixed slapd ACL exact attrval clause normalization (ITS#4255)
Fixed slapd modify/delete by ordered index issue
Fixed slapd strerror NULL bug (ITS#4285)
Fixed slapd-glue issues (ITS#4084,4133)
Fixed slapd-hdb idl Delete bug (ITS#4250)
Fixed slapd-hdb cache deadlock (ITS#4254)
Fixed slapd-bdb/hdb alock_close bug (ITS#4259)
Fixed slapd-bdb dn2id IDL cache bug (ITS#4263)
Fixed slapd-bdb/hdb mode argument parsing (ITS#4257)
Fixed slapd-bdb/hdb cn=3Dconfig reindexing (ITS#4260)
Fixed slapd-bdb/hdb cn=3Dconfig olcDbIndex modify/replace (ITS#4262)
Fixed slapd-bdb/hdb lockup issue (ITS#4184)
Fixed slapd-ldap anonymous identity assertion (ITS#4272)
Added slapd-ldap/meta idle-timeout support (ITS#4115)
Fixed slapd-meta bind-timeout handling
Fixed slapd-sql plug leak
Fixed slapo-dynlist/dyngroup nonexistant object return code (ITS#4224)
Updated slapo-dynlist (ITS#3756,3781)
Fixed slapo-rwm static DN free bug (ITS#4248)
Fixed slapo-syncprov unpublished control (ITS#4238)
Fixed slapo-syncprov message id issue
Fixed slapo-unique extraneous searches (ITS#4267)
Build environment
Fixed thread dependency of test028 (ITS#4141)
Updated test026-dn
Updated test033-glue-syncrepl (ITS#4264)
Documentation
Updated slapd.conf(5) and Admin Guide (ITS#4146,4266)
Updated slapo-dynlist(5) (ITS#4197)
Updated slapo-pcache(5) (ITS#4232)
Updated slapindex(8) (ITS#4242)
OpenLDAP 2.3.13 Release
Fixed libldap/liblutil MSG_ACCRIGHTSLEN bug (ITS#4206)
Fixed libldap ldap_bv2escaped_filter_value issue (ITS#4212)
Fixed liblutil URL value-specs issue (ITS#4221)
Fixed slapd sizelimit disclose issue (ITS#4213)
Fixed slapd gentlehup write restrict issue (ITS#3717)
Fixed slapd gentlehup abnormal issue (ITS#4217)
Fixed slapd delta-sync subtree scope issue (ITS#4227)
Fixed slapd cn=3Dconfig OID/name pollution issue (ITS#4185)
Fixed slapd cn=3Dconfig rootdn issue (ITS#4192)
Fixed slapd cn=3Dconfig slaptest -F without -f issue (ITS#4194)
Fixed slapd cn=3Dconfig ACL issue (ITS#4218)
Fixed slapd-bdb negative results IDL cache issue (ITS#4223)
Fixed slapd-bdb cursor close issue (ITS#4226)
Fixed slapd-hdb slapadd -q issue (ITS#4210)
Fixed slapd-hdb missing results issue (ITS#4186)
Fixed slapd-ldap potential double free issue (ITS#4189)
Fixed slapd-meta matched DN issue (ITS#4195)
Fixed slapd-meta DN cache issue (ITS#4196)
Fixed slapd-monitor shadow issue (ITS#4214)
Fixed slapo-accesslog delta-syncrepl issue (ITS#4198)
Fixed slapo-accesslog cleanup issue (ITS#4209)
Fixed slapo-chain resource leak issue (ITS#4140)
Fixed slapo-chain identity assertion issue (ITS#4256)
Fixed slapo-pcache attrset check issue (ITS#4199)
Fixed slapd-bdb readonly dirty alock issue (ITS#4201)
Fixed slapd-pcache non-requested attributes issues (ITS#4203,4204)
Fixed slaptest -F -f success with unsupported issue (ITS#4220)
Build environment
Improved Berkeley DB detection (ITS#3809)
Updated DB_CONFIG example (ITS#4229)
Documentation
Updated ldif(5) to include change record description
OpenLDAP 2.3.12 Release
Fixed libldap ldapi:// authdn construction
Added libldap ldap_bv2escaped_filter_value (ITS#2535)
Added libldap/slapd TLS DSA certificate support (ITS#4017)
Fixed libldap SASL bind issue (ITS#4158)
Fixed ldapmodrdn empty line handling (ITS#4101)
Fixed client tools additional info printing (ITS#4147)
Updated slapd ldaps:// not configured fix (ITS#4082,4083)
Fixed slapd connection crashes (ITS#4108)
Fixed slapd illegal S option bug (ITS#4119)
Fixed slapd cn=3Dmonitor log level mod issue (ITS#4091)
Fixed slapd cn=3Dconfig bad access issue (ITS#4111)
Fixed slapd cn=3Dconfig access modify issue (ITS#4127)
Fixed slapd cn=3Dconfig init issue (ITS#4128)
Fixed slapd non-reentrant libwrap issue (ITS#4099)
Fixed slapd thread v. tools_threads settings
Fixed slapd spurious defer message (ITS#3850)
Fixed slapd attribute SYNTAX OIDM issue (ITS#4116)
Fixed slapd modify empty sequence bug (ITS#4183)
Fixed slapd-bdb uninitialized condition in tool mode (ITS#4143)
Fixed slapd-bdb empty suffix and syncprov issue (ITS#4171)
Fixed slapd-hdb syncrepl deadlock issue (ITS#4088)
Added slapd-ldap write op timeout support (ITS#4157)
Fixed slapd-ldap/slapo-chain matched dn handling (ITS#4176)
Fixed slapd-meta invalid DN attrs normalize/pretty issue (ITS#4107)
Fixed slapd-meta rootdn erroneous success issue (ITS#4122)
Fixed slapd-meta proxying bind result issue (ITS#4129)
Fixed slapd-meta/slapo-rwm rwm-mapping issue (ITS#4086)
Fixed slapd-meta per-target retry (ITS#4150)
Fixed slapd-meta size/time limit handling (ITS#4145)
Fixed slapd-sql size limit count (ITS#4181)
Fixed slapo-ppolicy pwdFailureTime after bind success issue (ITS#4134)
Fixed slapo-ppolicy add passord_hash quality config dependency
Fixed slapo-syncprov LDAP response types (ITS#4183)
Added slapd delta syncrepl support
Added slapadd thread support
Updated slapcat subordinate database handling (ITS#4089)
Added slapd/slaptest pid/arg file consistency check (ITS#4074)
Updated slaptools default debug level to "none" (ITS#4044)
Fixed slurpd backwards compat issue (ITS#4151)
Added slurpd pid/arg file consistency check (ITS#4152)
Updated contrib smbk5pwd module
Removed lint
Build environment
Fixed libldap HSTRERROR issue (ITS#4124)
Fixed slapd AIX IFMT issue (ITS#4123)
Added slapd-bind test program
Added inet_ntoa_b support for VxWorks (ITS#3440)
Updated test036 (ITS#4095)
Fixed test036 cmp issue (ITS#4142)
Dropped SSLeay support
Documentation
slapd.conf(5) defaultSearchBase issue (ITS#4162)
slap tool man pages wll typo (ITS#4169)
---
Module Name: pkgsrc
Committed By: taca
Date: Thu May 18 05:14:11 UTC 2006
Modified Files:
pkgsrc/databases/openldap: distinfo
pkgsrc/databases/openldap/patches: patch-ad
Log Message:
Fix build problem of libraries/liblutil/sha1.c; function proto type
mis-match.
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri May 19 14:46:10 UTC 2006
Modified Files:
pkgsrc/databases/openldap: Makefile distinfo
Log Message:
Update to OpenLDAP 2.3.23.
OpenLDAP 2.3.23 Release
Fixed slapd-ldap improper free bug (ITS#4550)
OpenLDAP 2.3.22 Release
Fixed libldap referral input destroy issue (ITS#4533)
Fixed libldap ldap_sort_entries tail bug (ITS#4536)
Fixed libldap default connection concurrency issue (ITS#4541)
Fixed libldap_r thread debug missing break
Fixed libldap_r tpool cleanup
Fixed liblutil strtoul(3) usage (ITS#4503)
Fixed liblutil time resolution issue (ITS#4514)
Updated ldapdelete(1) to stdout bug (ITS#4453)
Updated ldapsearch(1) BASE output (ITS#4504)
Fixed slapd backglue issue (ITS#4529)
Fixed slapd cn=3Dconfig (ITS#4512)
Fixed slapd cn=3Dconfig ACL application fix
Fixed slapd cn=3Dconfig olcLimits (ITS#4515)
Fixed slapd dynacl tgrant/tdeny initialization
Fixed slapd runqueue use of freed memory (ITS#4517)
Fixed slapd slap_send_ldap_result bug (ITS#4499)
Fixed slapd thread pool init issue (ITS#4513)
Added slapd syncrepl mandatory searchbase check
Fixed slapd-bdb/hdb pre/post-read freeing (ITS#4532)
Fixed slapd-bdb/hdb pre/post-read unavailable issue (ITS#4538)
Fixed slapd-bdb/hdb referral issue (ITS#4548)
Fixed slapd-hdb IDL sort issue (ITS#4531)
Fixed slapd-ldap proxyAuthz of bound identity/override (ITS#4497)
Fixed slapd-ldap/meta protocol version propagation (ITS#4488)
Fixed slapd-ldap fd cleanup (ITS#4474)
Fixed slapd-ldif deadlock (ITS#4500)
Fixed slapd-shell lutil_atoi issue (ITS#4495)
Fixed slapadd cn=3Dconfig issue (ITS#4194)
Fixed slapo-accesslog log purging issue (ITS#4505)
Added slapo-accesslog reqOld feature
Fixed slapo-auditlog missing return codes
Fixed slapo-ppolicy BER tags issue (ITS#4528)
Fixed slapo-ppolicy rebind bug (ITS#4516)
Fixed slapo-refint delete prohibit issue (ITS#4442)
Fixed slapo-syncprov MODs cause DELs (ITS#4423)
Fixed slapo-syncprov/syncrepl sessionlog issue (ITS#4534)
Added slapo-syncprov extra logging
Fixed slapo-translucent modifications (ITS#4527)
Fixed slurpd potential overflow issue
Build Environment
Fixed OSF1 compilation problem (ITS#4537)
Fixed test020-proxycache disabled debug issue (ITS#4491)
Fixed test033-glue-syncrepl overlay detection (ITS#4544)
Documentation
Fixed slapd(8) logging header reference (ITS#4509)
Clarified slapd.conf(5) "disable bind_anon" feature
diffstat:
databases/openldap/Makefile | 20 +++++++++++++++++---
databases/openldap/PLIST | 4 ++--
databases/openldap/distinfo | 16 ++++++++--------
databases/openldap/patches/patch-ac | 10 +++++-----
databases/openldap/patches/patch-ad | 10 +++++-----
databases/openldap/patches/patch-ah | 14 +++++++-------
databases/openldap/patches/patch-am | 24 ++++++++++++------------
7 files changed, 56 insertions(+), 42 deletions(-)
diffs (238 lines):
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/Makefile
--- a/databases/openldap/Makefile Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/Makefile Mon May 22 12:58:24 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2006/03/14 16:23:46 joerg Exp $
+# $NetBSD: Makefile,v 1.110.2.1 2006/05/22 12:58:24 salo Exp $
-DISTNAME= openldap-2.3.11
-PKGREVISION= 2
+DISTNAME= openldap-2.3.23
SVR4_PKGNAME= oldap
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -28,6 +27,21 @@
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
+# the internal avl_* prototypes conflict with those in <sys/avl.h> which
+# is included by another system header file on Solaris, so subst them.
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+= conflict
+SUBST_STAGE.conflict= post-patch
+SUBST_FILES.conflict= ${WRKSRC}/*/*.h
+SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g'
+SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g'
+SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g'
+SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g'
+SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g'
+SUBST_MESSAGE.conflict= Fixing conflicting function prototypes.
+.endif
+
CPPFLAGS.Darwin+= -DBIND_8_COMPAT
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/PLIST
--- a/databases/openldap/PLIST Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/PLIST Mon May 22 12:58:24 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2005/10/26 15:11:10 jlam Exp $
+@comment $NetBSD: PLIST,v 1.25.4.1 2006/05/22 12:58:24 salo Exp $
bin/ldapadd
bin/ldapcompare
bin/ldapdelete
@@ -243,7 +243,7 @@
share/examples/openldap/schema/openldap.schema
share/examples/openldap/schema/ppolicy.schema
share/examples/openldap/slapd.conf
+share/examples/rc.d/slapd
share/examples/rc.d/slurpd
-share/examples/rc.d/slapd
@dirrm share/examples/openldap/schema
@dirrm share/examples/openldap
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/distinfo
--- a/databases/openldap/distinfo Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/distinfo Mon May 22 12:58:24 2006 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.44 2005/12/29 20:10:23 ghen Exp $
+$NetBSD: distinfo,v 1.44.2.1 2006/05/22 12:58:24 salo Exp $
-SHA1 (openldap-2.3.11.tgz) = e7a4a5b2d50b8138ed835b7e9e722814f1877806
-RMD160 (openldap-2.3.11.tgz) = 4947c7f15b70dfd55ff30028228ec915064feba1
-Size (openldap-2.3.11.tgz) = 3657646 bytes
-SHA1 (patch-ac) = d63169a103a6e34196031aaafa342c94a4f42cc7
-SHA1 (patch-ad) = 5999228819572b12e8a648a1af4f04a410ecbe06
+SHA1 (openldap-2.3.23.tgz) = 30739e29eed78a261232375a9e3f276887ad626f
+RMD160 (openldap-2.3.23.tgz) = 29bfd36b986cdcd56982082d2d6cb630840053df
+Size (openldap-2.3.23.tgz) = 3755995 bytes
+SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
+SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
SHA1 (patch-ag) = 8c936e930454e3ae39997c83910eeffb4ad29523
-SHA1 (patch-ah) = 5ff11aa8ecf860b758cba2149048be45ac8ad315
+SHA1 (patch-ah) = 4e20f5b9c7e680cc84938747eccc5be60cd2a03c
SHA1 (patch-aj) = 6425a7bf08fa35861d0ea71d893836e177b0b29a
SHA1 (patch-ak) = 80685a7b46ded94722ea91c2842db424572d6513
-SHA1 (patch-am) = 12929851d1cfae97e1afa082cb82a00341a0d9ed
+SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/patches/patch-ac
--- a/databases/openldap/patches/patch-ac Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/patches/patch-ac Mon May 22 12:58:24 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.10 2005/11/19 18:41:16 joerg Exp $
+$NetBSD: patch-ac,v 1.10.4.1 2006/05/22 12:58:24 salo Exp $
---- libraries/libldap_r/thr_posix.c.orig 2005-09-28 00:30:29.000000000 +0000
+--- libraries/libldap_r/thr_posix.c.orig 2006-05-13 11:47:50.000000000 +0200
+++ libraries/libldap_r/thr_posix.c
@@ -19,6 +19,7 @@
#if defined( HAVE_PTHREADS )
@@ -8,9 +8,9 @@
#include <ac/errno.h>
+#include <ac/unistd.h>
- #include "ldap_pvt_thread.h" /* Get the thread interface */
- #define LDAP_THREAD_IMPLEMENTATION
-@@ -132,9 +133,11 @@ ldap_pvt_thread_create( ldap_pvt_thread_
+ #ifdef REPLACE_BROKEN_YIELD
+ #ifndef HAVE_NANOSLEEP
+@@ -139,9 +140,11 @@ ldap_pvt_thread_create( ldap_pvt_thread_
#endif
#ifdef LDAP_PVT_THREAD_SET_STACK_SIZE
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/patches/patch-ad
--- a/databases/openldap/patches/patch-ad Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/patches/patch-ad Mon May 22 12:58:24 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2005/10/26 15:08:13 jlam Exp $
+$NetBSD: patch-ad,v 1.6.4.1 2006/05/22 12:58:24 salo Exp $
---- libraries/liblutil/sha1.c.orig 2005-01-20 13:03:52.000000000 -0500
+--- libraries/liblutil/sha1.c.orig 2006-01-04 07:16:11.000000000 +0900
+++ libraries/liblutil/sha1.c
@@ -50,10 +50,16 @@
#define SHA1HANDSOFF /* Copies data before messing with it. */
@@ -49,11 +49,11 @@
+void do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16
+*);
+void do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16
-+);
++*);
+void do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16
-+);
++*);
+void do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16
-+);
++*);
+
+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/patches/patch-ah
--- a/databases/openldap/patches/patch-ah Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/patches/patch-ah Mon May 22 12:58:24 2006 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.4 2005/10/26 15:08:13 jlam Exp $
+$NetBSD: patch-ah,v 1.4.4.1 2006/05/22 12:58:24 salo Exp $
---- libraries/libldap/init.c.orig 2005-10-05 14:41:32.000000000 -0400
+--- libraries/libldap/init.c.orig 2006-05-13 11:47:50.000000000 +0200
+++ libraries/libldap/init.c
-@@ -529,6 +529,9 @@ void ldap_int_initialize( struct ldapopt
-
+@@ -544,6 +544,9 @@ void ldap_int_initialize( struct ldapopt
#if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+ {
+#if defined(LDAP_R_COMPILE)
-+ ldap_pvt_thread_initialize();
++ ldap_pvt_thread_initialize();
+#endif
- ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
- #endif
+ char *name = ldap_int_hostname;
+ ldap_int_hostname = ldap_pvt_get_fqdn( name );
diff -r 54c9f79aa266 -r 5accbd88b026 databases/openldap/patches/patch-am
--- a/databases/openldap/patches/patch-am Mon May 22 12:19:01 2006 +0000
+++ b/databases/openldap/patches/patch-am Mon May 22 12:58:24 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
+$NetBSD: patch-am,v 1.4.4.1 2006/05/22 12:58:24 salo Exp $
---- libraries/libldap/cyrus.c.orig 2005-10-05 13:42:19.000000000 -0400
+--- libraries/libldap/cyrus.c.orig 2006-05-13 11:47:50.000000000 +0200
+++ libraries/libldap/cyrus.c
-@@ -835,7 +835,7 @@ ldap_int_sasl_external(
+@@ -884,7 +884,7 @@ ldap_int_sasl_external(
LDAP *ld,
LDAPConn *conn,
const char * authid,
@@ -11,16 +11,16 @@
{
int sc;
sasl_conn_t *ctx;
-@@ -977,6 +977,7 @@ int ldap_pvt_sasl_secprops(
- char **props = ldap_str2charray( in, "," );
+@@ -1026,6 +1026,7 @@ int ldap_pvt_sasl_secprops(
+ char **props;
unsigned sflags = 0;
int got_sflags = 0;
+ int tmp_ssf;
sasl_ssf_t max_ssf = 0;
int got_max_ssf = 0;
sasl_ssf_t min_ssf = 0;
-@@ -1002,9 +1003,9 @@ int ldap_pvt_sasl_secprops(
- if ( next == NULL || next[ 0 ] != '\0' ) continue;
+@@ -1056,9 +1057,9 @@ int ldap_pvt_sasl_secprops(
+ if ( next == &props[i][sprops[j].key.bv_len] || next[0] != '\0' ) continue;
switch( sprops[j].ival ) {
case GOT_MINSSF:
- min_ssf = v; got_min_ssf++; break;
@@ -31,7 +31,7 @@
case GOT_MAXBUF:
maxbufsize = v; got_maxbufsize++; break;
}
-@@ -1100,7 +1101,7 @@ ldap_int_sasl_get_option( LDAP *ld, int
+@@ -1155,7 +1156,7 @@ ldap_int_sasl_get_option( LDAP *ld, int
return -1;
}
@@ -40,7 +40,7 @@
} break;
case LDAP_OPT_X_SASL_SSF_EXTERNAL:
-@@ -1108,13 +1109,13 @@ ldap_int_sasl_get_option( LDAP *ld, int
+@@ -1163,13 +1164,13 @@ ldap_int_sasl_get_option( LDAP *ld, int
return -1;
case LDAP_OPT_X_SASL_SSF_MIN:
@@ -57,7 +57,7 @@
break;
case LDAP_OPT_X_SASL_SECPROPS:
-@@ -1160,7 +1161,7 @@ ldap_int_sasl_set_option( LDAP *ld, int
+@@ -1215,7 +1216,7 @@ ldap_int_sasl_set_option( LDAP *ld, int
#else
memset(&extprops, 0L, sizeof(extprops));
@@ -66,7 +66,7 @@
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
-@@ -1172,13 +1173,13 @@ ldap_int_sasl_set_option( LDAP *ld, int
+@@ -1227,13 +1228,13 @@ ldap_int_sasl_set_option( LDAP *ld, int
} break;
case LDAP_OPT_X_SASL_SSF_MIN:
@@ -83,7 +83,7 @@
break;
case LDAP_OPT_X_SASL_SECPROPS: {
-@@ -1277,7 +1278,7 @@ ldap_int_sasl_external(
+@@ -1332,7 +1333,7 @@ ldap_int_sasl_external(
LDAP *ld,
LDAPConn *conn,
const char * authid,
Home |
Main Index |
Thread Index |
Old Index