git: f99471cff0c3 - main - net/samba416: Security update for Samba 4.16

The branch main has been updated by timur:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f99471cff0c3564f692b0c6e098d62fe8b671406

commit f99471cff0c3564f692b0c6e098d62fe8b671406
Author:     Timur I. Bakeyev <timur@FreeBSD.org>
AuthorDate: 2022-11-16 23:33:42 +0000
Commit:     Timur I. Bakeyev <timur@FreeBSD.org>
CommitDate: 2022-11-17 14:12:02 +0000

    net/samba416: Security update for Samba 4.16
    
    Security:       CVE-2022-42898
---
 net/samba416/Makefile              | 3 ++-
 net/samba416/distinfo              | 6 +++---
 net/samba416/files/samba_server.in | 2 +-
 net/samba416/pkg-plist             | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net/samba416/Makefile b/net/samba416/Makefile
index a703bb964783..a65c319d59fd 100644
--- a/net/samba416/Makefile
+++ b/net/samba416/Makefile
@@ -50,7 +50,7 @@ EXTRA_PATCHES=			\
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.16.6
+SAMBA4_VERSION=			4.16.7
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -647,6 +647,7 @@ post-install-rm-junk:
 				${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party
 				${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name __pycache__ \
 					-type d -print0 | ${XARGS} -0 -n 1 -t ${RM} -r
+				${FIND} ${STAGEDIR} -type f -empty -delete
 
 post-install-fix-manpages:
 .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8
diff --git a/net/samba416/distinfo b/net/samba416/distinfo
index 71165350eb14..861116a873b6 100644
--- a/net/samba416/distinfo
+++ b/net/samba416/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666709216
-SHA256 (samba-4.16.6.tar.gz) = 5e4e704243ea247843b97fed624f21155432e0a8fad41793e40b5ebb576bde55
-SIZE (samba-4.16.6.tar.gz) = 30619049
+TIMESTAMP = 1668648463
+SHA256 (samba-4.16.7.tar.gz) = 02d38d5f9edcc776be3a7d60ad470b43980af2ba13c244fb78a57a41792734a6
+SIZE (samba-4.16.7.tar.gz) = 30622700
diff --git a/net/samba416/files/samba_server.in b/net/samba416/files/samba_server.in
index 913e1ed4f547..b45811dd9f4d 100644
--- a/net/samba416/files/samba_server.in
+++ b/net/samba416/files/samba_server.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: samba_server
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv ntpd avahi_daemon
+# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv ntpd %%SAMBA4_SERVICES%%
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
diff --git a/net/samba416/pkg-plist b/net/samba416/pkg-plist
index b4c8d9238d33..da06524eff14 100644
--- a/net/samba416/pkg-plist
+++ b/net/samba416/pkg-plist
@@ -414,7 +414,6 @@ man/man8/winbindd.8.gz
 @comment Use bundled libraries
 %%SAMBA4_BUNDLED_CMOCKA%%%%SAMBA4_LIBDIR%%/private/libcmocka-samba4.so
 %%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
-%%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libldb-samba4.so
 %%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_EXT_SUFFIX%%.so
 %%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpyldb-util%%PYTHON_EXT_SUFFIX%%-samba4.so
 %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump
@@ -426,6 +425,7 @@ man/man8/winbindd.8.gz
 %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
 %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-cmdline-samba4.so
 %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-key-value-samba4.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-samba4.so
 %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-tdb-err-map-samba4.so
 %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-tdb-int-samba4.so
 %%AD_DC%%%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so