diff options
| -rw-r--r-- | databases/openldap/Makefile | 3 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 6 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-am | 10 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-an | 4 |
4 files changed, 12 insertions, 11 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 0e8e5804df6..8441aa7400d 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -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 --git a/databases/openldap/distinfo b/databases/openldap/distinfo index b5972c4dc89..db26bbd9f56 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -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-ag) = 4221d6762ccb9e253e4ad9f98d64ad86c4c4c66b 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 --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am index 4b8bff5fddf..b10870c4ff9 100644 --- a/databases/openldap/patches/patch-am +++ b/databases/openldap/patches/patch-am @@ -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 @@ $NetBSD: patch-am,v 1.2 2005/08/01 09:49:37 jlam Exp $ 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 @@ $NetBSD: patch-am,v 1.2 2005/08/01 09:49:37 jlam Exp $ 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 @@ $NetBSD: patch-am,v 1.2 2005/08/01 09:49:37 jlam Exp $ 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 @@ $NetBSD: patch-am,v 1.2 2005/08/01 09:49:37 jlam Exp $ 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 --git a/databases/openldap/patches/patch-an b/databases/openldap/patches/patch-an index 9495d11f8c8..f109fb5c67f 100644 --- a/databases/openldap/patches/patch-an +++ b/databases/openldap/patches/patch-an @@ -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 @@ $NetBSD: patch-an,v 1.1 2005/08/01 09:49:37 jlam Exp $ 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 )); |