git: 81b7938f65b8 - main - net/samba419: add support of dns/bind920 for option AD_DC

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 13 Jan 2025 14:42:34 UTC
The branch main has been updated by vvd:

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

commit 81b7938f65b826883eee754773fd64a283279981
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-01-13 14:37:15 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-01-13 14:41:55 +0000

    net/samba419: add support of dns/bind920 for option AD_DC
    
    PR:             284031
    Approved by:    0mp (samba)
---
 net/samba419/Makefile                                               | 2 +-
 .../0001-Compact-and-simplify-modules-build-and-config-genera.patch | 6 +++---
 net/samba419/pkg-plist.ad_dc                                        | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/samba419/Makefile b/net/samba419/Makefile
index 7849996e83c0..92cc5bb78f0c 100644
--- a/net/samba419/Makefile
+++ b/net/samba419/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=			${SAMBA4_BASENAME}419
 PORTVERSION=			${SAMBA4_VERSION}
-PORTREVISION=			4
+PORTREVISION=			5
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
diff --git a/net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch b/net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
index b4bc56519f7e..d34395bf6f22 100644
--- a/net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
+++ b/net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
@@ -168,7 +168,7 @@ index ab0a241b937..3743753504c 100644
  
  # a bind9 dlz module giving access to the Samba DNS SAM
 -bld.SAMBA_LIBRARY('dlz_bind9_10',
-+for bind_version in (910, 911, 912, 914, 916, 918):
++for bind_version in (910, 911, 912, 914, 916, 918, 920):
 +    string_version='%d_%d' % (bind_version // 100, bind_version % 100)
 +    bld.SAMBA_LIBRARY('dlz_bind%s' % (string_version),
                    source='dlz_bind9.c',
@@ -236,7 +236,7 @@ index ab0a241b937..3743753504c 100644
  bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
                    source='dlz_bind9.c',
 -                  cflags='-DBIND_VERSION_9_16',
-+                  cflags='-DBIND_VERSION=918',
++                  cflags='-DBIND_VERSION=920',
                    private_library=True,
                    deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                    enabled=bld.AD_DC_BUILD_IS_ENABLED())
@@ -283,7 +283,7 @@ index 0b40e03e370..bf7415ff88a 100644
  		subsystem='smbtorture',
  		init_function='torture_bind_dns_init',
 -		cflags='-DBIND_VERSION_9_16',
-+		cflags='-DBIND_VERSION=918',
++		cflags='-DBIND_VERSION=920',
  		deps='torture talloc torturemain dlz_bind9_for_torture',
  		internal_module=True
  		)
diff --git a/net/samba419/pkg-plist.ad_dc b/net/samba419/pkg-plist.ad_dc
index a2b8b7ebd594..c70c88b4089a 100644
--- a/net/samba419/pkg-plist.ad_dc
+++ b/net/samba419/pkg-plist.ad_dc
@@ -24,6 +24,7 @@ include/samba4/dcerpc_server.h
 %%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so
 %%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so
 %%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_18.so
+%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_20.so
 %%SAMBA4_MODULEDIR%%/gensec/krb5.so
 %%SAMBA4_MODULEDIR%%/ldb/acl.so
 %%SAMBA4_MODULEDIR%%/ldb/aclread.so