Page MenuHomeFreeBSD
Files F162054374

D52169.diff
No OneTemporary
Actions

D52169.diff
View Options

diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -18,7 +18,7 @@
IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
. endif
-. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20
+. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 && ${SAMBA_DEFAULT} != 4.22
IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}
. endif
@@ -39,11 +39,21 @@
SAMBA_TALLOC_PORT_420= devel/talloc242
SAMBA_TDB_PORT_420= databases/tdb1410
SAMBA_TEVENT_PORT_420= devel/tevent016
+SAMBA_PORT_422= net/samba422
+SAMBA_TALLOC_PORT_422= devel/talloc243
+SAMBA_TDB_PORT_422= databases/tdb1413
+SAMBA_TEVENT_PORT_422= devel/tevent017
SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}}
SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4
SAMBA_LIBDIR= ${LOCALBASE}/lib/samba4
+# Only define SAMBA_LDB_PORT if SAMBA_LDB_PORT_${SAMBA_SUFFIX} is set. Samba
+# requires ldb to be bundled since version 4.22, so it makes no sense to set
+# SAMBA_LDB_PORT in that case. By not setting SAMBA_LDB_PORT, we allow ports to
+# detect the lack of a separate ldb port more easily.
+. if !empty(SAMBA_LDB_PORT_${SAMBA_SUFFIX})
SAMBA_LDB_PORT= ${SAMBA_LDB_PORT_${SAMBA_SUFFIX}}
+. endif
SAMBA_TALLOC_PORT= ${SAMBA_TALLOC_PORT_${SAMBA_SUFFIX}}
SAMBA_TDB_PORT= ${SAMBA_TDB_PORT_${SAMBA_SUFFIX}}
SAMBA_TEVENT_PORT= ${SAMBA_TEVENT_PORT_${SAMBA_SUFFIX}}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -148,7 +148,7 @@
RUBY_DEFAULT?= 3.3
# Possible values: rust, rust-nightly
RUST_DEFAULT?= rust
-# Possible values: 4.16, 4.19, 4.20
+# Possible values: 4.16, 4.19, 4.20, 4.22
SAMBA_DEFAULT?= 4.16
# When updating this, please also update the same list in ssl.mk and the checks
# for USES=ssl in qa.sh!

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 10, 7:24 AM (18 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34919939
Default Alt Text
D52169.diff (1 KB)

Event Timeline