diff options
Diffstat (limited to 'databases/openldap')
-rw-r--r-- | databases/openldap/distinfo | 9 | ||||
-rw-r--r-- | databases/openldap/patches/patch-ba | 12 | ||||
-rw-r--r-- | databases/openldap/patches/patch-bb | 17 | ||||
-rw-r--r-- | databases/openldap/patches/patch-bd | 56 | ||||
-rw-r--r-- | databases/openldap/patches/patch-be | 22 | ||||
-rw-r--r-- | databases/openldap/patches/patch-bf | 99 | ||||
-rw-r--r-- | databases/openldap/patches/patch-bh | 14 | ||||
-rw-r--r-- | databases/openldap/patches/patch-da | 17 |
8 files changed, 19 insertions, 227 deletions
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 5c14d6ec194..9c4b5b5dbea 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2009/01/24 22:11:19 manu Exp $ +$NetBSD: distinfo,v 1.68 2009/01/31 15:59:04 manu Exp $ SHA1 (openldap-2.4.13.tgz) = bb6fe22808d36425b3bad6ce367e882530ccbf51 RMD160 (openldap-2.4.13.tgz) = c459bb7912e70187bab298911252b6d14590bfd2 @@ -13,9 +13,4 @@ SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0 -SHA1 (patch-ba) = 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77 -SHA1 (patch-bb) = 0a6c451b501f8fcd98f990aa39cadc5e885cbf4a -SHA1 (patch-bd) = e26f7964a71c9b6df216984860acaa22b5a4ba04 -SHA1 (patch-be) = fb828f59b4ff21009c24be94a18c01276feab0b5 -SHA1 (patch-bf) = f457bac090294e2f2677702ca4faf71c57472057 -SHA1 (patch-bh) = f8660750454c80e7520ed27f1a2e39ecfd266997 +SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4 diff --git a/databases/openldap/patches/patch-ba b/databases/openldap/patches/patch-ba deleted file mode 100644 index c648a250572..00000000000 --- a/databases/openldap/patches/patch-ba +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2007/08/28 14:08:22 tron Exp $ - ---- servers/slapd/overlays/smbk5pwd.c.orig 2007-08-24 18:15:53.000000000 +0200 -+++ servers/slapd/overlays/smbk5pwd.c 2007-08-24 18:33:08.000000000 +0200 -@@ -0,0 +1,7 @@ -+#include "portable.h" -+ -+#ifdef SLAPD_OVER_SMBK5PWD -+#define DO_KRB5 -+#define DO_SAMBA -+#include "../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c" -+#endif diff --git a/databases/openldap/patches/patch-bb b/databases/openldap/patches/patch-bb deleted file mode 100644 index 041b01479cc..00000000000 --- a/databases/openldap/patches/patch-bb +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2008/07/19 21:08:42 ghen Exp $ - ---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2008-07-10 00:59:00.000000000 +0200 -+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2008-07-19 23:03:28.000000000 +0200 -@@ -32,8 +32,12 @@ - #include <ac/string.h> - - #include "config.h" - -+#ifdef __NetBSD__ -+#include <openssl/des.h> -+#endif -+ - #ifdef DO_KRB5 - #include <lber.h> - #include <lber_pvt.h> - #include <lutil.h> diff --git a/databases/openldap/patches/patch-bd b/databases/openldap/patches/patch-bd deleted file mode 100644 index 45cdd541694..00000000000 --- a/databases/openldap/patches/patch-bd +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-bd,v 1.3 2008/01/13 17:15:17 ghen Exp $ - ---- configure.in.orig 2007-10-17 01:43:09.000000000 +0200 -+++ configure.in -@@ -338,6 +338,7 @@ Overlays="accesslog \ - retcode \ - rwm \ - seqmod \ -+ smbk5pwd \ - syncprov \ - translucent \ - unique \ -@@ -374,6 +375,8 @@ OL_ARG_ENABLE(rwm,[ --enable-rwm - no, [no yes mod], ol_enable_overlays) - OL_ARG_ENABLE(seqmod,[ --enable-seqmod Sequential Modify overlay], - yes, [no yes mod], ol_enable_overlays) -+OL_ARG_ENABLE(smbk5pwd,[ --enable-smbk5pwd smbk5pwd overlay], -+ yes, [no yes mod], ol_enable_overlays) - OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay], - yes, [no yes mod], ol_enable_overlays) - OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay], -@@ -536,6 +539,7 @@ BUILD_REFINT=no - BUILD_RETCODE=no - BUILD_RWM=no - BUILD_SEQMOD=no -+BUILD_SMBK5PWD=no - BUILD_SYNCPROV=no - BUILD_TRANSLUCENT=no - BUILD_UNIQUE=no -@@ -2793,6 +2797,18 @@ if test "$ol_enable_rwm" != no ; then - AC_DEFINE_UNQUOTED(SLAPD_OVER_RWM,$MFLAG,[define for Rewrite/Remap overlay]) - fi - -+if test "$ol_enable_smbk5pwd" != no ; then -+ BUILD_SMBK5PWD=$ol_enable_smbk5pwd -+ if test "$ol_enable_smbk5pwd" = mod ; then -+ MFLAG=SLAPD_MOD_DYNAMIC -+ SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS smbk5pwd.la" -+ else -+ MFLAG=SLAPD_MOD_STATIC -+ SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS smbk5pwd.o" -+ fi -+ AC_DEFINE_UNQUOTED(SLAPD_OVER_SMBK5PWD,$MFLAG,[define for smbk5pwd overlay]) -+fi -+ - if test "$ol_enable_seqmod" != no ; then - BUILD_SEQMOD=$ol_enable_seqmod - if test "$ol_enable_seqmod" = mod ; then -@@ -2920,6 +2936,7 @@ dnl overlays - AC_SUBST(BUILD_RETCODE) - AC_SUBST(BUILD_RWM) - AC_SUBST(BUILD_SEQMOD) -+ AC_SUBST(BUILD_SMBK5PWD) - AC_SUBST(BUILD_SYNCPROV) - AC_SUBST(BUILD_TRANSLUCENT) - AC_SUBST(BUILD_UNIQUE) diff --git a/databases/openldap/patches/patch-be b/databases/openldap/patches/patch-be deleted file mode 100644 index bf3cd9934e4..00000000000 --- a/databases/openldap/patches/patch-be +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-be,v 1.3 2008/01/13 17:15:17 ghen Exp $ - ---- servers/slapd/overlays/Makefile.in.orig 2007-10-23 23:25:37.000000000 +0200 -+++ servers/slapd/overlays/Makefile.in -@@ -27,6 +27,7 @@ SRCS = overlays.c \ - retcode.c \ - rwm.c rwmconf.c rwmdn.c rwmmap.c \ - seqmod.c \ -+ smbk5pwd.c \ - syncprov.c \ - translucent.c \ - unique.c \ -@@ -101,6 +102,9 @@ rwm.la : rwm.lo rwmconf.lo rwmdn.lo rwmm - seqmod.la : seqmod.lo - $(LTLINK_MOD) -module -o $@ seqmod.lo version.lo $(LINK_LIBS) - -+smbk5pwd.la : smbk5pwd.lo -+ $(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) -+ - syncprov.la : syncprov.lo - $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS) - diff --git a/databases/openldap/patches/patch-bf b/databases/openldap/patches/patch-bf deleted file mode 100644 index 36d1448ff5d..00000000000 --- a/databases/openldap/patches/patch-bf +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-bf,v 1.6 2009/01/24 22:11:19 manu Exp $ - ---- configure.orig 2008-11-21 02:26:20.000000000 +0100 -+++ configure -@@ -465,7 +465,7 @@ ac_includes_default="\ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_COLLECT BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS SLAPD_NDB_LIBS SLAPD_NDB_INCS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS GSSAPI_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_COLLECT BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SMBK5PWD BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS SLAPD_NDB_LIBS SLAPD_NDB_INCS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS GSSAPI_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -1062,6 +1062,7 @@ SLAPD Overlay Options: - --enable-retcode Return Code testing overlay no|yes|mod [no] - --enable-rwm Rewrite/Remap overlay no|yes|mod [no] - --enable-seqmod Sequential Modify overlay no|yes|mod [yes] -+ --enable-smbk5pwd smbk5pwd overlay no|yes|mod [yes] - --enable-syncprov Syncrepl Provider overlay no|yes|mod [yes] - --enable-translucent Translucent Proxy overlay no|yes|mod [no] - --enable-unique Attribute Uniqueness overlay no|yes|mod [no] -@@ -3185,6 +3186,7 @@ Overlays="accesslog \ - retcode \ - rwm \ - seqmod \ -+ smbk5pwd \ - syncprov \ - translucent \ - unique \ -@@ -3577,6 +3579,30 @@ else - fi; - # end --enable-seqmod - -+# OpenLDAP --enable-smbk5pwd -+ -+ # Check whether --enable-smbk5pwd or --disable-smbk5pwd was given. -+if test "${enable_smbk5pwd+set}" = set; then -+ enableval="$enable_smbk5pwd" -+ -+ ol_arg=invalid -+ for ol_val in no yes mod ; do -+ if test "$enableval" = "$ol_val" ; then -+ ol_arg="$ol_val" -+ fi -+ done -+ if test "$ol_arg" = "invalid" ; then -+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-smbk5pwd" >&5 -+echo "$as_me: error: bad value $enableval for --enable-smbk5pwd" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ ol_enable_smbk5pwd="$ol_arg" -+ -+else -+ ol_enable_smbk5pwd=${ol_enable_overlays:-yes} -+fi; -+# end --enable-smbk5pwd -+ - # OpenLDAP --enable-syncprov - - # Check whether --enable-syncprov or --disable-syncprov was given. -@@ -3896,6 +3922,7 @@ BUILD_REFINT=no - BUILD_RETCODE=no - BUILD_RWM=no - BUILD_SEQMOD=no -+BUILD_SMBK5PWD=no - BUILD_SYNCPROV=no - BUILD_TRANSLUCENT=no - BUILD_UNIQUE=no -@@ -38875,6 +38902,22 @@ _ACEOF - - fi - -+if test "$ol_enable_smbk5pwd" != no ; then -+ BUILD_SMBK5PWD=$ol_enable_smbk5pwd -+ if test "$ol_enable_smbk5pwd" = mod ; then -+ MFLAG=SLAPD_MOD_DYNAMIC -+ SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS smbk5pwd.la" -+ else -+ MFLAG=SLAPD_MOD_STATIC -+ SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS smbk5pwd.o" -+ fi -+ -+cat >>confdefs.h <<_ACEOF -+#define SLAPD_OVER_SMBK5PWD $MFLAG -+_ACEOF -+ -+fi -+ - if test "$ol_enable_syncprov" != no ; then - BUILD_SYNCPROV=$ol_enable_syncprov - if test "$ol_enable_syncprov" = mod ; then -@@ -39822,6 +39865,7 @@ s,@BUILD_REFINT@,$BUILD_REFINT,;t t - s,@BUILD_RETCODE@,$BUILD_RETCODE,;t t - s,@BUILD_RWM@,$BUILD_RWM,;t t - s,@BUILD_SEQMOD@,$BUILD_SEQMOD,;t t -+s,@BUILD_SMBK5PWD@,$BUILD_SMBK5PWD,;t t - s,@BUILD_SYNCPROV@,$BUILD_SYNCPROV,;t t - s,@BUILD_TRANSLUCENT@,$BUILD_TRANSLUCENT,;t t - s,@BUILD_UNIQUE@,$BUILD_UNIQUE,;t t diff --git a/databases/openldap/patches/patch-bh b/databases/openldap/patches/patch-bh deleted file mode 100644 index 9f28775acfe..00000000000 --- a/databases/openldap/patches/patch-bh +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bh,v 1.3 2008/01/13 17:15:17 ghen Exp $ - ---- include/portable.hin.orig 2007-09-01 01:13:53.000000000 +0200 -+++ include/portable.hin -@@ -987,6 +987,9 @@ - /* define for Sequential Modify overlay */ - #undef SLAPD_OVER_SEQMOD - -+/* define for smbk5pwd overlay */ -+#undef SLAPD_OVER_SMBK5PWD -+ - /* define for Syncrepl Provider overlay */ - #undef SLAPD_OVER_SYNCPROV - diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da new file mode 100644 index 00000000000..a27cdc3e218 --- /dev/null +++ b/databases/openldap/patches/patch-da @@ -0,0 +1,17 @@ +$NetBSD: patch-da,v 1.1 2009/01/31 15:59:04 manu Exp $ +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2004-04-02 11:06:38.000000000 +0000 ++++ contrib/slapd-modules/smbk5pwd/Makefile 2009-01-18 18:06:11.000000000 +0000 +@@ -11,6 +11,6 @@ + + LIBTOOL=../../../libtool +-OPT=-g -O2 +-CC=gcc ++OPT=-g -O2 ${CPPFLAGS} ++#CC=gcc + + # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. +@@ -35,3 +35,3 @@ + smbk5pwd.la: smbk5pwd.lo + $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ +- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS) ++ -rpath $(PREFIX)/lib -module -o $@ $? -ldes $(LIBS) |