diff options
Diffstat (limited to 'dns/bind9-devel/files')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 48 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-bin_named_include_named_globals.h | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson.build | 127 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson__options.txt | 13 |
4 files changed, 92 insertions, 100 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index a8654eeaa0a9..1ef483b64a5c 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-07-04 09:34:56 UTC +--- bin/named/config.c.orig 2025-10-18 09:48:52 UTC +++ bin/named/config.c -@@ -187,6 +187,7 @@ options {\n\ +@@ -186,6 +186,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\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-10-18 09:48:52 UTC +++ bin/named/server.c -@@ -4236,6 +4236,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4276,6 +4276,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,9 +24,9 @@ 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-10-18 09:48:52 UTC +++ doc/arm/reference.rst -@@ -4187,6 +4187,10 @@ Tuning +@@ -4175,6 +4175,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a greater value. @@ -37,9 +37,9 @@ 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-10-18 09:48:52 UTC +++ doc/misc/options -@@ -171,6 +171,7 @@ options { +@@ -172,6 +172,7 @@ options { masterfile-style ( full | relative ); match-mapped-addresses <boolean>; max-cache-size ( default | unlimited | <sizeval> | <percentage> ); @@ -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-10-18 09:48:52 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,7 @@ struct dns_view { bool requestzoneversion; @@ -57,24 +57,24 @@ 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-10-18 09:48:52 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; +@@ -5839,6 +5839,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-10-18 09:48:52 UTC +++ lib/isccfg/namedconf.c -@@ -2084,6 +2084,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2086,6 +2086,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, 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..a1c99ff29218 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-10-18 09:48:52 UTC +++ bin/named/include/named/globals.h -@@ -117,7 +117,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L +@@ -112,7 +112,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..93ec124f974a 100644 --- a/dns/bind9-devel/files/patch-meson.build +++ b/dns/bind9-devel/files/patch-meson.build @@ -1,6 +1,8 @@ ---- 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-10-18 09:48:52 UTC +++ meson.build -@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib') +@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib') tracing_opt = get_option('tracing') zlib_opt = get_option('zlib') @@ -9,67 +11,24 @@ 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) +@@ -408,7 +410,7 @@ if fuzz_opt.enabled() - isc_srcconf = isc_srcset.apply(config, strict: false) - -+project_version = meson.project_version() -+soversion_parts = project_version.split('.') # ['1', '2', '3'] -+soversion = '@0@.@1@'.format(soversion_parts[0], soversion_parts[1]) -+ - libisc = library( - 'isc', - isc_srcconf.sources(), -+ version: project_version, -+ soversion: soversion, - objects: isc_probe_objects, - install: true, - install_rpath: libdir, -@@ -986,6 +994,8 @@ libdns = library( - libdns = library( - 'dns', - dns_srcconf.sources(), -+ version: project_version, -+ soversion: soversion, - include_directories: dns_inc, - install: true, - install_rpath: libdir, -@@ -1020,6 +1030,8 @@ libns = library( - libns = library( - 'ns', - ns_srcconf.sources(), -+ version: project_version, -+ soversion: soversion, - objects: ns_probe_objects, - install: true, - install_rpath: libdir, -@@ -1046,6 +1058,8 @@ libisccc = library( - libisccc = library( - 'isccc', - isccc_srcconf.sources(), -+ version: project_version, -+ soversion: soversion, - implicit_include_directories: false, - include_directories: isccc_inc, - install: true, -@@ -1067,6 +1081,8 @@ libisccfg = library( - libisccfg = library( - 'isccfg', - isccfg_srcconf.sources(), -+ version: project_version, -+ soversion: soversion, - implicit_include_directories: false, + fuzz_link_args = [] + if fuzz_opt.enabled() +- if fuzz_backed_opt != 'none' ++ if fuzz_backend_opt != 'none' + if get_option('b_lundef') != false + warning('fuzzing will fail to build properly without -Db_lundef=false') + endif +@@ -1222,6 +1224,7 @@ libisccfg_dep = declare_dependency( include_directories: isccfg_inc, - install: true, -@@ -1087,6 +1103,7 @@ named_srcconf = named_srcset.apply(config, strict: fal - - named_srcconf = named_srcset.apply(config, strict: false) + ) +if bind_tools executable( 'arpaname', arpaname_src, -@@ -1315,7 +1332,9 @@ executable( +@@ -1434,7 +1437,9 @@ executable( libisc_dep, ], ) @@ -79,27 +38,55 @@ executable( 'named-checkconf', named_checkconf_src, -@@ -1438,7 +1457,9 @@ executable( - named_srcconf.dependencies(), +@@ -1507,7 +1512,9 @@ endif + ], + ) + endif ++endif + ++if bind_tools + executable( + 'named-rrchecker', + named_rrchecker_src, +@@ -1520,6 +1527,7 @@ executable( ], + ) +endif + named_c_args = [] + named_link_args = [] +@@ -1559,6 +1567,7 @@ named_srcconf = named_srcset.apply(config, strict: fal + + named_srcconf = named_srcset.apply(config, strict: false) + ++if not bind_tools + executable( + 'named', + named_srcconf.sources(), +@@ -1586,7 +1595,9 @@ executable( + named_srcconf.dependencies(), + ], + ) +- ++endif ++ +if bind_tools executable( 'nsec3hash', nsec3hash_src, -@@ -1486,7 +1507,9 @@ executable( +@@ -1631,7 +1642,9 @@ executable( edit_dep, ], ) +- +endif - ++ +if not bind_tools executable( 'rndc-confgen', rndc_confgen_src, -@@ -1572,6 +1595,7 @@ shared_library( +@@ -1727,6 +1740,7 @@ shared_library( libns_dep, ], ) @@ -107,19 +94,19 @@ subdir('doc') subdir('tests') -@@ -1632,7 +1656,6 @@ alias_target('doc-misc', doc_misc_targets) - - alias_target('doc-misc', doc_misc_targets) +@@ -1795,7 +1809,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() +@@ -1816,6 +1829,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..560cce5e84d7 100644 --- a/dns/bind9-devel/files/patch-meson__options.txt +++ b/dns/bind9-devel/files/patch-meson__options.txt @@ -1,8 +1,13 @@ ---- meson_options.txt.orig 2025-07-19 11:32:37 UTC +Add bind-tools option to ease the server/tools package split + +--- meson_options.txt.orig 2025-10-18 09:48:52 UTC +++ meson_options.txt -@@ -188,3 +188,5 @@ option( - value: 'disabled', +@@ -197,6 +197,8 @@ option( description: 'enable the memory leak detection in external libraries (libxml2, libuv, OpenSSL)', ) -+ + +option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only') ++ + option( + 'named-lto', + type: 'combo', |