Index: head/databases/ldb14/Makefile =================================================================== --- head/databases/ldb14/Makefile (nonexistent) +++ head/databases/ldb14/Makefile (revision 487115) @@ -0,0 +1,190 @@ +# $FreeBSD$ + +PORTNAME= ldb +PORTVERSION= 1.3.6 +PORTREVISION= 0 +PORTEPOCH= 0 +CATEGORIES= databases +MASTER_SITES= SAMBA +PKGNAMESUFFIX= 13 + +MAINTAINER= timur@FreeBSD.org +COMMENT= LDAP-like embedded database + +LICENSE= GPLv3 + +IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support + +BUILD_DEPENDS= ${LDB_DEPENDS} +RUN_DEPENDS= ${LDB_DEPENDS} + +LDB_DEPENDS= talloc>=2.1.14:devel/talloc \ + tevent>=0.9.37:devel/tevent \ + tdb>=1.3.16:databases/tdb \ + cmocka>=1.1.1:sysutils/cmocka \ + popt>=0:devel/popt + +CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.* + +EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13362.patch:-p3 + +#FLAVORS= default nopython +#nopython_PKGNAMESUFFIX= -nopython +#nopython_CONFLICTS= ldb +#default_CONFLICTS= ldb-nopython + +USES= compiler pkgconfig waf +USE_LDCONFIG= yes +WAF_CMD= buildtools/bin/waf +CONFIGURE_LOG= bin/config.log + +USE_OPENLDAP= yes +PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig +PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} + +CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \ + --with-modulesdir=${PREFIX}/lib/shared-modules \ + --with-privatelibdir=${PREFIX}/lib/ldb \ + --mandir=${MANPREFIX}/man \ + --with-openldap=${LOCALBASE} \ + --disable-rpath \ + --without-gettext + +OPTIONS_DEFINE= MANPAGES DEBUG +MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) + +.include + +DEBUG_CONFIGURE_ON= --verbose --enable-debug +DEBUG_MAKE_ARGS= --verbose +DEBUG_FLAGS= -g -ggdb3 -O0 + +LDB_BINS= bin/ldbedit \ + bin/ldbmodify \ + bin/ldbadd \ + bin/ldbdel \ + bin/ldbsearch \ + bin/ldbrename + +LDB_LIBS= lib/libldb.so \ + lib/libldb.so.1 \ + lib/ldb/libldb-cmdline.so \ + lib/shared-modules/ldb/asq.so \ + lib/shared-modules/ldb/ldap.so \ + lib/shared-modules/ldb/paged_results.so \ + lib/shared-modules/ldb/paged_searches.so \ + lib/shared-modules/ldb/rdn_name.so \ + lib/shared-modules/ldb/sample.so \ + lib/shared-modules/ldb/server_sort.so \ + lib/shared-modules/ldb/skel.so \ + lib/shared-modules/ldb/tdb.so + +PLIST_FILES= include/ldb_version.h \ + include/ldb_handlers.h \ + include/ldb_errors.h \ + include/ldb.h \ + include/ldb_module.h \ + ${LDB_BINS} \ + ${LDB_LIBS} \ + ${PKGCONFIGDIR}/ldb.pc + +.if defined(NO_PYTHON) +USES+= python:2.7,build +CONFIGURE_ARGS+= --disable-python +.else +USES+= python:2.7 + +PLIST_FILES+= include/pyldb.h \ + lib/libpyldb-util.so \ + lib/libpyldb-util.so.1 \ + ${PYTHON_SITELIBDIR}/ldb.so \ + ${PYTHON_SITELIBDIR}/_ldb_text.py \ + ${PKGCONFIGDIR}/pyldb-util.pc +# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+ +# This is not officially supported, use at your own risk +.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]} +SAMBA4_PYTHON3_VERSION= ${WITH_SAMBA4_PYTHON3} +SAMBA4_PYTHON3= python${SAMBA4_PYTHON3_VERSION} +SAMBA4_PYTHON3_VER= ${SAMBA4_PYTHON3_VERSION:C/\.//} +.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER}) +.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION} +.endif +BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER} +RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER} +# cpython-36m +SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null +SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages + +CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI} +CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3} + +PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \ + SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR} + +PLIST_FILES+= lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so \ + lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so.1 \ + ${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so \ + ${SAMBA4_PYTHON3_SITELIBDIR}/_ldb_text.py \ + ${PKGCONFIGDIR}/pyldb-util.${SAMBA4_PYTHON3_SO_ABI}.pc +.endif +.endif + +.include + +.if ! ${PORT_OPTIONS:MMANPAGES} +CONFIGURE_ENV+= XSLTPROC="true" +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +.endif +# No fancy color error messages +.if ${COMPILER_TYPE} == "clang" +CFLAGS+= -fno-color-diagnostics +.endif +CONFIGURE_ENV+= NOCOLOR=yes +MAKE_ENV+= NOCOLOR=yes + +LDB_MAN1= man/man1/ldbadd.1.gz \ + man/man1/ldbdel.1.gz \ + man/man1/ldbedit.1.gz \ + man/man1/ldbmodify.1.gz \ + man/man1/ldbrename.1.gz \ + man/man1/ldbsearch.1.gz + +LDB_MAN3= man/man3/ldb.3.gz + +PLIST_FILES+= ${LDB_MAN1} ${LDB_MAN3} + +post-patch: + @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ + ${BUILD_WRKSRC}/wscript + +# Use threading (or multiprocessing) but not thread (renamed in python 3+). +pre-configure: + @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ + ${ECHO_CMD}; \ + ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ + ${ECHO_CMD}; \ + ${FALSE}; \ + fi + +pre-build-MANPAGES-off: + -${MKDIR} ${BUILD_WRKSRC}/bin/default/man +.for man in ${LDB_MAN1} ${LDB_MAN3} + ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man +.endfor + +post-install: +.for lib in ${LDB_BINS} ${LDB_LIBS} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} +.endfor +.if !defined(NO_PYTHON) + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so +. if defined(SAMBA4_PYTHON3) + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so +. endif +.endif + +.include Property changes on: head/databases/ldb14/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/distinfo =================================================================== --- head/databases/ldb14/distinfo (nonexistent) +++ head/databases/ldb14/distinfo (revision 487115) @@ -0,0 +1,3 @@ +TIMESTAMP = 1535926436 +SHA256 (ldb-1.3.6.tar.gz) = 51d23134b356490e75258518dfc5c994c1710ad5357a1e3455a9eaeddff8939a +SIZE (ldb-1.3.6.tar.gz) = 1374574 Property changes on: head/databases/ldb14/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/0001-bug-13362.patch =================================================================== --- head/databases/ldb14/files/0001-bug-13362.patch (nonexistent) +++ head/databases/ldb14/files/0001-bug-13362.patch (revision 487115) @@ -0,0 +1,170 @@ +From 75e572c6ac2e537839da341e76236d1c4003cae7 Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Mon, 7 May 2018 16:41:55 +0200 +Subject: [PATCH 1/2] lib: Put "results_store" into a doubly linked list + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13362 +Signed-off-by: Volker Lendecke +Reviewed-by: Jeremy Allison +(cherry picked from commit 8063995a92fffc93aa9d6d1d92a75bf3f3c9592b) +--- + lib/ldb/modules/paged_results.c | 25 +++++-------------------- + 1 file changed, 5 insertions(+), 20 deletions(-) + +diff --git a/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c +index de014a39699..aafbcbf4483 100644 +--- a/lib/ldb/modules/paged_results.c ++++ b/lib/ldb/modules/paged_results.c +@@ -35,6 +35,7 @@ + #include "replace.h" + #include "system/filesys.h" + #include "system/time.h" ++#include "dlinklist.h" + #include "ldb_module.h" + + struct message_store { +@@ -48,14 +49,13 @@ struct message_store { + struct private_data; + + struct results_store { ++ struct results_store *prev, *next; + + struct private_data *priv; + + char *cookie; + time_t timestamp; + +- struct results_store *next; +- + struct message_store *first; + struct message_store *last; + int num_entries; +@@ -75,22 +75,8 @@ struct private_data { + static int store_destructor(struct results_store *del) + { + struct private_data *priv = del->priv; +- struct results_store *loop; +- +- if (priv->store == del) { +- priv->store = del->next; +- return 0; +- } +- +- for (loop = priv->store; loop; loop = loop->next) { +- if (loop->next == del) { +- loop->next = del->next; +- return 0; +- } +- } +- +- /* is not in list ? */ +- return -1; ++ DLIST_REMOVE(priv->store, del); ++ return 0; + } + + static struct results_store *new_store(struct private_data *priv) +@@ -120,8 +106,7 @@ static struct results_store *new_store(struct private_data *priv) + newr->first_ref = NULL; + newr->controls = NULL; + +- newr->next = priv->store; +- priv->store = newr; ++ DLIST_ADD(priv->store, newr); + + talloc_set_destructor(newr, store_destructor); + +-- +2.11.0 + + +From fd3d38f5d3de45e6d5e47ed6bd42ef86abae8836 Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Mon, 7 May 2018 16:53:00 +0200 +Subject: [PATCH 2/2] lib: Hold at most 10 outstanding paged result cookies + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13362 +Signed-off-by: Volker Lendecke +Reviewed-by: Jeremy Allison + +Autobuild-User(master): Jeremy Allison +Autobuild-Date(master): Tue May 15 09:37:21 CEST 2018 on sn-devel-144 + +(cherry picked from commit 9fbd4672b06de5333a9c44fc126b8edac0b9d31a) +--- + lib/ldb/modules/paged_results.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c +index aafbcbf4483..ecb22271d28 100644 +--- a/lib/ldb/modules/paged_results.c ++++ b/lib/ldb/modules/paged_results.c +@@ -36,6 +36,7 @@ + #include "system/filesys.h" + #include "system/time.h" + #include "dlinklist.h" ++#include + #include "ldb_module.h" + + struct message_store { +@@ -68,6 +69,7 @@ struct results_store { + + struct private_data { + uint32_t next_free_id; ++ size_t num_stores; + struct results_store *store; + + }; +@@ -76,6 +78,10 @@ static int store_destructor(struct results_store *del) + { + struct private_data *priv = del->priv; + DLIST_REMOVE(priv->store, del); ++ ++ assert(priv->num_stores > 0); ++ priv->num_stores -= 1; ++ + return 0; + } + +@@ -108,8 +114,21 @@ static struct results_store *new_store(struct private_data *priv) + + DLIST_ADD(priv->store, newr); + ++ assert(priv->num_stores < SIZE_MAX); ++ priv->num_stores += 1; ++ + talloc_set_destructor(newr, store_destructor); + ++ if (priv->num_stores > 10) { ++ struct results_store *last; ++ /* ++ * 10 is the default for MaxResultSetsPerConn -- ++ * possibly need to parameterize it. ++ */ ++ last = DLIST_TAIL(priv->store); ++ TALLOC_FREE(last); ++ } ++ + return newr; + } + +@@ -366,6 +385,8 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req) + return LDB_ERR_UNWILLING_TO_PERFORM; + } + ++ DLIST_PROMOTE(private_data->store, current); ++ + ac->store = current; + + /* check if it is an abandon */ +@@ -397,6 +418,7 @@ static int paged_request_init(struct ldb_module *module) + } + + data->next_free_id = 1; ++ data->num_stores = 0; + data->store = NULL; + ldb_module_set_private(module, data); + +-- +2.11.0 + Property changes on: head/databases/ldb14/files/0001-bug-13362.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-ldb_cache.c =================================================================== --- head/databases/ldb14/files/patch-ldb_cache.c (nonexistent) +++ head/databases/ldb14/files/patch-ldb_cache.c (revision 487115) @@ -0,0 +1,13 @@ +--- ldb_tdb/ldb_cache.c.orig 2018-03-04 05:41:25 UTC ++++ ldb_tdb/ldb_cache.c +@@ -91,7 +91,9 @@ static int ldb_schema_attribute_compare( + { + const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1; + const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2; +- return ldb_attr_cmp(sa1->name, sa2->name); ++ int res = ldb_attr_cmp(sa1->name, sa2->name); ++ ++ return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0; + } + + /* Property changes on: head/databases/ldb14/files/patch-ldb_cache.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-ldb_mod_op_test.c =================================================================== --- head/databases/ldb14/files/patch-ldb_mod_op_test.c (nonexistent) +++ head/databases/ldb14/files/patch-ldb_mod_op_test.c (revision 487115) @@ -0,0 +1,11 @@ +--- tests/ldb_mod_op_test.c.orig 2018-03-02 23:35:09 UTC ++++ tests/ldb_mod_op_test.c +@@ -3529,7 +3529,7 @@ static void test_ldb_unique_index_duplic + assert_int_equal(ret, LDB_SUCCESS); + + msg02 = ldb_msg_new(tmp_ctx); +- assert_non_null(msg01); ++ assert_non_null(msg02); + + msg02->dn = ldb_dn_new_fmt(msg02, test_ctx->ldb, "dc=test02"); + assert_non_null(msg02->dn); Property changes on: head/databases/ldb14/files/patch-ldb_mod_op_test.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py =================================================================== --- head/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py (nonexistent) +++ head/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py (revision 487115) @@ -0,0 +1,52 @@ +--- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC ++++ buildtools/wafsamba/samba_autoconf.py +@@ -548,7 +548,7 @@ def library_flags(self, libs): + + + @conf +-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False): ++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None): + '''check if a set of libraries exist as system libraries + + returns the sublist of libs that do exist as a syslib or [] +@@ -568,11 +568,29 @@ int foo() + ret.append(lib) + continue + ++ if msg is None: ++ msg = 'Checking for library %s' % lib ++ + (ccflags, ldflags, cpppath) = library_flags(conf, lib) ++ + if shlib: +- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(features='c cshlib', ++ fragment=fragment, ++ lib=lib, ++ uselib_store=lib, ++ ccflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) + else: +- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(lib=lib, ++ uselib_store=lib, ++ ccflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) + + if not res: + if mandatory: +@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c + conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + + if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []: +- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): ++ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS): + conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] + + @conf Property changes on: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py =================================================================== --- head/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py (nonexistent) +++ head/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py (revision 487115) @@ -0,0 +1,40 @@ +--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC ++++ buildtools/wafsamba/samba_python.py +@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man + + def _check_python_headers(conf, mandatory): + try: ++ from python import _get_python_variables + Configure.ConfigurationError + conf.check_python_headers(mandatory=mandatory) ++ conf.env['PYTHON_SO_ABI'] = _get_python_variables( ++ conf.env['PYTHON'], ++ ["get_config_var('SOABI') or ''"], ++ ['from distutils.sysconfig import get_config_var'] ++ )[0] + except Configure.ConfigurationError: + if mandatory: + raise + + if conf.env['PYTHON_VERSION'] > '3': +- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] +- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' ++ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG, ++ while environment variable is PYTHON3_SO_ABI_FLAG''' ++ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) ++ if override_PYTHON_SO_ABI_FLAG is not None: ++ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG ++ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) ++ if not conf.env['PYTHON_SO_ABI_FLAG']: ++ if conf.env['PYTHON_SO_ABI']: ++ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI'] ++ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) ++ else: ++ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] ++ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' + else: + conf.env['PYTHON_SO_ABI_FLAG'] = '' ++ + conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( + conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) + Property changes on: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-buildtools__wafsamba__wscript =================================================================== --- head/databases/ldb14/files/patch-buildtools__wafsamba__wscript (nonexistent) +++ head/databases/ldb14/files/patch-buildtools__wafsamba__wscript (revision 487115) @@ -0,0 +1,22 @@ +--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC ++++ buildtools/wafsamba/wscript +@@ -74,12 +74,17 @@ def set_options(opt): + help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME), + action="store", dest='PRIVATELIBDIR', default=None) + ++ opt.add_option('--with-openldap', ++ help='additional directory to search for OpenLDAP libs', ++ action='store', dest='ldap_open', default=None, ++ match = ['Checking for library lber', 'Checking for library ldap']) ++ + opt.add_option('--with-libiconv', + help='additional directory to search for libiconv', +- action='store', dest='iconv_open', default='/usr/local', ++ action='store', dest='iconv_open', default=None, + match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) + opt.add_option('--without-gettext', +- help=("Disable use of gettext"), ++ help=("disable use of gettext"), + action="store_true", dest='disable_gettext', default=False) + + gr = opt.option_group('developer options') Property changes on: head/databases/ldb14/files/patch-buildtools__wafsamba__wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldb.3 =================================================================== --- head/databases/ldb14/files/ldb.3 (nonexistent) +++ head/databases/ldb14/files/ldb.3 (revision 487115) @@ -0,0 +1,457 @@ +'\" t +.\" Title: ldb +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDB" "3" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldb \- A light\-weight database library +.SH "SYNOPSIS" +.sp +.nf +#include +.fi +.SH "DESCRIPTION" +.PP +ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&. +.PP +When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&. +.PP +In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&. +.PP +Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&. +.PP +In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&. +.PP +If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&. +.SH "TOOLS" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbsearch(1) +\- command line ldb search utility +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbedit(1) +\- edit all or part of a ldb database using your favourite editor +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbadd(1) +\- add records to a ldb database using LDIF formatted input +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbdel(1) +\- delete records from a ldb database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbmodify(1) +\- modify records in a ldb database using LDIF formatted input +.RE +.SH "FUNCTIONS" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_connect(3)\fR +\- connect to a ldb backend +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_search(3)\fR +\- perform a database search +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_add(3)\fR +\- add a record to the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_delete(3)\fR +\- delete a record from the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_modify(3)\fR +\- modify a record in the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_errstring(3)\fR +\- retrieve extended error information from the last operation +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_write(3)\fR +\- write a LDIF formatted message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_write_file(3)\fR +\- write a LDIF formatted message to a file +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read(3)\fR +\- read a LDIF formatted message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_free(3)\fR +\- free the result of a ldb_ldif_read() +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_file(3)\fR +\- read a LDIF message from a file +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_string(3)\fR +\- read a LDIF message from a string +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_element(3)\fR +\- find an element in a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_val_equal_exact(3)\fR +\- compare two ldb_val structures +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_val(3)\fR +\- find an element by value +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_add_empty(3)\fR +\- add an empty message element to a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_add(3)\fR +\- add a non\-empty message element to a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_element_compare(3)\fR +\- compare two ldb_message_element structures +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_int(3)\fR +\- return an integer value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_uint(3)\fR +\- return an unsigned integer value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_double(3)\fR +\- return a double value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_string(3)\fR +\- return a string value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_alloc(3)\fR +\- set the memory allocation function to be used by ldb +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_debug(3)\fR +\- set a debug handler to be used by ldb +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_debug_stderr(3)\fR +\- set a debug handler for stderr output +.RE +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldb.3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbadd.1 =================================================================== --- head/databases/ldb14/files/ldbadd.1 (nonexistent) +++ head/databases/ldb14/files/ldbadd.1 (revision 487115) @@ -0,0 +1,78 @@ +'\" t +.\" Title: ldbadd +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbadd \- Command\-line utility for adding records to an LDB +.SH "SYNOPSIS" +.HP \w'\fBldbadd\fR\ 'u +\fBldbadd\fR [\-h] [\-H\ LDB\-URL] [ldif\-file1] [ldif\-file2] [\&.\&.\&.] +.SH "DESCRIPTION" +.PP +ldbadd adds records to an ldb(3) database\&. It reads the ldif(5) files specified on the command line and adds the records from these files to the LDB database, which is specified by the \-H option or the LDB_URL environment variable\&. +.PP +If \- is specified as a ldb file, the ldif input is read from standard input\&. +.SH "OPTIONS" +.PP +\-h +.RS 4 +Show list of available options\&. +.RE +.PP +\-H +.RS 4 +LDB URL to connect to\&. See ldb(3) for details\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to (can be overrided by using the \-H command\-line option\&.) +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbmodify, ldbdel, ldif(5) +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +This manpage was written by Jelmer Vernooij\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbadd.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbdel.1 =================================================================== --- head/databases/ldb14/files/ldbdel.1 (nonexistent) +++ head/databases/ldb14/files/ldbdel.1 (revision 487115) @@ -0,0 +1,80 @@ +'\" t +.\" Title: ldbdel +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBDEL" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbdel \- Command\-line program for deleting LDB records +.SH "SYNOPSIS" +.HP \w'\fBldbdel\fR\ 'u +\fBldbdel\fR [\-h] [\-H\ LDB\-URL] [dn] [\&.\&.\&.] +.SH "DESCRIPTION" +.PP +ldbdel deletes records from an ldb(3) database\&. It deletes the records identified by the dn\*(Aqs specified on the command\-line\&. +.PP +ldbdel uses either the database that is specified with the \-H option or the database specified by the LDB_URL environment variable\&. +.SH "OPTIONS" +.PP +\-h +.RS 4 +Show list of available options\&. +.RE +.PP +\-H +.RS 4 +LDB URL to connect to\&. See ldb(3) for details\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to (can be overrided by using the \-H command\-line option\&.) +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbmodify, ldbadd, ldif(5) +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +ldbdel was written by Andrew Tridgell\&. +.PP +This manpage was written by Jelmer Vernooij\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbdel.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbedit.1 =================================================================== --- head/databases/ldb14/files/ldbedit.1 (nonexistent) +++ head/databases/ldb14/files/ldbedit.1 (revision 487115) @@ -0,0 +1,111 @@ +'\" t +.\" Title: ldbedit +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBEDIT" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbedit \- Edit LDB databases using your preferred editor +.SH "SYNOPSIS" +.HP \w'\fBldbedit\fR\ 'u +\fBldbedit\fR [\-?] [\-\-usage] [\-s\ base|one|sub] [\-b\ basedn] [\-a] [\-e\ editor] [\-H\ LDB\-URL] [expression] [attributes...] +.SH "DESCRIPTION" +.PP +ldbedit is a utility that allows you to edit LDB entries (in tdb files, sqlite files or LDAP servers) using your preferred editor\&. ldbedit generates an LDIF file based on your query, allows you to edit the LDIF, and then merges that LDIF back into the LDB backend\&. +.SH "OPTIONS" +.PP +\-?, \-\-help +.RS 4 +Show list of available options, and a phrase describing what that option does\&. +.RE +.PP +\-\-usage +.RS 4 +Show list of available options\&. This is similar to the help option, however it does not provide any description, and is hence shorter\&. +.RE +.PP +\-H +.RS 4 +LDB URL to connect to\&. For a tdb database, this will be of the form tdb://\fIfilename\fR\&. For a LDAP connection over unix domain sockets, this will be of the form ldapi://\fIsocket\fR\&. For a (potentially remote) LDAP connection over TCP, this will be of the form ldap://\fIhostname\fR\&. For an SQLite database, this will be of the form sqlite://\fIfilename\fR\&. +.RE +.PP +\-s one|sub|base +.RS 4 +Search scope to use\&. One\-level, subtree or base\&. +.RE +.PP +\-a, \-all +.RS 4 +Edit all records\&. This allows you to apply the same change to a number of records at once\&. You probably want to combine this with an expression of the form "objectclass=*"\&. +.RE +.PP +\-e editor, \-\-editor editor +.RS 4 +Specify the editor that should be used (overrides the VISUAL and EDITOR environment variables)\&. If this option is not used, and neither VISUAL nor EDITOR environment variables are set, then the vi editor will be used\&. +.RE +.PP +\-b basedn +.RS 4 +Specify Base Distinguished Name to use\&. +.RE +.PP +\-v, \-\-verbose +.RS 4 +Make ldbedit more verbose about the operations that are being performed\&. Without this option, ldbedit will only provide a summary change line\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to\&. This can be overridden by using the \-H command\-line option\&.) +.RE +.PP +VISUAL and EDITOR +.RS 4 +Environment variables used to determine what editor to use\&. VISUAL takes precedence over EDITOR, and both are overridden by the \-e command\-line option\&. +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbmodify(1), ldbdel(1), ldif(5), vi(1) +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +This manpage was written by Jelmer Vernooij and updated by Brad Hards\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbedit.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbmodify.1 =================================================================== --- head/databases/ldb14/files/ldbmodify.1 (nonexistent) +++ head/databases/ldb14/files/ldbmodify.1 (revision 487115) @@ -0,0 +1,73 @@ +'\" t +.\" Title: ldbmodify +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBMODIFY" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbmodify \- Modify records in a LDB database +.SH "SYNOPSIS" +.HP \w'\fBldbmodify\fR\ 'u +\fBldbmodify\fR [\-H\ LDB\-URL] [ldif\-file] +.SH "DESCRIPTION" +.PP +ldbmodify changes, adds and deletes records in a LDB database\&. The changes that should be made to the LDB database are read from the specified LDIF\-file\&. If \- is specified as the filename, input is read from stdin\&. +.PP +For now, see ldapmodify(1) for details on the LDIF file format\&. +.SH "OPTIONS" +.PP +\-H +.RS 4 +LDB URL to connect to\&. See ldb(3) for details\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to (can be overrided by using the \-H command\-line option\&.) +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbedit +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +This manpage was written by Jelmer Vernooij\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbmodify.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbrename.1 =================================================================== --- head/databases/ldb14/files/ldbrename.1 (nonexistent) +++ head/databases/ldb14/files/ldbrename.1 (revision 487115) @@ -0,0 +1,81 @@ +'\" t +.\" Title: ldbrename +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBRENAME" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbrename \- Edit LDB databases using your favorite editor +.SH "SYNOPSIS" +.HP \w'\fBldbrename\fR\ 'u +\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn} +.SH "DESCRIPTION" +.PP +ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&. +.SH "OPTIONS" +.PP +\-h +.RS 4 +Show list of available options\&. +.RE +.PP +\-H +.RS 4 +LDB URL to connect to\&. See ldb(3) for details\&. +.RE +.PP +\-o options +.RS 4 +Extra ldb options, such as modules\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to (can be overrided by using the \-H command\-line option\&.) +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbmodify, ldbdel, ldif(5) +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +This manpage was written by Jelmer Vernooij\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbrename.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/ldbsearch.1 =================================================================== --- head/databases/ldb14/files/ldbsearch.1 (nonexistent) +++ head/databases/ldb14/files/ldbsearch.1 (revision 487115) @@ -0,0 +1,91 @@ +'\" t +.\" Title: ldbsearch +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBSEARCH" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldbsearch \- Search for records in a LDB database +.SH "SYNOPSIS" +.HP \w'\fBldbsearch\fR\ 'u +\fBldbsearch\fR [\-h] [\-s\ base|one|sub] [\-b\ basedn] [\-i] [\-H\ LDB\-URL] [expression] [attributes] +.SH "DESCRIPTION" +.PP +ldbsearch searches a LDB database for records matching the specified expression (see the ldapsearch(1) manpage for a description of the expression format)\&. For each record, the specified attributes are printed\&. +.SH "OPTIONS" +.PP +\-h +.RS 4 +Show list of available options\&. +.RE +.PP +\-H +.RS 4 +LDB URL to connect to\&. See ldb(3) for details\&. +.RE +.PP +\-s one|sub|base +.RS 4 +Search scope to use\&. One\-level, subtree or base\&. +.RE +.PP +\-i +.RS 4 +Read search expressions from stdin\&. +.RE +.PP +\-b basedn +.RS 4 +Specify Base DN to use\&. +.RE +.SH "ENVIRONMENT" +.PP +LDB_URL +.RS 4 +LDB URL to connect to (can be overrided by using the \-H command\-line option\&.) +.RE +.SH "VERSION" +.PP +This man page is correct for version 1\&.1 of LDB\&. +.SH "SEE ALSO" +.PP +ldb(3), ldbedit(1) +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +This manpage was written by Jelmer Vernooij\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Property changes on: head/databases/ldb14/files/ldbsearch.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-lib__replace__wscript =================================================================== --- head/databases/ldb14/files/patch-lib__replace__wscript (nonexistent) +++ head/databases/ldb14/files/patch-lib__replace__wscript (revision 487115) @@ -0,0 +1,11 @@ +--- lib/replace/wscript.orig 2017-08-24 11:27:53 UTC ++++ lib/replace/wscript +@@ -81,7 +81,7 @@ def configure(conf): + conf.CHECK_HEADERS('sys/atomic.h') + conf.CHECK_HEADERS('libgen.h') + +- if conf.CHECK_CFLAGS('-Wno-format-truncation'): ++ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS): + conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1') + + # Check for process set name support Property changes on: head/databases/ldb14/files/patch-lib__replace__wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-wscript =================================================================== --- head/databases/ldb14/files/patch-wscript (nonexistent) +++ head/databases/ldb14/files/patch-wscript (revision 487115) @@ -0,0 +1,32 @@ +--- wscript.orig 2017-09-07 10:04:11 UTC ++++ wscript +@@ -126,9 +126,15 @@ def build(bld): + bld.RECURSE('lib/tdb') + + if bld.env.standalone_ldb: ++ if not 'PACKAGE_VERSION' in bld.env: ++ bld.env.PACKAGE_VERSION = VERSION ++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' + private_library = False + else: + private_library = True ++ # we're not currently linking against the ldap libs, but ldb.pc.in ++ # has @LDAP_LIBS@ ++ bld.env.LDAP_LIBS = '' + + LDB_MAP_SRC = bld.SUBDIR('ldb_map', + 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') +@@ -149,13 +155,6 @@ def build(bld): + if bld.PYTHON_BUILD_IS_ENABLED(): + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): +- # we're not currently linking against the ldap libs, but ldb.pc.in +- # has @LDAP_LIBS@ +- bld.env.LDAP_LIBS = '' +- +- if not 'PACKAGE_VERSION' in bld.env: +- bld.env.PACKAGE_VERSION = VERSION +- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + + name = bld.pyembed_libname('pyldb-util') + bld.SAMBA_LIBRARY(name, Property changes on: head/databases/ldb14/files/patch-wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/databases/ldb14/files/patch-buildtools__wafsamba__samba_install.py (nonexistent) +++ head/databases/ldb14/files/patch-buildtools__wafsamba__samba_install.py (revision 487115) @@ -0,0 +1,11 @@ +--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC ++++ buildtools/wafsamba/samba_install.py +@@ -118,7 +118,7 @@ def install_library(self): + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) + inst_name = bld.make_libname(t.target) + if not self.private_library: Property changes on: head/databases/ldb14/files/patch-buildtools__wafsamba__samba_install.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/files/patch-third_party__waf__wafadmin__Tools__cc.py =================================================================== --- head/databases/ldb14/files/patch-third_party__waf__wafadmin__Tools__cc.py (nonexistent) +++ head/databases/ldb14/files/patch-third_party__waf__wafadmin__Tools__cc.py (revision 487115) @@ -0,0 +1,11 @@ +--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC ++++ third_party/waf/wafadmin/Tools/cc.py +@@ -88,7 +88,7 @@ def c_hook(self, node): + raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) + return task + +-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' ++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' + cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) + cls.scan = ccroot.scan + cls.vars.append('CCDEPS') Property changes on: head/databases/ldb14/files/patch-third_party__waf__wafadmin__Tools__cc.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/ldb14/pkg-descr =================================================================== --- head/databases/ldb14/pkg-descr (nonexistent) +++ head/databases/ldb14/pkg-descr (revision 487115) @@ -0,0 +1,9 @@ +ldb is a LDAP-like embedded database. + +ldb provides a fast database with an LDAP-like API designed to be used +within an application. + +In some ways it can be seen as a intermediate solution between key-value +pair databases and a real LDAP database. + +WWW: http://ldb.samba.org/ Property changes on: head/databases/ldb14/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property