Bug 284031 - net/samba419: add support dns/bind920 for option AD_DC
Summary: net/samba419: add support dns/bind920 for option AD_DC
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-01-13 11:25 UTC by Vladimir Druzenko
Modified: 2025-01-14 08:23 UTC (History)
4 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-13 11:25:03 UTC 
Possible patch:

diff -urp net/samba419.orig/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
--- net/samba419.orig/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
+++ net/samba419/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
@@ -168,7 +168,7 @@ -bld.SAMBA_LIBRARY('dlz_bind9_10',

  # 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 @@ -                  cflags='-DBIND_VERSION_9_16',
  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 @@ -           cflags='-DBIND_VERSION_9_16',
                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 -urp net/samba419.orig/pkg-plist.ad_dc net/samba419/pkg-plist.ad_dc
--- net/samba419.orig/pkg-plist.ad_dc
+++ 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
Comment 1 Mateusz Piotrowski freebsd_committer freebsd_triage 2025-01-13 13:00:18 UTC 
LGTM

Approved by: 0mp (samba)
Comment 2 Mateusz Piotrowski freebsd_committer freebsd_triage 2025-01-13 13:01:06 UTC 
Please make sure to bump the PORTREVISION.
Comment 3 commit-hook freebsd_committer freebsd_triage 2025-01-13 14:43:27 UTC 
A commit in branch main references this bug:

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(-)
Comment 4 Michael Osipov freebsd_committer freebsd_triage 2025-01-14 08:23:02 UTC 
Thanks for completing the patch.