diff options
| author | seb <seb@pkgsrc.org> | 2005-01-24 12:46:25 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2005-01-24 12:46:25 +0000 |
| commit | 50f1e4187e56befaf7cff15a1aa11f57339a3c21 (patch) | |
| tree | ce7271dafea74eb460859102e9a4244e53275c21 /databases | |
| parent | d6869dd52a51e8ae4455f561a993821e873caea8 (diff) | |
| download | pkgsrc-50f1e4187e56befaf7cff15a1aa11f57339a3c21.tar.gz | |
Fix alignment/LP64 issue on NetBSD/sparc64 encountered while trying the
syncrepl engine with SASL.
Bump PKGREVISION.
Approved by jlam@.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/openldap/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 3 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-am | 56 |
3 files changed, 60 insertions, 3 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index bd5d5373fbb..6ea6b15fcd2 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.96 2005/01/12 04:04:36 jlam Exp $ +# $NetBSD: Makefile,v 1.97 2005/01/24 12:46:25 seb Exp $ DISTNAME= openldap-2.2.20 -PKGREVISION= 1 +PKGREVISION= 2 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 dd1fedbb731..c52e6353915 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2005/01/06 11:10:55 adam Exp $ +$NetBSD: distinfo,v 1.37 2005/01/24 12:46:25 seb Exp $ SHA1 (openldap-2.2.20.tgz) = 307460c990a2f4ecfeceaffa4833f6c479005ed5 Size (openldap-2.2.20.tgz) = 2605791 bytes @@ -10,3 +10,4 @@ SHA1 (patch-ah) = b0e2a31920dd1d0a99b04e84561195d669815df7 SHA1 (patch-aj) = cb425a00e480ce625332d9e3c56fd9305075fd01 SHA1 (patch-ak) = 1fd396ea0591fc61a97038bb754a2fd3c9436a48 SHA1 (patch-al) = 83b877289c1306b0d3d5647159c1ba5d546d2012 +SHA1 (patch-am) = 1c7bdf18ab8bf6fd2d676fc8386c0f69b2e10d4b diff --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am new file mode 100644 index 00000000000..d073935fd8f --- /dev/null +++ b/databases/openldap/patches/patch-am @@ -0,0 +1,56 @@ +$NetBSD: patch-am,v 1.1 2005/01/24 12:46:25 seb Exp $ + +--- libraries/libldap/cyrus.c.orig 2004-08-28 13:35:42.000000000 +0000 ++++ libraries/libldap/cyrus.c +@@ -1049,7 +1049,7 @@ ldap_int_sasl_get_option( LDAP *ld, int + return -1; + } + +- *(ber_len_t *)arg = *ssf; ++ *(sasl_ssf_t *)arg = *ssf; + } break; + + case LDAP_OPT_X_SASL_SSF_EXTERNAL: +@@ -1057,13 +1057,13 @@ ldap_int_sasl_get_option( LDAP *ld, int + return -1; + + case LDAP_OPT_X_SASL_SSF_MIN: +- *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf; ++ *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf; + break; + case LDAP_OPT_X_SASL_SSF_MAX: +- *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf; ++ *(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf; + 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; + break; + + case LDAP_OPT_X_SASL_SECPROPS: +@@ -1109,7 +1109,7 @@ ldap_int_sasl_set_option( LDAP *ld, int + #else + memset(&extprops, 0L, sizeof(extprops)); + +- extprops.ssf = * (ber_len_t *) arg; ++ extprops.ssf = * (sasl_ssf_t *) arg; + + sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, + (void *) &extprops ); +@@ -1121,13 +1121,13 @@ ldap_int_sasl_set_option( LDAP *ld, int + } break; + + case LDAP_OPT_X_SASL_SSF_MIN: +- ld->ld_options.ldo_sasl_secprops.min_ssf = *(ber_len_t *)arg; ++ ld->ld_options.ldo_sasl_secprops.min_ssf = *(sasl_ssf_t *)arg; + break; + case LDAP_OPT_X_SASL_SSF_MAX: +- ld->ld_options.ldo_sasl_secprops.max_ssf = *(ber_len_t *)arg; ++ ld->ld_options.ldo_sasl_secprops.max_ssf = *(sasl_ssf_t *)arg; + 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; + break; + + case LDAP_OPT_X_SASL_SECPROPS: { |