Index: head/databases/ldb15/Makefile =================================================================== --- head/databases/ldb15/Makefile (revision 507254) +++ head/databases/ldb15/Makefile (revision 507255) @@ -1,196 +1,165 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.5.5 +PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA -PKGNAMESUFFIX= 14 +PKGNAMESUFFIX?= 15 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 \ +LDB_DEPENDS= talloc>=2.2.0:devel/talloc \ + tevent>=0.10.0:devel/tevent \ + tdb>=1.4.0:databases/tdb \ + lmdb>=0.9.23:databases/lmdb \ + cmocka>=1.1.3:sysutils/cmocka \ popt>=0:devel/popt -CONFLICTS_INSTALL= ldb-1.1.* ldb1[23]-1.* +CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-46]-1.* #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 +.include + 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-tdb-int.so \ + lib/ldb/libldb-tdb-err-map.so \ + lib/ldb/libldb-mdb-int.so \ lib/ldb/libldb-key-value.so \ lib/ldb/libldb-cmdline.so \ lib/shared-modules/ldb/skel.so \ lib/shared-modules/ldb/server_sort.so \ lib/shared-modules/ldb/sample.so \ lib/shared-modules/ldb/rdn_name.so \ lib/shared-modules/ldb/paged_searches.so \ - lib/shared-modules/ldb/paged_results.so \ + lib/shared-modules/ldb/mdb.so \ lib/shared-modules/ldb/ldb.so \ lib/shared-modules/ldb/ldap.so \ lib/shared-modules/ldb/asq.so \ lib/shared-modules/ldb/tdb.so -# Only for 64-bit architectures -.if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe -LDB_DEPENDS+= lmdb>=0.9.16:databases/lmdb -LDB_LIBS+= lib/ldb/libldb-mdb-int.so \ - lib/shared-modules/ldb/mdb.so -.endif - 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 +USES+= python:2.7+,build,test CONFIGURE_ARGS+= --disable-python .else -USES+= python:2.7 +USES+= python:3.4+ 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 +CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib + # 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} + ${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 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so .endif .include Index: head/databases/ldb15/distinfo =================================================================== --- head/databases/ldb15/distinfo (revision 507254) +++ head/databases/ldb15/distinfo (revision 507255) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550182694 -SHA256 (ldb-1.4.4.tar.gz) = d658f257ef380feca109240c5898f70081cd0c7f41064704e2aad152af24f8f5 -SIZE (ldb-1.4.4.tar.gz) = 1428851 +TIMESTAMP = 1563828880 +SHA256 (ldb-1.5.5.tar.gz) = 199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68 +SIZE (ldb-1.5.5.tar.gz) = 1629070 Index: head/databases/ldb15/files/patch-buildtools__wafsamba__samba_autoconf.py =================================================================== --- head/databases/ldb15/files/patch-buildtools__wafsamba__samba_autoconf.py (revision 507254) +++ head/databases/ldb15/files/patch-buildtools__wafsamba__samba_autoconf.py (nonexistent) @@ -1,52 +0,0 @@ ---- 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/ldb15/files/patch-buildtools__wafsamba__samba_autoconf.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-buildtools__wafsamba__samba_python.py =================================================================== --- head/databases/ldb15/files/patch-buildtools__wafsamba__samba_python.py (revision 507254) +++ head/databases/ldb15/files/patch-buildtools__wafsamba__samba_python.py (nonexistent) @@ -1,40 +0,0 @@ ---- 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/ldb15/files/patch-buildtools__wafsamba__samba_python.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/databases/ldb15/files/patch-buildtools__wafsamba__samba_install.py (revision 507254) +++ head/databases/ldb15/files/patch-buildtools__wafsamba__samba_install.py (nonexistent) @@ -1,11 +0,0 @@ ---- 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/ldb15/files/patch-buildtools__wafsamba__samba_install.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-mdb_ldb__mdb.c =================================================================== --- head/databases/ldb15/files/patch-mdb_ldb__mdb.c (revision 507254) +++ head/databases/ldb15/files/patch-mdb_ldb__mdb.c (nonexistent) @@ -1,21 +0,0 @@ ---- ldb_mdb/ldb_mdb.c.orig 2018-07-12 08:23:36 UTC -+++ ldb_mdb/ldb_mdb.c -@@ -40,7 +40,9 @@ int ldb_mdb_err_map(int lmdb_err) - return LDB_SUCCESS; - case EIO: - return LDB_ERR_OPERATIONS_ERROR; -+#ifdef EBADE - case EBADE: -+#endif - case MDB_INCOMPATIBLE: - case MDB_CORRUPTED: - case MDB_INVALID: -@@ -181,7 +183,7 @@ static int lmdb_store(struct ltdb_privat - - if (flags == TDB_INSERT) { - mdb_flags = MDB_NOOVERWRITE; -- } else if ((flags == TDB_MODIFY)) { -+ } else if (flags == TDB_MODIFY) { - /* - * Modifying a record, ensure that it exists. - * This mimics the TDB semantics Property changes on: head/databases/ldb15/files/patch-mdb_ldb__mdb.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-ldb_mod_op_test.c =================================================================== --- head/databases/ldb15/files/patch-ldb_mod_op_test.c (revision 507254) +++ head/databases/ldb15/files/patch-ldb_mod_op_test.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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/ldb15/files/patch-ldb_mod_op_test.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-ldb_cache.c =================================================================== --- head/databases/ldb15/files/patch-ldb_cache.c (revision 507254) +++ head/databases/ldb15/files/patch-ldb_cache.c (nonexistent) @@ -1,13 +0,0 @@ ---- 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/ldb15/files/patch-ldb_cache.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-third_party__waf__wafadmin__Tools__cc.py =================================================================== --- head/databases/ldb15/files/patch-third_party__waf__wafadmin__Tools__cc.py (revision 507254) +++ head/databases/ldb15/files/patch-third_party__waf__wafadmin__Tools__cc.py (nonexistent) @@ -1,11 +0,0 @@ ---- 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/ldb15/files/patch-third_party__waf__wafadmin__Tools__cc.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-buildtools__wafsamba__wscript =================================================================== --- head/databases/ldb15/files/patch-buildtools__wafsamba__wscript (revision 507254) +++ head/databases/ldb15/files/patch-buildtools__wafsamba__wscript (nonexistent) @@ -1,22 +0,0 @@ ---- 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/ldb15/files/patch-buildtools__wafsamba__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-lib__replace__wscript =================================================================== --- head/databases/ldb15/files/patch-lib__replace__wscript (revision 507254) +++ head/databases/ldb15/files/patch-lib__replace__wscript (nonexistent) @@ -1,11 +0,0 @@ ---- 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/ldb15/files/patch-lib__replace__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/ldb15/files/patch-buildtools_wafsamba_samba__autoconf.py =================================================================== --- head/databases/ldb15/files/patch-buildtools_wafsamba_samba__autoconf.py (nonexistent) +++ head/databases/ldb15/files/patch-buildtools_wafsamba_samba__autoconf.py (revision 507255) @@ -0,0 +1,36 @@ +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-03-21 10:12:32 UTC ++++ buildtools/wafsamba/samba_autoconf.py +@@ -573,7 +573,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 [] +@@ -593,11 +593,14 @@ 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, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) + else: +- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) + + if not res: + if mandatory: +@@ -925,6 +928,5 @@ 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'] +- Property changes on: head/databases/ldb15/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/ldb15/files/patch-buildtools_wafsamba_samba__install.py =================================================================== --- head/databases/ldb15/files/patch-buildtools_wafsamba_samba__install.py (nonexistent) +++ head/databases/ldb15/files/patch-buildtools_wafsamba_samba__install.py (revision 507255) @@ -0,0 +1,11 @@ +--- buildtools/wafsamba/samba_install.py.orig 2019-03-21 10:12:32 UTC ++++ buildtools/wafsamba/samba_install.py +@@ -115,7 +115,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 or not t.env.SONAME_ST: Property changes on: head/databases/ldb15/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/ldb15/files/patch-buildtools_wafsamba_wscript =================================================================== --- head/databases/ldb15/files/patch-buildtools_wafsamba_wscript (nonexistent) +++ head/databases/ldb15/files/patch-buildtools_wafsamba_wscript (revision 507255) @@ -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/ldb15/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/ldb15/files/patch-ldb__mdb_ldb_mdb.c =================================================================== --- head/databases/ldb15/files/patch-ldb__mdb_ldb_mdb.c (nonexistent) +++ head/databases/ldb15/files/patch-ldb__mdb_ldb_mdb.c (revision 507255) @@ -0,0 +1,11 @@ +--- ldb_mdb/ldb_mdb.c.orig 2019-06-13 03:07:34 UTC ++++ ldb_mdb/ldb_mdb.c +@@ -183,7 +183,7 @@ static int lmdb_store(struct ldb_kv_priv + + if (flags == TDB_INSERT) { + mdb_flags = MDB_NOOVERWRITE; +- } else if ((flags == TDB_MODIFY)) { ++ } else if (flags == TDB_MODIFY) { + /* + * Modifying a record, ensure that it exists. + * This mimics the TDB semantics Property changes on: head/databases/ldb15/files/patch-ldb__mdb_ldb_mdb.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/ldb15/files/patch-ldb_key_value__ldb_kv_cache.c =================================================================== --- head/databases/ldb15/files/patch-ldb_key_value__ldb_kv_cache.c (nonexistent) +++ head/databases/ldb15/files/patch-ldb_key_value__ldb_kv_cache.c (revision 507255) @@ -0,0 +1,13 @@ +--- ldb_key_value/ldb_kv_cache.c.orig 2019-01-14 23:24:45 UTC ++++ ldb_key_value/ldb_kv_cache.c +@@ -90,7 +90,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/ldb15/files/patch-ldb_key_value__ldb_kv_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/ldb15/files/patch-lib_replace_wscript =================================================================== --- head/databases/ldb15/files/patch-lib_replace_wscript (nonexistent) +++ head/databases/ldb15/files/patch-lib_replace_wscript (revision 507255) @@ -0,0 +1,11 @@ +--- lib/replace/wscript.orig 2019-03-21 10:12:32 UTC ++++ lib/replace/wscript +@@ -119,7 +119,7 @@ def configure(conf): + conf.CHECK_HEADERS('sys/atomic.h stdatomic.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') + + if conf.CHECK_CFLAGS('-Wno-unused-function'): Property changes on: head/databases/ldb15/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/ldb15/files/patch-wscript =================================================================== --- head/databases/ldb15/files/patch-wscript (nonexistent) +++ head/databases/ldb15/files/patch-wscript (revision 507255) @@ -0,0 +1,33 @@ +--- wscript.orig 2019-02-26 17:12:23 UTC ++++ wscript +@@ -218,7 +218,7 @@ def build(bld): + if bld.env.standalone_ldb: + if not 'PACKAGE_VERSION' in bld.env: + bld.env.PACKAGE_VERSION = VERSION +- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' ++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' + private_library = False + else: + private_library = True +@@ -511,11 +511,6 @@ def build(bld): + deps='cmocka ldb', + install=False) + +- bld.SAMBA_BINARY('ldb_match_test', +- source='tests/ldb_match_test.c', +- deps='cmocka ldb', +- install=False) +- + if bld.CONFIG_SET('HAVE_LMDB'): + bld.SAMBA_BINARY('ldb_mdb_mod_op_test', + source='tests/ldb_mod_op_test.c', +@@ -583,8 +578,7 @@ def test(ctx): + # we don't want to run ldb_lmdb_size_test (which proves we can + # fit > 4G of data into the DB), it would fill up the disk on + # many of our test instances +- 'ldb_mdb_kv_ops_test', +- 'ldb_match_test'] ++ 'ldb_mdb_kv_ops_test'] + + for test_exe in test_exes: + cmd = os.path.join(Context.g_module.out, test_exe) Property changes on: head/databases/ldb15/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