Index: head/databases/ldb13/Makefile =================================================================== --- head/databases/ldb13/Makefile (revision 463611) +++ head/databases/ldb13/Makefile (revision 463612) @@ -1,185 +1,191 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 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.11:devel/talloc \ tevent>=0.9.35:devel/tevent \ tdb>=1.3.15:databases/tdb \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.* #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 CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --with-openldap=${LOCALBASE} \ --disable-rpath \ --without-gettext -OPTIONS_DEFINE= MANPAGES +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:Mpython3\.[0-9]} SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3} SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//} 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} +.if !defined(WITH_DEBUG) +. for lib in ${LDB_BINS} ${LDB_LIBS} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} -.endfor -.if !defined(NO_PYTHON) +. endfor +. if !defined(NO_PYTHON) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so -.if defined(SAMBA4_PYTHON3) +. 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 +. endif .endif .include Index: head/databases/ldb13/distinfo =================================================================== --- head/databases/ldb13/distinfo (revision 463611) +++ head/databases/ldb13/distinfo (revision 463612) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516159739 -SHA256 (ldb-1.3.1.tar.gz) = b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2 -SIZE (ldb-1.3.1.tar.gz) = 1361723 +TIMESTAMP = 1520025663 +SHA256 (ldb-1.3.2.tar.gz) = ce3ef0b7358a8c5437d2cc0ba3fd6c2f2b7017bc87b09527406c8e34a82376ab +SIZE (ldb-1.3.2.tar.gz) = 1364976 Index: head/databases/ldb13/files/patch-common__ldb_modules.c =================================================================== --- head/databases/ldb13/files/patch-common__ldb_modules.c (revision 463611) +++ head/databases/ldb13/files/patch-common__ldb_modules.c (nonexistent) @@ -1,11 +0,0 @@ ---- common/ldb_modules.c.orig 2018-02-14 01:18:43 UTC -+++ common/ldb_modules.c -@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch - */ - void ldb_set_modules_dir(struct ldb_context *ldb, const char *path) - { -- int ret = ldb_modules_load_path(path, LDB_VERSION); -+ int ret = ldb_modules_load_dir(path, LDB_VERSION); - if (ret != LDB_SUCCESS) { - ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path); - } Property changes on: head/databases/ldb13/files/patch-common__ldb_modules.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/ldb13/files/patch-ldb_cache.c =================================================================== --- head/databases/ldb13/files/patch-ldb_cache.c (nonexistent) +++ head/databases/ldb13/files/patch-ldb_cache.c (revision 463612) @@ -0,0 +1,13 @@ +--- ldb_tdb/ldb_cache.c.orig 2018-03-04 05:41:25.313506000 +0100 ++++ ldb_tdb/ldb_cache.c 2018-03-04 05:46:09.353115000 +0100 +@@ -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/ldb13/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/ldb13/files/patch-ldb_mod_op_test.c =================================================================== --- head/databases/ldb13/files/patch-ldb_mod_op_test.c (nonexistent) +++ head/databases/ldb13/files/patch-ldb_mod_op_test.c (revision 463612) @@ -0,0 +1,11 @@ +--- tests/ldb_mod_op_test.c.orig 2018-03-02 23:35:09.639709000 +0100 ++++ tests/ldb_mod_op_test.c 2018-03-02 23:44:00.194683000 +0100 +@@ -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/ldb13/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