On Thu, Jul 14 2022, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
> On Thu, Jul 14 2022, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
>> On Thu, Jul 14 2022, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
>>> Work around the build error I had by building --without-gettext.
>>> (hint from upstream: https://bugzilla.samba.org/show_bug.cgi?id=15030)
>>> I don't know whether this could have a negative impact.
>>>
>>> libreplace.so and libutil-setid.so are not versioned any more so
>>> the -util package makes less sense. I deciced to just merge -util, -ldb
>>> and -tevent in samba (nothing else uses those libs in a standalone
>>> context anyway). The @conflict and @pkgpath markers seem ok, pkg_add -u
>>> path tested.
Spotted by Ian: there was a @conflict marker missing for samba-util.
Consumers build tested, runtime seems ok to Ian, this looks ready for
commit. More runtime test reports are always welcome.
Index: databases/tdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- databases/tdb/Makefile 11 Mar 2022 18:31:47 -0000 1.41
+++ databases/tdb/Makefile 15 Jul 2022 10:42:51 -0000
@@ -2,11 +2,10 @@ COMMENT-main= trivial database library
COMMENT-python= Python ${MODPY_VERSION} bindings for tdb
# Keep in sync with the version bundled in net/samba
-V= 1.4.5
+V= 1.4.6
DISTNAME= tdb-$V
PKGNAME-python= py3-${DISTNAME}
-REVISION-python= 0
MULTI_PACKAGES= -main -python
Index: databases/tdb/distinfo
===================================================================
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- databases/tdb/distinfo 19 Oct 2021 12:06:57 -0000 1.17
+++ databases/tdb/distinfo 15 Jul 2022 10:42:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.5.tar.gz) = vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE=
-SIZE (tdb-1.4.5.tar.gz) = 729650
+SHA256 (tdb-1.4.6.tar.gz) = 1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=
+SIZE (tdb-1.4.6.tar.gz) = 736747
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.10
diff -u -p -r1.10 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 11 Mar 2022
18:31:47 -0000 1.10
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 15 Jul 2022
10:42:51 -0000
@@ -4,7 +4,7 @@
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -211,6 +211,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -281,6 +281,13 @@ def SAMBA_LIBRARY(bld, libname, source,
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
# we don't want any public libraries without version numbers
if (not private_library and target_type != 'PYTHON' and not realname):
if vnum is None and soname is None:
-@@ -322,9 +329,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -398,9 +405,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed:
Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.313
diff -u -p -r1.313 Makefile
--- net/samba/Makefile 1 Jul 2022 08:39:59 -0000 1.313
+++ net/samba/Makefile 15 Jul 2022 10:42:51 -0000
@@ -1,61 +1,37 @@
-VERSION = 4.15.8
+VERSION = 4.16.2
DISTNAME = samba-${VERSION}
EPOCH = 0
-REVISION-tevent = 6
COMMENT-main = SMB and CIFS client and server for UNIX
-COMMENT-ldb = LDAP-like embedded database
-COMMENT-tevent = event system based on talloc
-COMMENT-util = common libraries for Samba suite
COMMENT-docs = additional documentation and examples for Samba
PKGNAME-main = ${PKGNAME}
-PKGNAME-ldb = ldb-${LDB_V}
-PKGNAME-tevent = tevent-${TEVENT_V}
-PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs = *
-LDB_V = 2.4.3
-TEVENT_V = 0.11.0
-
-SHARED_LIBS = asn1-samba4 2.0 \
- com_err-samba4 1.0 \
- dcerpc 1.1 \
+SHARED_LIBS = dcerpc 1.1 \
dcerpc-binding 4.0 \
dcerpc-samr 1.0 \
- dcerpc-server-core 2.0 \
- gssapi-samba4 1.0 \
- hcrypto-samba4 1.0 \
- hdb-samba4 1.0 \
- heimbase-samba4 1.0 \
- heimntlm-samba4 1.0 \
- hx509-samba4 1.0 \
- kdc-samba4 1.0 \
- krb5-samba4 1.1 \
+ dcerpc-server-core 3.0 \
ldb 2.0 \
ndr 3.0 \
ndr-krb5pac 1.1 \
ndr-nbt 1.0 \
- ndr-standard 4.0 \
+ ndr-standard 4.1 \
netapi 3.1 \
- roken-samba4 1.0 \
samba-credentials 1.1 \
samba-errors 2.1 \
- samba-hostconfig 9.0 \
+ samba-hostconfig 9.1 \
samba-passdb 3.0 \
- samba-util 7.2 \
+ samba-util 7.3 \
samdb 2.0 \
smbclient 6.1 \
- smbconf 10.1 \
+ smbconf 11.0 \
smbldap 1.0 \
tevent 2.0 \
tevent-util 2.0 \
- wbclient 5.0 \
- wind-samba4 1.0 \
- replace 12.1 \
- util-setid 12.0
+ wbclient 5.0
# Those have to be handled specially, see "Python ABI" below.
SHARED_LIBS += pyldb-util.cpython-${MODPY_MAJORMINOR} 1.0
@@ -71,37 +47,24 @@ MAINTAINER = Ian McWilliam <kaosagnt@gm
# GPLv3, LGPLv3
PERMIT_PACKAGE = Yes
-UTIL_LIBS = replace util-setid
-# TODO WAF scripts link to those without version info, but those are
-# not "plugins" or such.
-UTIL_WANTLIB = ${UTIL_LIBS:S@^@lib/samba/@}
-
WANTLIB-main = ${MODPY_WANTLIB}
WANTLIB-main += avahi-client avahi-common cups c execinfo fam
-WANTLIB-main += iconv intl jansson lber ldap pam popt pthread
gnutls
-WANTLIB-main += ldb pyldb-util.cpython-${MODPY_MAJORMINOR}
+WANTLIB-main += iconv jansson lber ldap pam popt pthread gnutls
WANTLIB-main += pytalloc-util.cpython-${MODPY_MAJORMINOR}
readline
-WANTLIB-main += talloc tasn1 tevent tdb z
-WANTLIB-main += ${UTIL_WANTLIB}
-
-WANTLIB-ldb = ${MODPY_WANTLIB}
-WANTLIB-ldb += c lber ldap popt replace talloc tdb tevent
-
-WANTLIB-tevent = c replace talloc
-
-WANTLIB-util = c
+WANTLIB-main += talloc tasn1 tdb z
WANTLIB-docs =
MASTER_SITES = https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
-MULTI_PACKAGES = -main -ldb -tevent -util -docs
+MULTI_PACKAGES = -main -docs
DEBUG_PACKAGES = ${BUILD_PACKAGES}
MODULES = lang/python perl
-BUILD_DEPENDS = databases/tdb,-python \
+BUILD_DEPENDS = converters/p5-JSON \
+ databases/tdb,-python \
devel/bison \
devel/cmocka \
devel/p5-Parse-Yapp>=1.0.5 \
@@ -113,12 +76,9 @@ RUN_DEPENDS-main = databases/tdb,-python
RUN_DEPENDS-docs =
-LIB_DEPENDS-main = ${BUILD_PKGPATH},-ldb>=${LDB_V} \
- ${BUILD_PKGPATH},-util>=${VERSION} \
- converters/libiconv \
+LIB_DEPENDS-main = converters/libiconv \
databases/openldap \
- databases/tdb>=1.4.4 \
- devel/gettext,-runtime \
+ databases/tdb>=1.4.6 \
devel/jansson \
devel/libtalloc>=2.3.3 \
devel/libtalloc,-python \
@@ -129,16 +89,6 @@ LIB_DEPENDS-main = ${BUILD_PKGPATH},-ldb
security/openpam \
sysutils/gamin
-LIB_DEPENDS-ldb = ${BUILD_PKGPATH},-tevent>=${TEVENT_V} \
- ${BUILD_PKGPATH},-util>=${VERSION} \
- devel/popt \
- databases/openldap \
- databases/tdb>=1.4.4 \
- devel/libtalloc>=2.3.3
-
-LIB_DEPENDS-tevent = ${BUILD_PKGPATH},-util>=${VERSION} \
- devel/libtalloc>=2.3.3
-
LIB_DEPENDS-docs =
CONFIGURE_STYLE = simple
@@ -170,6 +120,8 @@ CONFIGURE_ARGS = --enable-fhs \
--without-ad-dc \
--without-gpgme \
--without-ldb-lmdb
+# hack for https://bugzilla.samba.org/show_bug.cgi?id=15030
+CONFIGURE_ARGS += --without-gettext
# XXX Remember to remove --enable-developer, it prints passwords in logs.
#CONFIGURE_ARGS += --enable-developer
@@ -223,6 +175,8 @@ SUBST_VARS += SAMBA_LOGDIR
post-patch:
find ${WRKSRC} -type f -exec ${MODPY_BIN_ADJ} {} +
+ find ${WRKSRC}/third_party/heimdal/ -name version-script.map -exec \
+ sed -i "s/^[A-Z0-9._-]* {/{/" {} +
post-install:
# removing extra files
@@ -234,12 +188,6 @@ post-install:
# precompiling Python modules
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
${MODPY_BIN} -O ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
- # removing extra symlinks
- find ${PREFIX}/lib -type l -name '*.so' -delete
- # creating library symlinks
-.for _l in ${UTIL_LIBS}
- cd ${PREFIX}/lib && ln -fs samba/lib${_l}.so.${LIB${_l}_VERSION}
-.endfor
# install samba docs and sample config
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/samba
cp -R ${WRKDIST}/examples/* ${PREFIX}/share/examples/samba
Index: net/samba/distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.93
diff -u -p -r1.93 distinfo
--- net/samba/distinfo 1 Jul 2022 08:39:59 -0000 1.93
+++ net/samba/distinfo 15 Jul 2022 10:42:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-4.15.8.tar.gz) = UB+h9EfZEkqIwyjnMUlDgztDvTynR3arViFxukIj+TM=
-SIZE (samba-4.15.8.tar.gz) = 19306079
+SHA256 (samba-4.16.2.tar.gz) = oLegbVs/0TjMe0lOAQrQtS49X6aEk6RGGaf5Z0Z/hZw=
+SIZE (samba-4.16.2.tar.gz) = 30597031
Index: net/samba/patches/patch-buildtools_wafsamba_samba_abi_py
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_abi_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_abi_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_abi_py 10 Mar 2022
00:04:07 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_samba_abi_py 15 Jul 2022
10:42:51 -0000
@@ -5,7 +5,16 @@ breaks binutils-2.17 ld(1).
Index: buildtools/wafsamba/samba_abi.py
--- buildtools/wafsamba/samba_abi.py.orig
+++ buildtools/wafsamba/samba_abi.py
-@@ -170,24 +170,7 @@ def abi_write_vscript(f, libname, current_version, ver
+@@ -169,7 +169,7 @@ def version_script_map_process_file(fname, version, ab
+ continue
+ if line.startswith("#"):
+ continue
+- if line.endswith(" {"):
++ if line.endswith("{"):
+ in_section = True
+ continue
+ if line == "};":
+@@ -210,24 +210,7 @@ def abi_write_vscript(f, libname, current_version, ver
version
"""
Index: net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.15
diff -u -p -r1.15 patch-buildtools_wafsamba_samba_autoconf_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 10 Mar
2022 00:04:07 -0000 1.15
+++ net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 15 Jul
2022 10:42:51 -0000
@@ -5,7 +5,7 @@
Index: buildtools/wafsamba/samba_autoconf.py
--- buildtools/wafsamba/samba_autoconf.py.orig
+++ buildtools/wafsamba/samba_autoconf.py
-@@ -893,6 +893,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+@@ -912,6 +912,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
if not 'EXTRA_LDFLAGS' in conf.env:
conf.env['EXTRA_LDFLAGS'] = []
conf.env['EXTRA_LDFLAGS'].extend(TO_LIST(flags))
@@ -33,7 +33,7 @@ Index: buildtools/wafsamba/samba_autocon
return flags
-@@ -962,7 +983,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+@@ -981,7 +1002,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
# symbols used for fuzzers are only defined by compiler wrappers.
return
Index: net/samba/patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.9
diff -u -p -r1.9 patch-buildtools_wafsamba_wafsamba_py
--- net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 10 Mar 2022
00:04:07 -0000 1.9
+++ net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 15 Jul 2022
10:42:51 -0000
@@ -7,9 +7,9 @@
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -208,6 +208,17 @@ def SAMBA_LIBRARY(bld, libname, source,
- deps = TO_LIST(deps)
- deps.append(obj_target)
+@@ -278,6 +278,17 @@ def SAMBA_LIBRARY(bld, libname, source,
+ # the library itself will depend on that object target
+ samba_deps.append(dep_target)
+ saved_lib_version = vnum
+ osvnum = os.getenv('LIB' + libname.replace('-', '_').replace('.', '_') +
'_VERSION')
@@ -25,7 +25,7 @@ Index: buildtools/wafsamba/wafsamba.py
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
-@@ -322,9 +333,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -398,9 +409,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed:
Index: net/samba/patches/patch-buildtools_wafsamba_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wscript,v
retrieving revision 1.6
diff -u -p -r1.6 patch-buildtools_wafsamba_wscript
--- net/samba/patches/patch-buildtools_wafsamba_wscript 10 Mar 2022 00:04:07
-0000 1.6
+++ net/samba/patches/patch-buildtools_wafsamba_wscript 15 Jul 2022 10:42:51
-0000
@@ -3,7 +3,7 @@ Add a hack to force addition of -I/usr/i
Index: buildtools/wafsamba/wscript
--- buildtools/wafsamba/wscript.orig
+++ buildtools/wafsamba/wscript
-@@ -88,6 +88,11 @@ def options(opt):
+@@ -141,6 +141,11 @@ Currently the only tested value is 'smbtorture,smbd/sm
help=("Disable use of gettext"),
action="store_true", dest='disable_gettext', default=False)
Index: net/samba/patches/patch-source3_lib_sysquotas_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_lib_sysquotas_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-source3_lib_sysquotas_c
--- net/samba/patches/patch-source3_lib_sysquotas_c 10 Mar 2022 00:04:07
-0000 1.3
+++ net/samba/patches/patch-source3_lib_sysquotas_c 15 Jul 2022 10:42:51
-0000
@@ -3,7 +3,7 @@ Avoid printf("%s", NULL);
Index: source3/lib/sysquotas.c
--- source3/lib/sysquotas.c.orig
+++ source3/lib/sysquotas.c
-@@ -575,10 +575,10 @@ int sys_get_quota(const char *path, enum SMB_QUOTA_TYP
+@@ -517,10 +517,10 @@ int sys_get_quota(const char *path, enum SMB_QUOTA_TYP
ret = sys_quota_backends[i].get_quota(mntpath, bdev,
qtype, id, dp);
if (ret!=0) {
DEBUG(3,("sys_get_%s_quota() failed for
mntpath[%s] bdev[%s] qtype[%d] id[%d]: %s.\n",
@@ -16,7 +16,7 @@ Index: source3/lib/sysquotas.c
}
ready = True;
break;
-@@ -590,10 +590,10 @@ int sys_get_quota(const char *path, enum SMB_QUOTA_TYP
+@@ -532,10 +532,10 @@ int sys_get_quota(const char *path, enum SMB_QUOTA_TYP
ret=sys_get_vfs_quota(mntpath, bdev, qtype, id, dp);
if (ret!=0) {
DEBUG(3,("sys_get_%s_quota() failed for mntpath[%s]
bdev[%s] qtype[%d] id[%d]: %s\n",
Index: net/samba/patches/patch-source3_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript,v
retrieving revision 1.16
diff -u -p -r1.16 patch-source3_wscript
--- net/samba/patches/patch-source3_wscript 1 Jul 2022 08:39:59 -0000
1.16
+++ net/samba/patches/patch-source3_wscript 15 Jul 2022 10:42:51 -0000
@@ -22,7 +22,7 @@ Index: source3/wscript
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
# We crash without vfs_default
-@@ -1687,6 +1688,7 @@ main() {
+@@ -1672,6 +1673,7 @@ main() {
conf.CHECK_CODE('void seekdir(DIR *d, long loc) { return; }',
'SEEKDIR_RETURNS_VOID',
@@ -30,7 +30,7 @@ Index: source3/wscript
headers='sys/types.h dirent.h',
msg='Checking whether seekdir returns void')
-@@ -1800,7 +1802,7 @@ main() {
+@@ -1785,7 +1787,7 @@ main() {
else:
conf.fatal('AFS headers not available, but --with-fake-kaserver
was specified')
Index: net/samba/patches/patch-source3_wscript_build
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript_build,v
retrieving revision 1.6
diff -u -p -r1.6 patch-source3_wscript_build
--- net/samba/patches/patch-source3_wscript_build 10 Mar 2022 00:04:07
-0000 1.6
+++ net/samba/patches/patch-source3_wscript_build 15 Jul 2022 10:42:51
-0000
@@ -4,7 +4,7 @@ interface used at least by pdbedit.
Index: source3/wscript_build
--- source3/wscript_build.orig
+++ source3/wscript_build
-@@ -132,7 +132,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
+@@ -134,7 +134,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
'!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_ldapsam_init*')
Index: net/samba/patches/patch-source4_heimdal_build_wscript_build
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_build_wscript_build
diff -N net/samba/patches/patch-source4_heimdal_build_wscript_build
--- net/samba/patches/patch-source4_heimdal_build_wscript_build 10 Mar 2022
00:04:07 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Make Samba4 WAF respect OpenBSD shared libraries versioning conventions.
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=9774
-
-Index: source4/heimdal_build/wscript_build
---- source4/heimdal_build/wscript_build.orig
-+++ source4/heimdal_build/wscript_build
-@@ -247,6 +247,11 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, versi
-
- features = 'c cshlib symlink_lib install_lib'
-
-+ # OpenBSD-like library version handling
-+ osvnum = os.getenv('LIB' + bundled_name.replace('-', '_') + '_VERSION')
-+ if osvnum:
-+ vnum = osvnum
-+
- bld.set_group('main')
- t = bld(
- features = features,
Index: net/samba/patches/patch-source4_heimdal_lib_asn1_version-script_map
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_lib_asn1_version-script_map
diff -N net/samba/patches/patch-source4_heimdal_lib_asn1_version-script_map
--- net/samba/patches/patch-source4_heimdal_lib_asn1_version-script_map 10 Mar
2022 00:04:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Don't add a version to the symbols in this library, it breaks binutils-2.17
ld(1).
-
-Index: source4/heimdal/lib/asn1/version-script.map
---- source4/heimdal/lib/asn1/version-script.map.orig
-+++ source4/heimdal/lib/asn1/version-script.map
-@@ -1,6 +1,6 @@
- # Export everything, but put a tag on is so that we make ourself incompatible
with older versions
-
--HEIMDAL_ASN1_1.0 {
-+{
- global:
- *;
- };
Index: net/samba/patches/patch-source4_heimdal_lib_com_err_version-script_map
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_lib_com_err_version-script_map
diff -N net/samba/patches/patch-source4_heimdal_lib_com_err_version-script_map
--- net/samba/patches/patch-source4_heimdal_lib_com_err_version-script_map
10 Mar 2022 00:04:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Don't add a version to the symbols in this library, it breaks binutils-2.17
ld(1).
-
-Index: source4/heimdal/lib/com_err/version-script.map
---- source4/heimdal/lib/com_err/version-script.map.orig
-+++ source4/heimdal/lib/com_err/version-script.map
-@@ -2,5 +2,5 @@
-
--HEIMDAL_COM_ERR_1.0 {
-+{
- global:
- com_right;
- com_right_r;
Index: net/samba/patches/patch-source4_heimdal_lib_gssapi_version-script_map
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_lib_gssapi_version-script_map
diff -N net/samba/patches/patch-source4_heimdal_lib_gssapi_version-script_map
--- net/samba/patches/patch-source4_heimdal_lib_gssapi_version-script_map
10 Mar 2022 00:04:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Don't add a version to the symbols in this library, it breaks binutils-2.17
ld(1).
-
-Index: source4/heimdal/lib/gssapi/version-script.map
---- source4/heimdal/lib/gssapi/version-script.map.orig
-+++ source4/heimdal/lib/gssapi/version-script.map
-@@ -2,5 +2,5 @@
-
--HEIMDAL_GSS_2.0 {
-+{
- global:
- # __gss_c_nt_anonymous;
- __gss_c_nt_anonymous_oid_desc;
Index: net/samba/patches/patch-source4_heimdal_lib_krb5_version-script_map
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_lib_krb5_version-script_map
diff -N net/samba/patches/patch-source4_heimdal_lib_krb5_version-script_map
--- net/samba/patches/patch-source4_heimdal_lib_krb5_version-script_map 10 Mar
2022 00:04:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Don't add a version to the symbols in this library, it breaks binutils-2.17
ld(1).
-
-Index: source4/heimdal/lib/krb5/version-script.map
---- source4/heimdal/lib/krb5/version-script.map.orig
-+++ source4/heimdal/lib/krb5/version-script.map
-@@ -1,4 +1,4 @@
--HEIMDAL_KRB5_2.0 {
-+{
- global:
- krb524_convert_creds_kdc;
- krb524_convert_creds_kdc_ccache;
Index: net/samba/patches/patch-source4_heimdal_lib_roken_version-script_map
===================================================================
RCS file: net/samba/patches/patch-source4_heimdal_lib_roken_version-script_map
diff -N net/samba/patches/patch-source4_heimdal_lib_roken_version-script_map
--- net/samba/patches/patch-source4_heimdal_lib_roken_version-script_map
10 Mar 2022 00:04:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Don't add a version to the symbols in this library, it breaks binutils-2.17
ld(1).
-
-Index: source4/heimdal/lib/roken/version-script.map
---- source4/heimdal/lib/roken/version-script.map.orig
-+++ source4/heimdal/lib/roken/version-script.map
-@@ -1,4 +1,4 @@
--HEIMDAL_ROKEN_1.0 {
-+{
- global:
- arg_printusage;
- arg_printusage_i18n;
Index: net/samba/pkg/DESCR-ldb
===================================================================
RCS file: net/samba/pkg/DESCR-ldb
diff -N net/samba/pkg/DESCR-ldb
--- net/samba/pkg/DESCR-ldb 25 Aug 2015 11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-ldb is a LDAP-like embedded database. It is not at all LDAP standards
-compliant, so if you want a standards compliant database then please
-see the openldap package.
-
-What ldb does is provide 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.
-
-ldb is the database engine used in Samba4.
Index: net/samba/pkg/DESCR-tevent
===================================================================
RCS file: net/samba/pkg/DESCR-tevent
diff -N net/samba/pkg/DESCR-tevent
--- net/samba/pkg/DESCR-tevent 25 Aug 2015 11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-Tevent is an event system based on the talloc memory management library.
-It is the core event system used in Samba.
-
-The low level tevent has support for many event types, including timers,
-signals, and the classic file descriptor events.
-
-Tevent also provide helpers to deal with asynchronous code providing the
-tevent_req (tevent request) functions.
Index: net/samba/pkg/DESCR-util
===================================================================
RCS file: net/samba/pkg/DESCR-util
diff -N net/samba/pkg/DESCR-util
--- net/samba/pkg/DESCR-util 12 Apr 2016 17:42:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-This package includes the following Samba4 components:
-
-libreplace:
- Wrapper for some other required system components. Contains
- implementation of routines not found in system.
-
-util_setid:
- TODO
Index: net/samba/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST-docs
--- net/samba/pkg/PLIST-docs 10 Mar 2022 00:04:07 -0000 1.29
+++ net/samba/pkg/PLIST-docs 15 Jul 2022 10:42:51 -0000
@@ -1,4 +1,5 @@
@pkgpath net/samba,-docs
+share/examples/samba/
share/examples/samba/LDAP/
share/examples/samba/LDAP/README
share/examples/samba/LDAP/get_next_oid
Index: net/samba/pkg/PLIST-ldb
===================================================================
RCS file: net/samba/pkg/PLIST-ldb
diff -N net/samba/pkg/PLIST-ldb
--- net/samba/pkg/PLIST-ldb 10 Mar 2022 00:04:07 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-@conflict samba-<4.9.17p0v0
-@bin bin/ldbadd
-@bin bin/ldbdel
-@bin bin/ldbedit
-@bin bin/ldbmodify
-@bin bin/ldbrename
-@bin bin/ldbsearch
-include/samba-4.0/ldb.h
-include/samba-4.0/ldb_errors.h
-include/samba-4.0/ldb_handlers.h
-include/samba-4.0/ldb_module.h
-include/samba-4.0/ldb_version.h
-include/samba-4.0/pyldb.h
-@lib lib/libldb.so.${LIBldb_VERSION}
-@comment @lib lib/libpyldb-util.${PYLDB_UTIL_LIBSUFFIX}
-@lib lib/libpyldb-util.${PYLDB_UTIL_LIBSUFFIX}
-lib/pkgconfig/ldb.pc
-lib/pkgconfig/pyldb-util.${MODPY_PYC_MAGIC_TAG}pc
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_ldb_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_ldb_text.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_ldb_text.py
-@so lib/python${MODPY_VERSION}/site-packages/ldb.${MODPY_PYC_MAGIC_TAG}so
-lib/samba/ldb/
-@so lib/samba/ldb/asq.so
-@so lib/samba/ldb/ldap.so
-@so lib/samba/ldb/ldb.so
-@so lib/samba/ldb/paged_searches.so
-@so lib/samba/ldb/rdn_name.so
-@so lib/samba/ldb/sample.so
-@so lib/samba/ldb/server_sort.so
-@so lib/samba/ldb/skel.so
-@so lib/samba/ldb/tdb.so
-@so lib/samba/libldb-cmdline-samba4.so
-@so lib/samba/libldb-key-value-samba4.so
-@man man/man1/ldbadd.1
-@man man/man1/ldbdel.1
-@man man/man1/ldbedit.1
-@man man/man1/ldbmodify.1
-@man man/man1/ldbrename.1
-@man man/man1/ldbsearch.1
-@man man/man3/ldb.3
Index: net/samba/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.63
diff -u -p -r1.63 PLIST-main
--- net/samba/pkg/PLIST-main 13 Mar 2022 00:09:45 -0000 1.63
+++ net/samba/pkg/PLIST-main 15 Jul 2022 10:42:51 -0000
@@ -1,7 +1,12 @@
-@conflict ldb-<1.4.8p0v0
+@conflict ldb-<=2.4.3v0
+@conflict tevent-<=0.11.0p6v0
+@conflict samba-util-<=4.15.8v0
@pkgpath net/samba,ldap,-main
@pkgpath net/samba,ads,-main
@pkgpath net/samba,,-main
+@pkgpath net/samba,-ldb
+@pkgpath net/samba,-tevent
+@pkgpath net/samba,-util
@rcscript ${RCDIR}/nmbd
@rcscript ${RCDIR}/samba
@rcscript ${RCDIR}/smbd
@@ -11,6 +16,12 @@
@bin bin/dbwrap_tool
@bin bin/dumpmscat
@bin bin/gentest
+@bin bin/ldbadd
+@bin bin/ldbdel
+@bin bin/ldbedit
+@bin bin/ldbmodify
+@bin bin/ldbrename
+@bin bin/ldbsearch
@bin bin/locktest
@bin bin/masktest
@bin bin/mdsearch
@@ -42,6 +53,7 @@ bin/smbtar
@bin bin/smbtree
@bin bin/testparm
@bin bin/wbinfo
+include/samba-4.0/
include/samba-4.0/charset.h
include/samba-4.0/core/
include/samba-4.0/core/doserr.h
@@ -81,6 +93,11 @@ include/samba-4.0/gen_ndr/samr.h
include/samba-4.0/gen_ndr/security.h
include/samba-4.0/gen_ndr/server_id.h
include/samba-4.0/gen_ndr/svcctl.h
+include/samba-4.0/ldb.h
+include/samba-4.0/ldb_errors.h
+include/samba-4.0/ldb_handlers.h
+include/samba-4.0/ldb_module.h
+include/samba-4.0/ldb_version.h
include/samba-4.0/ldb_wrap.h
include/samba-4.0/libsmbclient.h
include/samba-4.0/lookup_sid.h
@@ -97,6 +114,7 @@ include/samba-4.0/netapi.h
include/samba-4.0/param.h
include/samba-4.0/passdb.h
include/samba-4.0/policy.h
+include/samba-4.0/pyldb.h
include/samba-4.0/rpc_common.h
include/samba-4.0/samba/
include/samba-4.0/samba/session.h
@@ -107,6 +125,7 @@ include/samba-4.0/smb_ldap.h
include/samba-4.0/smbconf.h
include/samba-4.0/smbldap.h
include/samba-4.0/tdr.h
+include/samba-4.0/tevent.h
include/samba-4.0/tsocket.h
include/samba-4.0/tsocket_internal.h
include/samba-4.0/util/
@@ -132,38 +151,51 @@ include/samba-4.0/wbclient.h
@lib lib/libdcerpc-samr.so.${LIBdcerpc-samr_VERSION}
@lib lib/libdcerpc-server-core.so.${LIBdcerpc-server-core_VERSION}
@lib lib/libdcerpc.so.${LIBdcerpc_VERSION}
+@lib lib/libldb.so.${LIBldb_VERSION}
@lib lib/libndr-krb5pac.so.${LIBndr-krb5pac_VERSION}
@lib lib/libndr-nbt.so.${LIBndr-nbt_VERSION}
@lib lib/libndr-standard.so.${LIBndr-standard_VERSION}
@lib lib/libndr.so.${LIBndr_VERSION}
@lib lib/libnetapi.so.${LIBnetapi_VERSION}
+@lib
lib/libpyldb-util.${MODPY_PYC_MAGIC_TAG}so.${LIBpyldb-util.cpython-39_VERSION}
@lib lib/libsamba-credentials.so.${LIBsamba-credentials_VERSION}
@lib lib/libsamba-errors.so.${LIBsamba-errors_VERSION}
@lib lib/libsamba-hostconfig.so.${LIBsamba-hostconfig_VERSION}
@lib lib/libsamba-passdb.so.${LIBsamba-passdb_VERSION}
@comment @lib lib/libsamba-policy.${SAMBA_POLICY_LIBSUFFIX}
-@lib lib/libsamba-policy.${SAMBA_POLICY_LIBSUFFIX}
+@lib
lib/libsamba-policy.${MODPY_PYC_MAGIC_TAG}so.${LIBsamba-policy.cpython-39_VERSION}
@lib lib/libsamba-util.so.${LIBsamba-util_VERSION}
@lib lib/libsamdb.so.${LIBsamdb_VERSION}
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
@lib lib/libsmbconf.so.${LIBsmbconf_VERSION}
@lib lib/libsmbldap.so.${LIBsmbldap_VERSION}
@lib lib/libtevent-util.so.${LIBtevent-util_VERSION}
+@lib lib/libtevent.so.${LIBtevent_VERSION}
@lib lib/libwbclient.so.${LIBwbclient_VERSION}
lib/pkgconfig/dcerpc.pc
lib/pkgconfig/dcerpc_samr.pc
+lib/pkgconfig/ldb.pc
lib/pkgconfig/ndr.pc
lib/pkgconfig/ndr_krb5pac.pc
lib/pkgconfig/ndr_nbt.pc
lib/pkgconfig/ndr_standard.pc
lib/pkgconfig/netapi.pc
+lib/pkgconfig/pyldb-util.${MODPY_PYC_MAGIC_TAG}pc
lib/pkgconfig/samba-credentials.pc
lib/pkgconfig/samba-hostconfig.pc
lib/pkgconfig/samba-policy.${MODPY_PYC_MAGIC_TAG}pc
lib/pkgconfig/samba-util.pc
lib/pkgconfig/samdb.pc
lib/pkgconfig/smbclient.pc
+lib/pkgconfig/tevent.pc
lib/pkgconfig/wbclient.pc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_ldb_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_ldb_text.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}tevent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}tevent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_ldb_text.py
+@so lib/python${MODPY_VERSION}/site-packages/_tevent.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/ldb.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/samba/
lib/python${MODPY_VERSION}/site-packages/samba/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}/
@@ -191,8 +223,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}forest_update.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}getopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}getopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_cert_auto_enroll_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_cert_auto_enroll_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_chromium_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_chromium_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_ext_loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_ext_loader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_firefox_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_firefox_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_firewalld_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_firewalld_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_gnome_settings_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_gnome_settings_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gp_msgs_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -347,7 +387,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/forest_update.py
@so
lib/python${MODPY_VERSION}/site-packages/samba/gensec.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/samba/getopt.py
+lib/python${MODPY_VERSION}/site-packages/samba/gp_cert_auto_enroll_ext.py
+lib/python${MODPY_VERSION}/site-packages/samba/gp_chromium_ext.py
lib/python${MODPY_VERSION}/site-packages/samba/gp_ext_loader.py
+lib/python${MODPY_VERSION}/site-packages/samba/gp_firefox_ext.py
+lib/python${MODPY_VERSION}/site-packages/samba/gp_firewalld_ext.py
lib/python${MODPY_VERSION}/site-packages/samba/gp_gnome_settings_ext.py
lib/python${MODPY_VERSION}/site-packages/samba/gp_msgs_ext.py
lib/python${MODPY_VERSION}/site-packages/samba/gp_parse/
@@ -768,6 +812,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}smbd_fuzztest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}source_chars.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}source_chars.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}strings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}strings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}subunitrun.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1003,6 +1049,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgs_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}pac_align_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}pac_align_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}raw_testcase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}raw_testcase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1043,6 +1091,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tests.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tgs_tests.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/pac_align_tests.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/raw_testcase.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rfc4120_constants.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
@@ -1140,6 +1189,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}join.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}join_lmdb_size.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}join_lmdb_size.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}join_member.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}join_member.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}ntacl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}ntacl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}ou.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1197,6 +1248,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/help.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join_lmdb_size.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join_member.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/ntacl.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/ou.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/passwordsettings.py
@@ -1229,6 +1281,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/smbd_base.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/smbd_fuzztest.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/source.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/source_chars.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/strings.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/subunitrun.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/tdb_util.py
@@ -1253,6 +1306,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/xattr.py
@so
lib/python${MODPY_VERSION}/site-packages/samba/xattr_native.${MODPY_PYC_MAGIC_TAG}so
@so
lib/python${MODPY_VERSION}/site-packages/samba/xattr_tdb.${MODPY_PYC_MAGIC_TAG}so
+lib/python${MODPY_VERSION}/site-packages/tevent.py
+lib/samba/
lib/samba/idmap/
@so lib/samba/idmap/ad.so
@so lib/samba/idmap/autorid.so
@@ -1264,15 +1319,28 @@ lib/samba/idmap/
lib/samba/krb5/
@so lib/samba/krb5/async_dns_krb5_locator.so
@so lib/samba/krb5/winbind_krb5_locator.so
+lib/samba/ldb/
+@so lib/samba/ldb/asq.so
@so lib/samba/ldb/ildap.so
+@so lib/samba/ldb/ldap.so
+@so lib/samba/ldb/ldb.so
@so lib/samba/ldb/ldbsamba_extensions.so
+@so lib/samba/ldb/paged_searches.so
+@so lib/samba/ldb/rdn_name.so
+@so lib/samba/ldb/sample.so
+@so lib/samba/ldb/server_sort.so
+@so lib/samba/ldb/skel.so
+@so lib/samba/ldb/tdb.so
@so lib/samba/libCHARSET3-samba4.so
@so lib/samba/libLIBWBCLIENT-OLD-samba4.so
@so lib/samba/libMESSAGING-SEND-samba4.so
@so lib/samba/libMESSAGING-samba4.so
+@so lib/samba/libREG-FULL-samba4.so
+@so lib/samba/libRPC-SERVER-LOOP-samba4.so
+@so lib/samba/libRPC-WORKER-samba4.so
@so lib/samba/libaddns-samba4.so
@so lib/samba/libads-samba4.so
-@lib lib/samba/libasn1-samba4.so.${LIBasn1-samba4_VERSION}
+@so lib/samba/libasn1-samba4.so
@so lib/samba/libasn1util-samba4.so
@so lib/samba/libauth-samba4.so
@so lib/samba/libauth-unix-token-samba4.so
@@ -1289,7 +1357,7 @@ lib/samba/krb5/
@so lib/samba/libcluster-samba4.so
@so lib/samba/libcmdline-contexts-samba4.so
@so lib/samba/libcmdline-samba4.so
-@lib lib/samba/libcom_err-samba4.so.${LIBcom_err-samba4_VERSION}
+@so lib/samba/libcom-err-samba4.so
@so lib/samba/libcommon-auth-samba4.so
@so lib/samba/libdbwrap-samba4.so
@so lib/samba/libdcerpc-pkt-auth-samba4.so
@@ -1304,19 +1372,22 @@ lib/samba/krb5/
@so lib/samba/libgpext-samba4.so
@so lib/samba/libgpo-samba4.so
@so lib/samba/libgse-samba4.so
-@lib lib/samba/libgssapi-samba4.so.${LIBgssapi-samba4_VERSION}
-@lib lib/samba/libhcrypto-samba4.so.${LIBhcrypto-samba4_VERSION}
-@lib lib/samba/libhdb-samba4.so.${LIBhdb-samba4_VERSION}
-@lib lib/samba/libheimbase-samba4.so.${LIBheimbase-samba4_VERSION}
-@lib lib/samba/libheimntlm-samba4.so.${LIBheimntlm-samba4_VERSION}
+@so lib/samba/libgss-preauth-samba4.so
+@so lib/samba/libgssapi-samba4.so
+@so lib/samba/libhcrypto-samba4.so
+@so lib/samba/libhdb-samba4.so
+@so lib/samba/libheimbase-samba4.so
+@so lib/samba/libheimntlm-samba4.so
@so lib/samba/libhttp-samba4.so
-@lib lib/samba/libhx509-samba4.so.${LIBhx509-samba4_VERSION}
+@so lib/samba/libhx509-samba4.so
@so lib/samba/libidmap-samba4.so
@so lib/samba/libinterfaces-samba4.so
@so lib/samba/libiov-buf-samba4.so
-@lib lib/samba/libkdc-samba4.so.${LIBkdc-samba4_VERSION}
-@lib lib/samba/libkrb5-samba4.so.${LIBkrb5-samba4_VERSION}
+@so lib/samba/libkdc-samba4.so
+@so lib/samba/libkrb5-samba4.so
@so lib/samba/libkrb5samba-samba4.so
+@so lib/samba/libldb-cmdline-samba4.so
+@so lib/samba/libldb-key-value-samba4.so
@so lib/samba/libldb-tdb-err-map-samba4.so
@so lib/samba/libldb-tdb-int-samba4.so
@so lib/samba/libldbsamba-samba4.so
@@ -1338,7 +1409,8 @@ lib/samba/krb5/
@so lib/samba/libprinter-driver-samba4.so
@so lib/samba/libprinting-migrate-samba4.so
@so lib/samba/libregistry-samba4.so
-@lib lib/samba/libroken-samba4.so.${LIBroken-samba4_VERSION}
+@so lib/samba/libreplace-samba4.so
+@so lib/samba/libroken-samba4.so
@so lib/samba/libsamba-cluster-support-samba4.so
@so lib/samba/libsamba-debug-samba4.so
@so lib/samba/libsamba-modules-samba4.so
@@ -1367,9 +1439,9 @@ lib/samba/krb5/
@so lib/samba/libtorture-samba4.so
@so lib/samba/libtrusts-util-samba4.so
@so lib/samba/libutil-reg-samba4.so
+@so lib/samba/libutil-setid-samba4.so
@so lib/samba/libutil-tdb-samba4.so
-@so lib/samba/libwinbind-client-samba4.so
-@lib lib/samba/libwind-samba4.so.${LIBwind-samba4_VERSION}
+@so lib/samba/libwind-samba4.so
@so lib/samba/libxattr-tdb-samba4.so
lib/samba/nss_info/
@so lib/samba/nss_info/hash.so
@@ -1414,10 +1486,25 @@ lib/samba/vfs/
@so lib/samba/vfs/xattr_tdb.so
@so lib/security/pam_winbind.so
libexec/samba/
+@bin libexec/samba/rpcd_classic
+@bin libexec/samba/rpcd_epmapper
+@bin libexec/samba/rpcd_fsrvp
+@bin libexec/samba/rpcd_lsad
+@bin libexec/samba/rpcd_mdssvc
+@bin libexec/samba/rpcd_rpcecho
+@bin libexec/samba/rpcd_spoolss
+@bin libexec/samba/rpcd_winreg
@bin libexec/samba/samba-bgqd
+@bin libexec/samba/samba-dcerpcd
@bin libexec/samba/smbspool_krb5_wrapper
@man man/man1/dbwrap_tool.1
@man man/man1/gentest.1
+@man man/man1/ldbadd.1
+@man man/man1/ldbdel.1
+@man man/man1/ldbedit.1
+@man man/man1/ldbmodify.1
+@man man/man1/ldbrename.1
+@man man/man1/ldbsearch.1
@man man/man1/locktest.1
@man man/man1/log2pcap.1
@man man/man1/masktest.1
@@ -1444,8 +1531,8 @@ libexec/samba/
@man man/man1/smbtorture.1
@man man/man1/smbtree.1
@man man/man1/testparm.1
-@man man/man1/vfstest.1
@man man/man1/wbinfo.1
+@man man/man3/ldb.3
@man man/man5/lmhosts.5
@man man/man5/pam_winbind.conf.5
@man man/man5/smb.conf.5
@@ -1472,6 +1559,7 @@ libexec/samba/
@man man/man8/pam_winbind.8
@man man/man8/pdbedit.8
@man man/man8/samba-bgqd.8
+@man man/man8/samba-dcerpcd.8
@man man/man8/samba-gpupdate.8
@man man/man8/samba-regedit.8
@man man/man8/samba-tool.8
@@ -1492,6 +1580,7 @@ libexec/samba/
@man man/man8/vfs_crossrename.8
@man man/man8/vfs_default_quota.8
@man man/man8/vfs_dirsort.8
+@man man/man8/vfs_expand_msdfs.8
@man man/man8/vfs_extd_audit.8
@man man/man8/vfs_fake_perms.8
@man man/man8/vfs_fruit.8
Index: net/samba/pkg/PLIST-tevent
===================================================================
RCS file: net/samba/pkg/PLIST-tevent
diff -N net/samba/pkg/PLIST-tevent
--- net/samba/pkg/PLIST-tevent 10 Mar 2022 00:04:08 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-include/samba-4.0/
-include/samba-4.0/tevent.h
-@lib lib/libtevent.so.${LIBtevent_VERSION}
-lib/pkgconfig/tevent.pc
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}tevent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}tevent.${MODPY_PYC_MAGIC_TAG}pyc
-@so lib/python${MODPY_VERSION}/site-packages/_tevent.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/tevent.py
Index: net/samba/pkg/PLIST-util
===================================================================
RCS file: net/samba/pkg/PLIST-util
diff -N net/samba/pkg/PLIST-util
--- net/samba/pkg/PLIST-util 10 Mar 2022 00:04:08 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@lib lib/libreplace.so.${LIBreplace_VERSION}
-@lib lib/libutil-setid.so.${LIButil-setid_VERSION}
-lib/samba/
-@lib lib/samba/libreplace.so.${LIBreplace_VERSION}
-@lib lib/samba/libutil-setid.so.${LIButil-setid_VERSION}
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
