diff options
| author | Xavier Beaudouin <kiwi@FreeBSD.org> | 2025-01-28 10:16:31 +0000 |
|---|---|---|
| committer | Xavier Beaudouin <kiwi@FreeBSD.org> | 2025-01-30 14:42:00 +0000 |
| commit | 29ed90005111c56cccb126f4edba998c0a90f5d6 (patch) | |
| tree | b8e21816146ee122edf3c6f896c5df1cfae029d1 | |
| parent | 17ce87864be8150900baa87af7d175c53a906ed9 (diff) | |
Mk: Add Samba 4.20
Add Samba 4.20 to Uses/samba.mk and bsd.default-versions.mk.
PR: 280533
Approved by: samba (0mp, kiwi)
Sponsored by: Klara, Inc.
Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org>
| -rw-r--r-- | Mk/Uses/samba.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index 27d0ec1595da..9db89f7ed386 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -18,7 +18,7 @@ samba_ARGS= build run IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} . endif -. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 +. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} . endif @@ -28,6 +28,8 @@ SAMBA_PORT_416= net/samba416 SAMBA_LDB_PORT_416= databases/ldb25 SAMBA_PORT_419= net/samba419 SAMBA_LDB_PORT_419= databases/ldb28 +SAMBA_PORT_420= net/samba420 +SAMBA_LDB_PORT_420= databases/ldb29 SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}} SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 89b3f32cbb87..fea20e4280e4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -144,7 +144,7 @@ PYTHON2_DEFAULT?= 2.7 RUBY_DEFAULT?= 3.2 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust -# Possible values: 4.16, 4.19 +# Possible values: 4.16, 4.19, 4.20 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! |