git: 29ed90005111 - main - Mk: Add Samba 4.20

The branch main has been updated by kiwi:

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

commit 29ed90005111c56cccb126f4edba998c0a90f5d6
Author:     Xavier Beaudouin <kiwi@FreeBSD.org>
AuthorDate: 2025-01-28 10:16:31 +0000
Commit:     Xavier Beaudouin <kiwi@FreeBSD.org>
CommitDate: 2025-01-30 14:42:00 +0000

    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>
---
 Mk/Uses/samba.mk           | 4 +++-
 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!