pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc Add smbk5pwd support (sync samba and kerberos pass...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cd761f1dc5db
branches: trunk
changeset: 532616:cd761f1dc5db
user: manu <manu%pkgsrc.org@localhost>
date: Fri Aug 24 19:06:50 2007 +0000
description:
Add smbk5pwd support (sync samba and kerberos passwords on password changes)
The smbk5pwd overlay is now static. It can be used like this:
overlay smbk5pwd
To sync only the samba password, add this:
smbk5pwd-enable samba
See contrib/slapd-modules/smbk5pwd/README in openldap distribution for more
information
diffstat:
databases/openldap-server/Makefile | 3 +-
databases/openldap-server/options.mk | 18 +++++-
databases/openldap/distinfo | 8 ++-
databases/openldap/patches/patch-ba | 10 +++
databases/openldap/patches/patch-bb | 15 ++++
databases/openldap/patches/patch-bd | 64 ++++++++++++++++++++
databases/openldap/patches/patch-be | 24 +++++++
databases/openldap/patches/patch-bf | 111 +++++++++++++++++++++++++++++++++++
databases/openldap/patches/patch-bh | 14 ++++
doc/CHANGES-2007 | 3 +-
10 files changed, 265 insertions(+), 5 deletions(-)
diffs (truncated from 338 to 300 lines):
diff -r f247989400dd -r cd761f1dc5db databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile Fri Aug 24 16:43:28 2007 +0000
+++ b/databases/openldap-server/Makefile Fri Aug 24 19:06:50 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/07/04 20:54:35 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/08/24 19:06:51 manu Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
+PKGREVISION= 1
COMMENT= Lightweight Directory Access Protocol server suite
CONFLICTS+= openldap<2.3.23nb1
diff -r f247989400dd -r cd761f1dc5db databases/openldap-server/options.mk
--- a/databases/openldap-server/options.mk Fri Aug 24 16:43:28 2007 +0000
+++ b/databases/openldap-server/options.mk Fri Aug 24 19:06:50 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2007/03/15 14:28:57 manu Exp $
+# $NetBSD: options.mk,v 1.4 2007/08/24 19:06:51 manu Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
-PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6
+PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd
PKG_OPTIONS_OPTIONAL_GROUPS+= odbc
PKG_OPTIONS_GROUP.odbc= iodbc unixodbc
PKG_SUGGESTED_OPTIONS= bdb
@@ -85,3 +85,17 @@
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
+
+###
+### smbk5pwd support (sync samba and kerberos passwords on password changes)
+###
+
+.if !empty(PKG_OPTIONS:Msmbk5pwd)
+CONFIGURE_ARGS+= --enable-smbk5pwd
+LDFLAGS+=-ldes
+LDFLAGS+=-lkrb5
+LDFLAGS+=-lkadm5srv
+LDFLAGS+=-lhdb
+. include "../../mk/krb5.buildlink3.mk"
+.endif
+
diff -r f247989400dd -r cd761f1dc5db databases/openldap/distinfo
--- a/databases/openldap/distinfo Fri Aug 24 16:43:28 2007 +0000
+++ b/databases/openldap/distinfo Fri Aug 24 19:06:50 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2007/01/10 18:15:36 ghen Exp $
+$NetBSD: distinfo,v 1.54 2007/08/24 19:06:50 manu Exp $
SHA1 (openldap-2.3.32.tgz) = ccf008c3d41206e2e29870b7786aaf00d7c2bc70
RMD160 (openldap-2.3.32.tgz) = de0d076868cbef4e3b9eb393ef45683cf990d3d2
@@ -13,3 +13,9 @@
SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
+SHA1 (patch-ba) = 6adf0ddd759c3760cede3ccaf79b03e1de77835a
+SHA1 (patch-bb) = 8a32add4615c8669b25e03c35fa0be9855cdc5c6
+SHA1 (patch-bd) = 7dd8353c34a260fff0e2f5e2fc6dd359e8ecd897
+SHA1 (patch-be) = 2397a3212f22e37438a1713f4844bd500a4ef3e4
+SHA1 (patch-bf) = fffcd39146af15db40fc51223e8475407fc19683
+SHA1 (patch-bh) = fece631741835ab849eb865a86fde0204fc7af0b
diff -r f247989400dd -r cd761f1dc5db databases/openldap/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-ba Fri Aug 24 19:06:50 2007 +0000
@@ -0,0 +1,10 @@
+--- 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 -r f247989400dd -r cd761f1dc5db databases/openldap/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-bb Fri Aug 24 19:06:50 2007 +0000
@@ -0,0 +1,15 @@
+--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2007-08-24 18:52:03.000000000 +0200
++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2007-08-24 18:52:18.000000000 +0200
+@@ -32,8 +32,12 @@
+ #include <ac/string.h>
+
+ #include "config.h"
+
++#ifdef __NetBSD__
++#include <des.h>
++#endif
++
+ #ifdef DO_KRB5
+ #include <lber.h>
+ #include <lber_pvt.h>
+ #include <lutil.h>
diff -r f247989400dd -r cd761f1dc5db databases/openldap/patches/patch-bd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-bd Fri Aug 24 19:06:50 2007 +0000
@@ -0,0 +1,64 @@
+--- configure.in.orig 2007-08-24 05:32:07.000000000 +0200
++++ configure.in 2007-08-24 05:34:02.000000000 +0200
+@@ -350,8 +350,9 @@
+ proxycache \
+ refint \
+ retcode \
+ rwm \
++ smbk5pwd \
+ syncprov \
+ translucent \
+ unique \
+ valsort"
+@@ -382,8 +383,10 @@
+ OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay],
+ no, [no yes mod], ol_enable_overlays)
+ OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay],
+ no, [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],
+ no, [no yes mod], ol_enable_overlays)
+@@ -627,8 +630,9 @@
+ BUILD_PROXYCACHE=no
+ BUILD_REFINT=no
+ BUILD_RETCODE=no
+ BUILD_RWM=no
++BUILD_SMBK5PWD=no
+ BUILD_SYNCPROV=no
+ BUILD_TRANSLUCENT=no
+ BUILD_UNIQUE=no
+ BUILD_VALSORT=no
+@@ -2981,8 +2985,20 @@
+ fi
+ 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_syncprov" != no ; then
+ BUILD_SYNCPROV=$ol_enable_syncprov
+ if test "$ol_enable_syncprov" = mod ; then
+ MFLAG=SLAPD_MOD_DYNAMIC
+@@ -3099,8 +3115,9 @@
+ AC_SUBST(BUILD_PROXYCACHE)
+ AC_SUBST(BUILD_REFINT)
+ AC_SUBST(BUILD_RETCODE)
+ AC_SUBST(BUILD_RWM)
++ AC_SUBST(BUILD_SMBK5PWD)
+ AC_SUBST(BUILD_SYNCPROV)
+ AC_SUBST(BUILD_TRANSLUCENT)
+ AC_SUBST(BUILD_UNIQUE)
+ AC_SUBST(BUILD_VALSORT)
diff -r f247989400dd -r cd761f1dc5db databases/openldap/patches/patch-be
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-be Fri Aug 24 19:06:50 2007 +0000
@@ -0,0 +1,24 @@
+--- servers/slapd/overlays/Makefile.in.orig 2007-08-24 05:35:05.000000000 +0200
++++ servers/slapd/overlays/Makefile.in 2007-08-24 05:35:38.000000000 +0200
+@@ -24,8 +24,9 @@
+ ppolicy.c \
+ refint.c \
+ retcode.c \
+ rwm.c rwmconf.c rwmdn.c rwmmap.c \
++ smbk5pwd.c \
+ syncprov.c \
+ translucent.c \
+ unique.c \
+ valsort.c
+@@ -92,8 +93,11 @@
+
+ rwm.la : rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo
+ $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.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)
+
+ translucent.la : translucent.lo
diff -r f247989400dd -r cd761f1dc5db databases/openldap/patches/patch-bf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-bf Fri Aug 24 19:06:50 2007 +0000
@@ -0,0 +1,111 @@
+--- configure.orig 2007-08-24 06:20:33.000000000 +0200
++++ configure 2007-08-24 06:23:02.000000000 +0200
+@@ -464,9 +464,9 @@
+ #if HAVE_UNISTD_H
+ # 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 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_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY
BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM
BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS 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 TLS_LIBS
MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_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 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_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY
BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM
BUILD_SMBK5PWD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS 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 TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_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.
+ ac_init_help=
+@@ -1057,8 +1057,9 @@
+ --enable-proxycache Proxy Cache overlay no|yes|mod [no]
+ --enable-refint Referential Integrity overlay no|yes|mod [no]
+ --enable-retcode Return Code testing overlay no|yes|mod [no]
+ --enable-rwm Rewrite/Remap overlay no|yes|mod [no]
++ --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]
+ --enable-valsort Value Sorting overlay no|yes|mod [no]
+@@ -3175,8 +3176,9 @@
+ proxycache \
+ refint \
+ retcode \
+ rwm \
++ smbk5pwd \
+ syncprov \
+ translucent \
+ unique \
+ valsort"
+@@ -3471,8 +3473,32 @@
+ ol_enable_rwm=${ol_enable_overlays:-no}
+ fi;
+ # end --enable-rwm
+
++# OpenLDAP --enable-smvk5pwd
++
++ # Check whether --enable-smvk5pwd or --disable-smvk5pwd was given.
++if test "${enable_smvk5pwd+set}" = set; then
++ enableval="$enable_smvk5pwd"
++
++ 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-smvk5pwd" >&5
++echo "$as_me: error: bad value $enableval for --enable-smvk5pwd" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ ol_enable_smvk5pwd="$ol_arg"
++
++else
++ ol_enable_smvk5pwd=${ol_enable_overlays:-yes}
++fi;
++# end --enable-smvk5pwd
++
+ # OpenLDAP --enable-syncprov
+
+ # Check whether --enable-syncprov or --disable-syncprov was given.
+ if test "${enable_syncprov+set}" = set; then
+@@ -3907,8 +3933,9 @@
+ BUILD_PROXYCACHE=no
+ BUILD_REFINT=no
+ BUILD_RETCODE=no
+ BUILD_RWM=no
++BUILD_SMBK5PWD=no
+ BUILD_SYNCPROV=no
+ BUILD_TRANSLUCENT=no
+ BUILD_UNIQUE=no
+ BUILD_VALSORT=no
+@@ -44870,8 +44897,24 @@
+ _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
+ MFLAG=SLAPD_MOD_DYNAMIC
+@@ -45808,8 +45851,9 @@
+ s,@BUILD_PROXYCACHE@,$BUILD_PROXYCACHE,;t t
+ s,@BUILD_REFINT@,$BUILD_REFINT,;t t
+ s,@BUILD_RETCODE@,$BUILD_RETCODE,;t t
Home |
Main Index |
Thread Index |
Old Index