Date: Thu, 17 May 2018 02:24:59 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470190 - in head: databases/ldb databases/ldb12 databases/ldb13 databases/ldb13/files databases/tdb devel/talloc devel/tevent Message-ID: <201805170224.w4H2Oxc9095866@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Thu May 17 02:24:59 2018 New Revision: 470190 URL: https://svnweb.freebsd.org/changeset/ports/470190 Log: Update Samba supplimentary libraries, fixed (new) portlint errors, changed Python3 version knob. Added: head/databases/ldb13/files/0001-bug-13362.patch (contents, props changed) Modified: head/databases/ldb/Makefile head/databases/ldb12/Makefile head/databases/ldb13/Makefile head/databases/ldb13/distinfo head/databases/ldb13/files/patch-ldb_cache.c head/databases/ldb13/files/patch-ldb_mod_op_test.c head/databases/tdb/Makefile head/devel/talloc/Makefile head/devel/talloc/distinfo head/devel/tevent/Makefile Modified: head/databases/ldb/Makefile ============================================================================== --- head/databases/ldb/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -79,7 +79,7 @@ PLIST_FILES= include/ldb_version.h \ include/ldb_module.h \ ${LDB_BINS} \ ${LDB_LIBS} \ - %%PKGCONFIGDIR%%/ldb.pc + ${PKGCONFIGDIR}/ldb.pc .if defined(NO_PYTHON) USES+= python:2.7,build @@ -90,9 +90,9 @@ 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 + ${PYTHON_SITELIBDIR}/ldb.so \ + ${PYTHON_SITELIBDIR}/_ldb_text.py \ + ${PKGCONFIGDIR}/pyldb-util.pc .endif .include <bsd.port.pre.mk> Modified: head/databases/ldb12/Makefile ============================================================================== --- head/databases/ldb12/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb12/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -81,7 +81,7 @@ PLIST_FILES= include/ldb_version.h \ include/ldb_module.h \ ${LDB_BINS} \ ${LDB_LIBS} \ - %%PKGCONFIGDIR%%/ldb.pc + ${PKGCONFIGDIR}/ldb.pc .if defined(NO_PYTHON) USES+= python:2.7,build @@ -92,15 +92,15 @@ 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 + ${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 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 @@ -116,11 +116,11 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAM 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 +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 Modified: head/databases/ldb13/Makefile ============================================================================== --- head/databases/ldb13/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb13/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.3 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases @@ -26,6 +26,8 @@ LDB_DEPENDS= talloc>=2.1.11:devel/talloc \ 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 @@ -85,7 +87,7 @@ PLIST_FILES= include/ldb_version.h \ include/ldb_module.h \ ${LDB_BINS} \ ${LDB_LIBS} \ - %%PKGCONFIGDIR%%/ldb.pc + ${PKGCONFIGDIR}/ldb.pc .if defined(NO_PYTHON) USES+= python:2.7,build @@ -96,15 +98,15 @@ 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 + ${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 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 @@ -120,11 +122,11 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAM 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 +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 Modified: head/databases/ldb13/distinfo ============================================================================== --- head/databases/ldb13/distinfo Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb13/distinfo Thu May 17 02:24:59 2018 (r470190) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520025663 -SHA256 (ldb-1.3.2.tar.gz) = ce3ef0b7358a8c5437d2cc0ba3fd6c2f2b7017bc87b09527406c8e34a82376ab -SIZE (ldb-1.3.2.tar.gz) = 1364976 +TIMESTAMP = 1525970287 +SHA256 (ldb-1.3.3.tar.gz) = 2b3070f6127d9684e928038abad441e18aef8c2ce703c3ec5d57fadd4ecdfa91 +SIZE (ldb-1.3.3.tar.gz) = 1370823 Added: head/databases/ldb13/files/0001-bug-13362.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/ldb13/files/0001-bug-13362.patch Thu May 17 02:24:59 2018 (r470190) @@ -0,0 +1,170 @@ +From 75e572c6ac2e537839da341e76236d1c4003cae7 Mon Sep 17 00:00:00 2001 +From: Volker Lendecke <vl@samba.org> +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 <vl@samba.org> +Reviewed-by: Jeremy Allison <jra@samba.org> +(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 <vl@samba.org> +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 <vl@samba.org> +Reviewed-by: Jeremy Allison <jra@samba.org> + +Autobuild-User(master): Jeremy Allison <jra@samba.org> +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 <assert.h> + #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 + Modified: head/databases/ldb13/files/patch-ldb_cache.c ============================================================================== --- head/databases/ldb13/files/patch-ldb_cache.c Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb13/files/patch-ldb_cache.c Thu May 17 02:24:59 2018 (r470190) @@ -1,5 +1,5 @@ ---- 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 +--- 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; Modified: head/databases/ldb13/files/patch-ldb_mod_op_test.c ============================================================================== --- head/databases/ldb13/files/patch-ldb_mod_op_test.c Thu May 17 02:18:52 2018 (r470189) +++ head/databases/ldb13/files/patch-ldb_mod_op_test.c Thu May 17 02:24:59 2018 (r470190) @@ -1,5 +1,5 @@ ---- 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 +--- 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); Modified: head/databases/tdb/Makefile ============================================================================== --- head/databases/tdb/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/databases/tdb/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -19,7 +19,7 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON #debug_PKGNAMESUFFIX= -debug #nopython_CONFLICTS= tdb tdb-debug #debug_CONFLICTS= tdb tdb-nopython -#default_CONFLICTS= tdb-nopython rdb-debug +#default_CONFLICTS= tdb-nopython tdb-debug USES= compiler pkgconfig waf USE_LDCONFIG= yes @@ -47,7 +47,7 @@ PLIST_FILES+= include/tdb.h \ ${TDB_BINS} \ lib/libtdb.so \ lib/libtdb.so.1 \ - %%PKGCONFIGDIR%%/tdb.pc + ${PKGCONFIGDIR}/tdb.pc .if defined(SAMBA4_DEBUG) CFLAGS+= -DTDB_TRACE=1 @@ -59,14 +59,14 @@ CONFIGURE_ARGS+= --disable-python .else USES+= python:2.7 -PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so \ - %%PYTHON_SITELIBDIR%%/_tdb_text.py +PLIST_FILES+= ${PYTHON_SITELIBDIR}/tdb.so \ + ${PYTHON_SITELIBDIR}/_tdb_text.py # 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 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 @@ -82,8 +82,8 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAM PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR} -PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.%%SAMBA4_PYTHON3_SO_ABI%%.so \ - %%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py +PLIST_FILES+= ${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so \ + ${SAMBA4_PYTHON3_SITELIBDIR}/_tdb_text.py .endif .endif Modified: head/devel/talloc/Makefile ============================================================================== --- head/devel/talloc/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/devel/talloc/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= talloc -PORTVERSION= 2.1.11 +PORTVERSION= 2.1.13 PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= SAMBA @@ -38,7 +38,7 @@ MANPAGES_DESC= Build and install manpages (requires t PLIST_FILES+= include/talloc.h \ lib/libtalloc.so \ lib/libtalloc.so.2 \ - %%PKGCONFIGDIR%%/talloc.pc + ${PKGCONFIGDIR}/talloc.pc .if defined(NO_PYTHON) USES+= python:2.7,build @@ -49,14 +49,14 @@ USES+= python:2.7 PLIST_FILES+= include/pytalloc.h \ lib/libpytalloc-util.so \ lib/libpytalloc-util.so.2 \ - %%PYTHON_SITELIBDIR%%/talloc.so \ - %%PKGCONFIGDIR%%/pytalloc-util.pc + ${PYTHON_SITELIBDIR}/talloc.so \ + ${PKGCONFIGDIR}/pytalloc-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 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 @@ -72,10 +72,10 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAM PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR} -PLIST_FILES+= lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \ - lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.2 \ - %%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.%%SAMBA4_PYTHON3_SO_ABI%%.so \ - %%PKGCONFIGDIR%%/pytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc +PLIST_FILES+= lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so \ + lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so.2 \ + ${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so \ + ${PKGCONFIGDIR}/pytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.pc .endif .endif Modified: head/devel/talloc/distinfo ============================================================================== --- head/devel/talloc/distinfo Thu May 17 02:18:52 2018 (r470189) +++ head/devel/talloc/distinfo Thu May 17 02:24:59 2018 (r470190) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516159871 -SHA256 (talloc-2.1.11.tar.gz) = 639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3 -SIZE (talloc-2.1.11.tar.gz) = 443320 +TIMESTAMP = 1526489938 +SHA256 (talloc-2.1.13.tar.gz) = 84f399dbf0ad97006a2b4953ea99452d033faac15aabfddd4ba61734764c6047 +SIZE (talloc-2.1.13.tar.gz) = 444608 Modified: head/devel/tevent/Makefile ============================================================================== --- head/devel/tevent/Makefile Thu May 17 02:18:52 2018 (r470189) +++ head/devel/tevent/Makefile Thu May 17 02:24:59 2018 (r470190) @@ -44,7 +44,7 @@ MANPAGES_DESC= Build and install manpages (requires t PLIST_FILES+= include/tevent.h \ lib/libtevent.so \ lib/libtevent.so.0 \ - %%PKGCONFIGDIR%%/tevent.pc + ${PKGCONFIGDIR}/tevent.pc .if defined(NO_PYTHON) USES+= python:2.7,build @@ -52,16 +52,16 @@ CONFIGURE_ARGS+= --disable-python .else USES+= python:2.7 -PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_tevent.so \ - %%PYTHON_SITELIBDIR%%/tevent.py \ - %%PYTHON_SITELIBDIR%%/tevent.pyc \ - %%PYTHON_SITELIBDIR%%/tevent.pyo +PLIST_FILES+= ${PYTHON_SITELIBDIR}/_tevent.so \ + ${PYTHON_SITELIBDIR}/tevent.py \ + ${PYTHON_SITELIBDIR}/tevent.pyc \ + ${PYTHON_SITELIBDIR}/tevent.pyo # 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 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 @@ -77,10 +77,10 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAM PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR} -PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.%%SAMBA4_PYTHON3_SO_ABI%%.so \ - %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py \ - %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyc \ - %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyo +PLIST_FILES+= ${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so \ + ${SAMBA4_PYTHON3_SITELIBDIR}/tevent.py \ + ${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyc \ + ${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyo .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805170224.w4H2Oxc9095866>