[pkgsrc/trunk]: pkgsrc/databases/openldap Use the correct LDAP type instead o...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df14885f6bfb
branches:  trunk
changeset: 497751:df14885f6bfb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 03 21:01:40 2005 +0000

description:
Use the correct LDAP type instead of the SASL type, which is only
available if building with SASL support.  Noted in private mail by
Joerg Sonnenberger.  Bump PKGREVISION to 1.

diffstat:

 databases/openldap/Makefile         |   3 ++-
 databases/openldap/distinfo         |   6 +++---
 databases/openldap/patches/patch-am |  10 +++++-----
 databases/openldap/patches/patch-an |   4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diffs (92 lines):

diff -r ccc97a856c70 -r df14885f6bfb databases/openldap/Makefile
--- a/databases/openldap/Makefile       Wed Aug 03 20:46:55 2005 +0000
+++ b/databases/openldap/Makefile       Wed Aug 03 21:01:40 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2005/08/01 09:49:37 jlam Exp $
+# $NetBSD: Makefile,v 1.100 2005/08/03 21:01:40 jlam Exp $
 
 DISTNAME=      openldap-2.2.27
+PKGREVISION=   1
 SVR4_PKGNAME=  oldap
 CATEGORIES=    databases
 MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff -r ccc97a856c70 -r df14885f6bfb databases/openldap/distinfo
--- a/databases/openldap/distinfo       Wed Aug 03 20:46:55 2005 +0000
+++ b/databases/openldap/distinfo       Wed Aug 03 21:01:40 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2005/08/01 19:27:39 jlam Exp $
+$NetBSD: distinfo,v 1.41 2005/08/03 21:01:40 jlam Exp $
 
 SHA1 (openldap-2.2.27.tgz) = 0adb9cd6b229c98b7f27df2ad90489c2ea455a05
 RMD160 (openldap-2.2.27.tgz) = 75adc676024b95e25d7c82b3f048c6a28c47b39a
@@ -10,5 +10,5 @@
 SHA1 (patch-ah) = b0e2a31920dd1d0a99b04e84561195d669815df7
 SHA1 (patch-aj) = cb425a00e480ce625332d9e3c56fd9305075fd01
 SHA1 (patch-ak) = 1fd396ea0591fc61a97038bb754a2fd3c9436a48
-SHA1 (patch-am) = d248a40d5faeb4ab6d422101db51b4407298b0c5
-SHA1 (patch-an) = f8e9e5aa5f380eacf2a5846528a69cfa20e49a77
+SHA1 (patch-am) = 8ee096a08a70ca0c6d75564fda1b28e24edce122
+SHA1 (patch-an) = 91878841fb92a0d5f2073a299949088c791d0753
diff -r ccc97a856c70 -r df14885f6bfb databases/openldap/patches/patch-am
--- a/databases/openldap/patches/patch-am       Wed Aug 03 20:46:55 2005 +0000
+++ b/databases/openldap/patches/patch-am       Wed Aug 03 21:01:40 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2005/08/01 09:49:37 jlam Exp $
+$NetBSD: patch-am,v 1.3 2005/08/03 21:01:40 jlam Exp $
 
 --- libraries/libldap/cyrus.c.orig     2005-07-31 22:09:40.000000000 -0400
 +++ libraries/libldap/cyrus.c
@@ -7,7 +7,7 @@
        LDAPConn *conn,
        const char * authid,
 -      ber_len_t ssf )
-+      sasl_ssf_t ssf )
++      ber_uint_t ssf )
  {
        int sc;
        sasl_conn_t *ctx;
@@ -61,7 +61,7 @@
                        break;
                case LDAP_OPT_X_SASL_MAXBUFSIZE:
 -                      *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
-+                      *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
++                      *(ber_uint_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
                        break;
  
                case LDAP_OPT_X_SASL_SECPROPS:
@@ -87,7 +87,7 @@
                break;
        case LDAP_OPT_X_SASL_MAXBUFSIZE:
 -              ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
-+              ld->ld_options.ldo_sasl_secprops.maxbufsize = *(sasl_ssf_t *)arg;
++              ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_uint_t *)arg;
                break;
  
        case LDAP_OPT_X_SASL_SECPROPS: {
@@ -96,7 +96,7 @@
        LDAPConn *conn,
        const char * authid,
 -      ber_len_t ssf )
-+      sasl_ssf_t ssf )
++      ber_uint_t ssf )
  { return LDAP_SUCCESS; }
  
  #endif /* HAVE_CYRUS_SASL */
diff -r ccc97a856c70 -r df14885f6bfb databases/openldap/patches/patch-an
--- a/databases/openldap/patches/patch-an       Wed Aug 03 20:46:55 2005 +0000
+++ b/databases/openldap/patches/patch-an       Wed Aug 03 21:01:40 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2005/08/01 09:49:37 jlam Exp $
+$NetBSD: patch-an,v 1.2 2005/08/03 21:01:40 jlam Exp $
 
 --- libraries/libldap/ldap-int.h.orig  2005-04-17 19:55:21.000000000 -0400
 +++ libraries/libldap/ldap-int.h
@@ -7,7 +7,7 @@
  LDAP_F (int) ldap_int_sasl_external LDAP_P((
        LDAP *ld, LDAPConn *conn,
 -      const char* authid, ber_len_t ssf ));
-+      const char* authid, sasl_ssf_t ssf ));
++      const char* authid, ber_uint_t ssf ));
  
  LDAP_F (int) ldap_int_sasl_get_option LDAP_P(( LDAP *ld,
        int option, void *arg ));