diff options
Diffstat (limited to 'dns')
26 files changed, 225 insertions, 95 deletions
diff --git a/dns/Makefile b/dns/Makefile index 6de9331776a7..2b58160af500 100644 --- a/dns/Makefile +++ b/dns/Makefile @@ -19,6 +19,7 @@ SUBDIR += dhisd SUBDIR += dlint SUBDIR += dns-ui + SUBDIR += dns-blackhole SUBDIR += dns2blackhole SUBDIR += dns2tcp SUBDIR += dnsblast diff --git a/dns/amass/Makefile b/dns/amass/Makefile index 216615f6f363..a91845d17209 100644 --- a/dns/amass/Makefile +++ b/dns/amass/Makefile @@ -11,6 +11,8 @@ WWW= https://owasp.org/www-project-amass/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_i386= compilation fails: cgo_specific.go:100:2: type [1073741824]*_Ctype_char larger than address space + LIB_DEPENDS= libpostal.so:misc/libpostal USES= go:1.24,modules pkgconfig diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index 973d96c5405c..7b57ff5ad7aa 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -19,15 +19,15 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libdns.so -lib/bind-tools/libdns-9.20.11.so +lib/bind-tools/libdns-9.20.12.so lib/bind-tools/libisc.so -lib/bind-tools/libisc-9.20.11.so +lib/bind-tools/libisc-9.20.12.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc-9.20.11.so +lib/bind-tools/libisccc-9.20.12.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg-9.20.11.so +lib/bind-tools/libisccfg-9.20.12.so lib/bind-tools/libns.so -lib/bind-tools/libns-9.20.11.so +lib/bind-tools/libns-9.20.12.so share/man/man1/arpaname.1.gz share/man/man1/delv.1.gz share/man/man1/dig.1.gz diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 1362469e19c8..5d111aa132b6 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -14,22 +14,23 @@ bin/dnssec-verify %%DNSTAP%%bin/dnstap-read bin/host bin/mdig +bin/named-rrchecker bin/nsec3hash bin/nslookup bin/nsupdate -lib/bind-tools/libdns.so.9.21.10 +lib/bind-tools/libdns.so.9.21.11 lib/bind-tools/libdns.so.9.21 lib/bind-tools/libdns.so -lib/bind-tools/libisc.so.9.21.10 +lib/bind-tools/libisc.so.9.21.11 lib/bind-tools/libisc.so.9.21 lib/bind-tools/libisc.so -lib/bind-tools/libisccc.so.9.21.10 +lib/bind-tools/libisccc.so.9.21.11 lib/bind-tools/libisccc.so.9.21 lib/bind-tools/libisccc.so -lib/bind-tools/libisccfg.so.9.21.10 +lib/bind-tools/libisccfg.so.9.21.11 lib/bind-tools/libisccfg.so.9.21 lib/bind-tools/libisccfg.so -lib/bind-tools/libns.so.9.21.10 +lib/bind-tools/libns.so.9.21.11 lib/bind-tools/libns.so.9.21 lib/bind-tools/libns.so share/man/man1/arpaname.1.gz @@ -52,7 +53,8 @@ share/man/man1/mdig.1.gz @comment share/man/man1/named-checkzone.1.gz @comment share/man/man1/named-compilezone.1.gz @comment share/man/man1/named-journalprint.1.gz -@comment share/man/man1/named-rrchecker.1.gz +@comment share/man/man1/named-makejournal.1.gz +share/man/man1/named-rrchecker.1.gz share/man/man1/nsec3hash.1.gz share/man/man1/nslookup.1.gz share/man/man1/nsupdate.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 5f2ffdbc3007..cded8d4f852e 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.21.10 +DISTVERSION= 9.21.11 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index f7c1f8770c43..2da0ae351602 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752909925 -SHA256 (bind-9.21.10.tar.xz) = bb1ea8d74d9b4f597f6d4622e8238f6f76a2e101fe17a5f2c64fc18f530da113 -SIZE (bind-9.21.10.tar.xz) = 5197276 +TIMESTAMP = 1756270638 +SHA256 (bind-9.21.11.tar.xz) = b2262ed7d691767e59cdf53e9f6e914fe116ff180295a2fe43a36d77143efcee +SIZE (bind-9.21.11.tar.xz) = 5217656 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index a8654eeaa0a9..d07b689fc121 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-07-04 09:34:56 UTC +--- bin/named/config.c.orig 2025-08-13 17:10:38 UTC +++ bin/named/config.c @@ -187,6 +187,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2025-07-04 09:34:56 UTC +--- bin/named/server.c.orig 2025-08-13 17:10:38 UTC +++ bin/named/server.c -@@ -4236,6 +4236,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4233,6 +4233,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- doc/arm/reference.rst.orig 2025-07-04 09:34:56 UTC +--- doc/arm/reference.rst.orig 2025-08-13 17:10:38 UTC +++ doc/arm/reference.rst @@ -4187,6 +4187,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a @@ -37,7 +37,7 @@ Add the override-cache-ttl feature. .. namedconf:statement:: max-cache-ttl :tags: server :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. ---- doc/misc/options.orig 2025-07-04 09:34:56 UTC +--- doc/misc/options.orig 2025-08-13 17:10:38 UTC +++ doc/misc/options @@ -171,6 +171,7 @@ options { masterfile-style ( full | relative ); @@ -47,7 +47,7 @@ Add the override-cache-ttl feature. max-cache-ttl <duration>; max-clients-per-query <integer>; max-ixfr-ratio ( unlimited | <percentage> ); ---- lib/dns/include/dns/view.h.orig 2025-07-04 09:34:56 UTC +--- lib/dns/include/dns/view.h.orig 2025-08-13 17:10:38 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,7 @@ struct dns_view { bool requestzoneversion; @@ -57,22 +57,22 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2025-07-04 09:34:56 UTC +--- lib/dns/resolver.c.orig 2025-08-13 17:10:38 UTC +++ lib/dns/resolver.c -@@ -5918,6 +5918,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes - } - - /* -+ * Enforce the configure cache TTL override. -+ */ -+ if (res->view->overridecachettl) -+ rdataset->ttl = res->view->overridecachettl; +@@ -5766,6 +5766,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, + fixttls(dns_view_t *view, dns_rdataset_t *rdataset, + dns_rdataset_t *sigrdataset) { + /* ++ * Enforce the configured cache TTL override. ++ */ ++ if (view->overridecachettl) ++ rdataset->ttl = view->overridecachettl; + -+ /* - * Enforce the configure maximum cache TTL. - */ - if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2025-07-04 09:34:56 UTC ++ /* + * Enforce the configured maximum and minimum cache TTL. + */ + if (rdataset->ttl > view->maxcachettl) { +--- lib/isccfg/namedconf.c.orig 2025-08-13 17:10:38 UTC +++ lib/isccfg/namedconf.c @@ -2084,6 +2084,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h index 54a05c73c851..1aa15addc16f 100644 --- a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h +++ b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h @@ -1,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2025-04-09 14:26:29 UTC +--- bin/named/include/named/globals.h.orig 2025-08-13 17:10:38 UTC +++ bin/named/include/named/globals.h -@@ -117,7 +117,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L +@@ -113,7 +113,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L #if NAMED_RUN_PID_DIR EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build index ff19913b1a32..d0e04c456b02 100644 --- a/dns/bind9-devel/files/patch-meson.build +++ b/dns/bind9-devel/files/patch-meson.build @@ -1,4 +1,6 @@ ---- meson.build.orig 2025-07-04 09:34:56 UTC +Use bind-tools option to ease the server/tools package split + +--- meson.build.orig 2025-08-13 17:10:38 UTC +++ meson.build @@ -69,6 +69,8 @@ zlib_opt = get_option('zlib') tracing_opt = get_option('tracing') @@ -9,7 +11,7 @@ if meson.version().version_compare('>=1.1.0') build_options = meson.build_options() if build_options == '' -@@ -956,9 +958,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false) +@@ -976,9 +978,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false) isc_srcconf = isc_srcset.apply(config, strict: false) @@ -25,7 +27,7 @@ objects: isc_probe_objects, install: true, install_rpath: libdir, -@@ -986,6 +994,8 @@ libdns = library( +@@ -1006,6 +1014,8 @@ libdns = library( libdns = library( 'dns', dns_srcconf.sources(), @@ -34,7 +36,7 @@ include_directories: dns_inc, install: true, install_rpath: libdir, -@@ -1020,6 +1030,8 @@ libns = library( +@@ -1040,6 +1050,8 @@ libns = library( libns = library( 'ns', ns_srcconf.sources(), @@ -43,7 +45,7 @@ objects: ns_probe_objects, install: true, install_rpath: libdir, -@@ -1046,6 +1058,8 @@ libisccc = library( +@@ -1066,6 +1078,8 @@ libisccc = library( libisccc = library( 'isccc', isccc_srcconf.sources(), @@ -52,7 +54,7 @@ implicit_include_directories: false, include_directories: isccc_inc, install: true, -@@ -1067,6 +1081,8 @@ libisccfg = library( +@@ -1087,6 +1101,8 @@ libisccfg = library( libisccfg = library( 'isccfg', isccfg_srcconf.sources(), @@ -61,7 +63,7 @@ implicit_include_directories: false, include_directories: isccfg_inc, install: true, -@@ -1087,6 +1103,7 @@ named_srcconf = named_srcset.apply(config, strict: fal +@@ -1107,6 +1123,7 @@ named_srcconf = named_srcset.apply(config, strict: fal named_srcconf = named_srcset.apply(config, strict: false) @@ -69,7 +71,7 @@ executable( 'arpaname', arpaname_src, -@@ -1315,7 +1332,9 @@ executable( +@@ -1335,7 +1352,9 @@ executable( libisc_dep, ], ) @@ -79,7 +81,27 @@ executable( 'named-checkconf', named_checkconf_src, -@@ -1438,7 +1457,9 @@ executable( +@@ -1413,7 +1432,9 @@ endif + ], + ) + endif ++endif + ++if bind_tools + executable( + 'named-rrchecker', + named_rrchecker_src, +@@ -1427,7 +1448,9 @@ executable( + ], + + ) ++endif + ++if not bind_tools + executable( + 'named', + named_srcconf.sources(), +@@ -1458,7 +1481,9 @@ executable( named_srcconf.dependencies(), ], ) @@ -89,7 +111,7 @@ executable( 'nsec3hash', nsec3hash_src, -@@ -1486,7 +1507,9 @@ executable( +@@ -1506,7 +1531,9 @@ executable( edit_dep, ], ) @@ -99,7 +121,7 @@ executable( 'rndc-confgen', rndc_confgen_src, -@@ -1572,6 +1595,7 @@ shared_library( +@@ -1592,6 +1619,7 @@ shared_library( libns_dep, ], ) @@ -107,19 +129,19 @@ subdir('doc') subdir('tests') -@@ -1632,7 +1656,6 @@ alias_target('doc-misc', doc_misc_targets) - - alias_target('doc-misc', doc_misc_targets) +@@ -1659,7 +1687,6 @@ print(release_date, end="") + print(release_date, end="") + ''' -if doc_opt.allowed() - man_srcconf = man_srcset.apply(config, strict: false) - foreach man : man_srcconf.sources() - man_pages += configure_file( -@@ -1647,6 +1670,7 @@ if doc_opt.allowed() + release_date = '' + if python.found() + release_date = run_command(python, ['-c', get_release_date], check: true).stdout() +@@ -1680,6 +1707,7 @@ if doc_opt.allowed() install_man(man_pages) +if doc_opt.allowed() if sphinx_build.found() - meson.add_dist_script( - 'util' / 'meson-dist-package.sh', + alias_target('doc-misc', doc_misc_targets) + diff --git a/dns/bind9-devel/files/patch-meson__options.txt b/dns/bind9-devel/files/patch-meson__options.txt index de50de448714..954a01fff5ad 100644 --- a/dns/bind9-devel/files/patch-meson__options.txt +++ b/dns/bind9-devel/files/patch-meson__options.txt @@ -1,3 +1,5 @@ +Add bind-tools option to ease the server/tools package split + --- meson_options.txt.orig 2025-07-19 11:32:37 UTC +++ meson_options.txt @@ -188,3 +188,5 @@ option( diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 0231f563dd78..236e8d0a7722 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -4,7 +4,6 @@ bin/named-compilezone bin/named-journalprint bin/named-makejournal %%LMDB%%bin/named-nzd2nzf -bin/named-rrchecker @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample @sample %%ETCDIR%%/named.conf.sample @@ -35,6 +34,7 @@ include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h +include/dns/dsync.h include/dns/dyndb.h include/dns/ecs.h include/dns/ede.h @@ -234,19 +234,19 @@ include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns.so.9.21.10 +lib/libdns.so.9.21.11 lib/libdns.so.9.21 lib/libdns.so -lib/libisc.so.9.21.10 +lib/libisc.so.9.21.11 lib/libisc.so.9.21 lib/libisc.so -lib/libisccc.so.9.21.10 +lib/libisccc.so.9.21.11 lib/libisccc.so.9.21 lib/libisccc.so -lib/libisccfg.so.9.21.10 +lib/libisccfg.so.9.21.11 lib/libisccfg.so.9.21 lib/libisccfg.so -lib/libns.so.9.21.10 +lib/libns.so.9.21.11 lib/libns.so.9.21 lib/libns.so @comment share/man/man1/arpaname.1.gz @@ -269,6 +269,7 @@ share/man/man1/named-checkconf.1.gz share/man/man1/named-checkzone.1.gz share/man/man1/named-compilezone.1.gz share/man/man1/named-journalprint.1.gz +share/man/man1/named-makejournal.1.gz %%LMDB%%share/man/man1/named-nzd2nzf.1.gz @comment share/man/man1/named-rrchecker.1.gz @comment share/man/man1/nsec3hash.1.gz diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index cc2f895c4b52..2169bdf8cbcc 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.18.38 +DISTVERSION= 9.18.39 PORTREVISION= 0 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index 99584ea6783a..6689b48c1bd4 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752729485 -SHA256 (bind-9.18.38.tar.xz) = b11fce934773ec25dd6d7253caeaf9c5bbf073fd327acc29daffeca3987e31a1 -SIZE (bind-9.18.38.tar.xz) = 5362772 +TIMESTAMP = 1756270405 +SHA256 (bind-9.18.39.tar.xz) = 725755232186f3be4a07d7e40978a3389434bef7c0cdc262cc641a364072976d +SIZE (bind-9.18.39.tar.xz) = 5383056 diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist index d5899878e4fc..89d1d17abdb0 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -37,6 +37,7 @@ include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h +include/dns/dsync.h include/dns/dyndb.h include/dns/ecs.h include/dns/edns.h @@ -240,19 +241,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.38.so +lib/libbind9-9.18.39.so lib/libdns.so -lib/libdns-9.18.38.so +lib/libdns-9.18.39.so lib/libirs.so -lib/libirs-9.18.38.so +lib/libirs-9.18.39.so lib/libisc.so -lib/libisc-9.18.38.so +lib/libisc-9.18.39.so lib/libisccc.so -lib/libisccc-9.18.38.so +lib/libisccc-9.18.39.so lib/libisccfg.so -lib/libisccfg-9.18.38.so +lib/libisccfg-9.18.39.so lib/libns.so -lib/libns-9.18.38.so +lib/libns-9.18.39.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz @comment share/man/man1/dig.1.gz diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile index b60943aa0254..d3ff68396546 100644 --- a/dns/bind920/Makefile +++ b/dns/bind920/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.20.11 +DISTVERSION= 9.20.12 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 diff --git a/dns/bind920/distinfo b/dns/bind920/distinfo index 03c6a999f4c3..ec97ab3ce744 100644 --- a/dns/bind920/distinfo +++ b/dns/bind920/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752729536 -SHA256 (bind-9.20.11.tar.xz) = 4da2d532e668bc21e883f6e6d9d3d81794d9ec60b181530385649a56f46ee17a -SIZE (bind-9.20.11.tar.xz) = 5674856 +TIMESTAMP = 1756270416 +SHA256 (bind-9.20.12.tar.xz) = dd32d6eb67504e8a430aaf70b4ef894f3d0226b44c7e02370c9b0d377f1c7999 +SIZE (bind-9.20.12.tar.xz) = 5700944 diff --git a/dns/bind920/files/extrapatch-bind-min-override-ttl b/dns/bind920/files/extrapatch-bind-min-override-ttl index 6727512a8c68..085a03ec7098 100644 --- a/dns/bind920/files/extrapatch-bind-min-override-ttl +++ b/dns/bind920/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-07-04 09:42:08 UTC +--- bin/named/config.c.orig 2025-08-13 17:20:02 UTC +++ bin/named/config.c @@ -186,6 +186,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2025-07-04 09:42:08 UTC +--- bin/named/server.c.orig 2025-08-13 17:20:02 UTC +++ bin/named/server.c -@@ -4639,6 +4639,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4640,6 +4640,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- doc/arm/reference.rst.orig 2025-07-04 09:42:08 UTC +--- doc/arm/reference.rst.orig 2025-08-13 17:20:02 UTC +++ doc/arm/reference.rst @@ -4397,6 +4397,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a @@ -37,7 +37,7 @@ Add the override-cache-ttl feature. .. namedconf:statement:: max-cache-ttl :tags: server :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. ---- lib/dns/include/dns/view.h.orig 2025-07-04 09:42:08 UTC +--- lib/dns/include/dns/view.h.orig 2025-08-13 17:20:02 UTC +++ lib/dns/include/dns/view.h @@ -151,6 +151,7 @@ struct dns_view { bool requestnsid; @@ -47,9 +47,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2025-07-04 09:42:08 UTC +--- lib/dns/resolver.c.orig 2025-08-13 17:20:02 UTC +++ lib/dns/resolver.c -@@ -5967,6 +5967,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -5985,6 +5985,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -62,7 +62,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2025-07-04 09:42:08 UTC +--- lib/isccfg/namedconf.c.orig 2025-08-13 17:20:02 UTC +++ lib/isccfg/namedconf.c @@ -2220,6 +2220,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind920/pkg-plist b/dns/bind920/pkg-plist index 7ea15c9ea909..35f6975b47f9 100644 --- a/dns/bind920/pkg-plist +++ b/dns/bind920/pkg-plist @@ -34,6 +34,7 @@ include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h +include/dns/dsync.h include/dns/dyndb.h include/dns/ecs.h include/dns/ede.h @@ -242,15 +243,15 @@ include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns-9.20.11.so +lib/libdns-9.20.12.so lib/libdns.so -lib/libisc-9.20.11.so +lib/libisc-9.20.12.so lib/libisc.so -lib/libisccc-9.20.11.so +lib/libisccc-9.20.12.so lib/libisccc.so -lib/libisccfg-9.20.11.so +lib/libisccfg-9.20.12.so lib/libisccfg.so -lib/libns-9.20.11.so +lib/libns-9.20.12.so lib/libns.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz diff --git a/dns/dns-blackhole/Makefile b/dns/dns-blackhole/Makefile new file mode 100644 index 000000000000..e901d308b556 --- /dev/null +++ b/dns/dns-blackhole/Makefile @@ -0,0 +1,41 @@ +PORTNAME= dns-blackhole +PORTVERSION= 0.1.0 +CATEGORIES= dns + +MAINTAINER= dvl@FreeBSD.org +COMMENT= Send ads and trackers to a dead-end +WWW= https://github.com/morganwdavis/dns-blackhole + +USE_GITHUB= yes +GH_ACCOUNT= morganwdavis + +NO_BUILD= yes + +BINFILES= dns-blackhole.sh +CONFFILES= dns-blackhole.conf +DBFILES= allowed_hosts blocked_hosts + +PERIODIC= ${PREFIX}/etc/periodic/daily + +SUB_FILES= 901.dns-blackhole +PLIST_SUB= PERIODIC=${PERIODIC} + +do-install: + ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PERIODIC} + +.for f in ${BINFILES} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin +.endfor + +.for f in ${CONFFILES} + ${REINPLACE_CMD} -e "s:%%PORTNAME%%:${PORTNAME}:g" ${WRKSRC}/${f}.dist + ${INSTALL_DATA} ${WRKSRC}/${f}.dist ${STAGEDIR}${ETCDIR}/${f}.sample +.endfor + +.for f in ${DBFILES} + ${INSTALL_DATA} ${WRKSRC}/${f}.dist ${STAGEDIR}${ETCDIR}/${f}.sample +.endfor + + ${INSTALL_SCRIPT} ${WRKDIR}/901.dns-blackhole ${STAGEDIR}${PERIODIC}/ + +.include <bsd.port.mk> diff --git a/dns/dns-blackhole/distinfo b/dns/dns-blackhole/distinfo new file mode 100644 index 000000000000..b6143ef68deb --- /dev/null +++ b/dns/dns-blackhole/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1756390823 +SHA256 (morganwdavis-dns-blackhole-0.1.0_GH0.tar.gz) = 814ea228695c7054f042b598cb0bec0b893794213c07534e6fb5517f017e541a +SIZE (morganwdavis-dns-blackhole-0.1.0_GH0.tar.gz) = 5888 diff --git a/dns/dns-blackhole/files/901.dns-blackhole.in b/dns/dns-blackhole/files/901.dns-blackhole.in new file mode 100755 index 000000000000..4090a5b6d6ea --- /dev/null +++ b/dns/dns-blackhole/files/901.dns-blackhole.in @@ -0,0 +1,22 @@ +#!/bin/sh - +# +# $FreeBSD$ +# + +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$dns_blackhole_enable" in + [Yy][Ee][Ss]) + + echo + %%PREFIX%%/bin/dns-blackhole.sh -c /usr/local/etc/dns-blackhole/dns-blackhole.conf update + ;; + *) + rc=0 + ;; +esac + +exit $rc diff --git a/dns/dns-blackhole/files/patch-dns-blackhole.conf.dist b/dns/dns-blackhole/files/patch-dns-blackhole.conf.dist new file mode 100644 index 000000000000..d9569a98163e --- /dev/null +++ b/dns/dns-blackhole/files/patch-dns-blackhole.conf.dist @@ -0,0 +1,20 @@ +--- dns-blackhole.conf.dist.orig 2025-08-18 11:53:06 UTC ++++ dns-blackhole.conf.dist +@@ -3,7 +3,7 @@ + # + + # Directory in which config and custom host files reside +-dns_blackhole_dir="/usr/local/etc/dns-blackhole" ++dns_blackhole_dir="/var/db/%%PORTNAME%%" + + # Path to your BIND namedb directory where included files go + named_includes_dir="/usr/local/etc/namedb" +@@ -12,7 +12,7 @@ named_zone_files_dir="/usr/local/etc/namedb" + named_zone_files_dir="/usr/local/etc/namedb" + + # Temporary directory in which to fetch and build zone files +-tmp_dir="/var/tmp/dns-blackhole" ++tmp_dir="/var/tmp/%%PORTNAME%%" + + # The fully qualified hostname of your nameserver + dns_server_hostname="localhost" diff --git a/dns/dns-blackhole/pkg-descr b/dns/dns-blackhole/pkg-descr new file mode 100644 index 000000000000..3e6e517ad26d --- /dev/null +++ b/dns/dns-blackhole/pkg-descr @@ -0,0 +1,7 @@ +If you're running your own home network with a Unix-based server, you can +easily integrate a DNS blackhole into a local BIND DNS service -- and best +of all, it's completely free. If you're already using BIND and know your +way around it, you can use this script to manage BIND's Response Policy +Zone (RPZ) feature. RPZ is designed for DNS firewall/blocking purposes. +The script should run on *BSD and Linux distros with proper pathnames +configured. Out of the box, it has a FreeBSD default configuration. diff --git a/dns/dns-blackhole/pkg-plist b/dns/dns-blackhole/pkg-plist new file mode 100644 index 000000000000..987d4a410b10 --- /dev/null +++ b/dns/dns-blackhole/pkg-plist @@ -0,0 +1,5 @@ +bin/dns-blackhole.sh +etc/periodic/daily/901.dns-blackhole +@sample %%ETCDIR%%/allowed_hosts.sample +@sample %%ETCDIR%%/blocked_hosts.sample +@sample %%ETCDIR%%/dns-blackhole.conf.sample diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index da8ed70cb4f5..8a3112f73c04 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsmasq -DISTVERSION= 2.92test19 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.92test21 # remember to bump PORTEPOCH when going from test to rc! # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: PORTREVISION= 0 PORTEPOCH= 6 diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index a220cf3df26d..184f1941bd97 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754979310 -SHA256 (dnsmasq-2.92test19.tar.xz) = cb2ba3d8594a01896349959c3341fad253f0434efe51df3aa0cd8a0ca385f823 -SIZE (dnsmasq-2.92test19.tar.xz) = 584612 +TIMESTAMP = 1756306668 +SHA256 (dnsmasq-2.92test21.tar.xz) = bb755e2cc891e05446b2a16b6f2f66ecd1c3e43e6bc0861ef3b60e088848c419 +SIZE (dnsmasq-2.92test21.tar.xz) = 585408 |