summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/openldap/Makefile20
-rw-r--r--databases/openldap/PLIST4
-rw-r--r--databases/openldap/distinfo16
-rw-r--r--databases/openldap/patches/patch-ac10
-rw-r--r--databases/openldap/patches/patch-ad10
-rw-r--r--databases/openldap/patches/patch-ah14
-rw-r--r--databases/openldap/patches/patch-am24
7 files changed, 56 insertions, 42 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 467b46398bf..f0d2e73d0a5 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -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 @@ FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
.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 --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 6c0728a0d50..ff9cf95297f 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -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.ldif
share/examples/openldap/schema/openldap.schema
share/examples/openldap/schema/ppolicy.schema
share/examples/openldap/slapd.conf
-share/examples/rc.d/slurpd
share/examples/rc.d/slapd
+share/examples/rc.d/slurpd
@dirrm share/examples/openldap/schema
@dirrm share/examples/openldap
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 6abbed84acd..c2d55bb8da9 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -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 --git a/databases/openldap/patches/patch-ac b/databases/openldap/patches/patch-ac
index f1f3d4ee288..ce71989e393 100644
--- a/databases/openldap/patches/patch-ac
+++ b/databases/openldap/patches/patch-ac
@@ -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 @@ $NetBSD: patch-ac,v 1.10 2005/11/19 18:41:16 joerg Exp $
#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 --git a/databases/openldap/patches/patch-ad b/databases/openldap/patches/patch-ad
index 4cb11748cae..40cc6f2f085 100644
--- a/databases/openldap/patches/patch-ad
+++ b/databases/openldap/patches/patch-ad
@@ -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 @@ $NetBSD: patch-ad,v 1.6 2005/10/26 15:08:13 jlam Exp $
+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 --git a/databases/openldap/patches/patch-ah b/databases/openldap/patches/patch-ah
index 5d3306b043e..8a9cf87506f 100644
--- a/databases/openldap/patches/patch-ah
+++ b/databases/openldap/patches/patch-ah
@@ -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 --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am
index 8c0bf478cdd..5abcea56966 100644
--- a/databases/openldap/patches/patch-am
+++ b/databases/openldap/patches/patch-am
@@ -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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
{
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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
} 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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
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 @@ $NetBSD: patch-am,v 1.4 2005/10/26 15:08:13 jlam Exp $
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,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 20:16:43 +0000