svn commit: r505764 - in head/net/samba48: . files
Timur I. Bakeyev
timur at FreeBSD.org
Wed Jul 3 16:52:51 UTC 2019
Author: timur
Date: Wed Jul 3 16:52:50 2019
New Revision: 505764
URL: https://svnweb.freebsd.org/changeset/ports/505764
Log:
Mark the conflict between samb48 and tdb1 in case of using bundled libs. Bumped version number to reflect pkg-plist changes.
The use of bundled libs is the default now. Hope that would resolve the conflicts with talloc/tdb/tevent{1} while this port
is still active.
Added:
head/net/samba48/files/patch-lib_tdb_wscript (contents, props changed)
Modified:
head/net/samba48/Makefile
head/net/samba48/files/patch-lib_ldb_wscript
head/net/samba48/pkg-plist
Modified: head/net/samba48/Makefile
==============================================================================
--- head/net/samba48/Makefile Wed Jul 3 16:48:42 2019 (r505763)
+++ head/net/samba48/Makefile Wed Jul 3 16:52:50 2019 (r505764)
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}48
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -73,7 +73,7 @@ USES= compiler:c++11-lang cpe iconv gettext-runtime
localbase:ldflags perl5 pkgconfig shebangfix \
ssl waf
USE_PERL5= build
-USE_LDCONFIG= ${SAMBA4_LIBDIR}
+USE_LDCONFIG= ${SAMBA4_LIBDIR} ${SAMBA4_LIBDIR}/private
WAF_CMD= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
@@ -157,13 +157,14 @@ BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchi
RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
### Bundled libraries
SAMBA4_BUNDLED_CMOCKA?= no
-SAMBA4_BUNDLED_TALLOC?= no
-SAMBA4_BUNDLED_TEVENT?= no
-SAMBA4_BUNDLED_TDB?= no
+SAMBA4_BUNDLED_TALLOC?= yes
+SAMBA4_BUNDLED_TEVENT?= yes
+SAMBA4_BUNDLED_TDB?= yes
SAMBA4_BUNDLED_LDB?= yes
# cmocka
.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
SAMBA4_BUNDLED_LIBS+= cmocka
+SAMBA4_BUILTIN_LIBS+= cmocka
CONFLICTS+= cmocka-1.*
PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA=""
SUB_LIST+= SAMBA4_BUNDLED_CMOCKA=""
@@ -177,6 +178,8 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment "
# talloc
.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
SAMBA4_BUNDLED_LIBS+= talloc
+SAMBA4_BUILTIN_LIBS+= talloc
+CONFLICTS+= talloc1-2.*
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
.else
@@ -189,6 +192,8 @@ SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
# tevent
.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
SAMBA4_BUNDLED_LIBS+= tevent
+SAMBA4_BUILTIN_LIBS+= tevent
+CONFLICTS+= tevent1-0.*
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
.else
@@ -201,6 +206,8 @@ SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
# tdb
.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
SAMBA4_BUNDLED_LIBS+= tdb
+SAMBA4_BUILTIN_LIBS+= tdb
+CONFLICTS+= tdb1-1.*
PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
SUB_LIST+= SAMBA4_BUNDLED_TDB=""
.else
@@ -214,6 +221,7 @@ SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
SAMBA4_BUNDLED_LDB= yes
SAMBA4_BUNDLED_LIBS+= ldb
+SAMBA4_BUILTIN_LIBS+= ldb
CONFLICTS+= ldb-1.* ldb1[23]-1.*
PLIST_SUB+= SAMBA4_BUNDLED_LDB=""
SUB_LIST+= SAMBA4_BUNDLED_LDB=""
@@ -230,6 +238,7 @@ SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment "
|| (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
|| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
SAMBA4_BUNDLED_LIBS+= replace
+SAMBA4_BUILTIN_LIBS+= replace
.endif
# Don't use external libcom_err
SAMBA4_BUNDLED_LIBS+= com_err
@@ -456,7 +465,7 @@ SAMBA4_MODULES+= ${WANT_EXP_MODULES}
.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
-CONFIGURE_ARGS+= --builtin-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
+CONFIGURE_ARGS+= --builtin-libraries="${SAMBA4_BUILTIN_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
.endif
.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
Modified: head/net/samba48/files/patch-lib_ldb_wscript
==============================================================================
--- head/net/samba48/files/patch-lib_ldb_wscript Wed Jul 3 16:48:42 2019 (r505763)
+++ head/net/samba48/files/patch-lib_ldb_wscript Wed Jul 3 16:52:50 2019 (r505764)
@@ -30,6 +30,24 @@
name = bld.pyembed_libname('pyldb-util')
bld.SAMBA_LIBRARY(name,
+@@ -337,7 +336,7 @@ def build(bld):
+
+ LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
+ for t in LDB_TOOLS.split():
+- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
++ bld.SAMBA_BINARY('samba-%s' % t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
+ manpages='man/%s.1' % t)
+
+ # ldbtest doesn't get installed
+@@ -345,7 +344,7 @@ def build(bld):
+ install=False)
+
+ # ldbdump doesn't get installed
+- bld.SAMBA_BINARY('ldbdump', 'tools/ldbdump.c', deps='ldb-cmdline ldb',
++ bld.SAMBA_BINARY('samba-ldbdump', 'tools/ldbdump.c', deps='ldb-cmdline ldb',
+ install=False)
+
+ bld.SAMBA_LIBRARY('ldb-cmdline',
@@ -364,10 +363,6 @@ def build(bld):
deps='cmocka ldb',
install=False)
Added: head/net/samba48/files/patch-lib_tdb_wscript
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/samba48/files/patch-lib_tdb_wscript Wed Jul 3 16:52:50 2019 (r505764)
@@ -0,0 +1,27 @@
+--- lib/tdb/wscript.orig 2019-07-02 22:39:54 UTC
++++ lib/tdb/wscript
+@@ -145,20 +145,20 @@ def build(bld):
+ 'tdb',
+ install=False)
+
+- bld.SAMBA_BINARY('tdbrestore',
++ bld.SAMBA_BINARY('samba-tdbrestore',
+ 'tools/tdbrestore.c',
+ 'tdb', manpages='man/tdbrestore.8')
+
+- bld.SAMBA_BINARY('tdbdump',
++ bld.SAMBA_BINARY('samba-tdbdump',
+ 'tools/tdbdump.c',
+ 'tdb', manpages='man/tdbdump.8')
+
+- bld.SAMBA_BINARY('tdbbackup',
++ bld.SAMBA_BINARY('samba-tdbbackup',
+ 'tools/tdbbackup.c',
+ 'tdb',
+ manpages='man/tdbbackup.8')
+
+- bld.SAMBA_BINARY('tdbtool',
++ bld.SAMBA_BINARY('samba-tdbtool',
+ 'tools/tdbtool.c',
+ 'tdb', manpages='man/tdbtool.8')
+
Modified: head/net/samba48/pkg-plist
==============================================================================
--- head/net/samba48/pkg-plist Wed Jul 3 16:48:42 2019 (r505763)
+++ head/net/samba48/pkg-plist Wed Jul 3 16:52:50 2019 (r505764)
@@ -1289,26 +1289,32 @@ man/man8/winbindd.8.gz
%%CLUSTER%%@dir /var/lib
%%CLUSTER%%@dir /var/run/ctdb
@comment Use bundled libraries
-%%SAMBA4_BUNDLED_LDB%%bin/ldbadd
-%%SAMBA4_BUNDLED_LDB%%bin/ldbdel
-%%SAMBA4_BUNDLED_LDB%%bin/ldbedit
-%%SAMBA4_BUNDLED_LDB%%bin/ldbmodify
-%%SAMBA4_BUNDLED_LDB%%bin/ldbrename
-%%SAMBA4_BUNDLED_LDB%%bin/ldbsearch
-%%SAMBA4_BUNDLED_TDB%%bin/tdbbackup
-%%SAMBA4_BUNDLED_TDB%%bin/tdbdump
-%%SAMBA4_BUNDLED_TDB%%bin/tdbrestore
-%%SAMBA4_BUNDLED_TDB%%bin/tdbtool
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool
+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/tdb.so
%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/ldb.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_tevent.so
-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/talloc.so
%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/tevent.py
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/talloc.so
%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py
%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py
%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.cpython-36m.so
-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.cpython-36m.so
%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.cpython-36m.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON3%%lib/samba4/private/libpyldb-util.cpython-36m.so.1
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpyldb-util.so.1
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON3%%lib/samba4/private/libpytalloc-util.cpython-36m.so.2
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpytalloc-util.so.2
%%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/asq.so
More information about the svn-ports-head
mailing list