diff options
Diffstat (limited to 'dns/bind9-devel/files')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 52 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-tools | 27 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-no-bind-tools | 40 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-bin_named_include_named_globals.h | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-configure.ac | 13 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson.build | 147 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson__options.txt | 10 |
7 files changed, 190 insertions, 103 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 19b831342b94..d07b689fc121 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-06-06 09:09:52 UTC +--- bin/named/config.c.orig 2025-08-13 17:10:38 UTC +++ bin/named/config.c -@@ -184,6 +184,7 @@ options {\n\ +@@ -187,6 +187,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-06-06 09:09:52 UTC +--- bin/named/server.c.orig 2025-08-13 17:10:38 UTC +++ bin/named/server.c -@@ -4183,6 +4183,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,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-06-06 09:09:53 UTC +--- doc/arm/reference.rst.orig 2025-08-13 17:10:38 UTC +++ doc/arm/reference.rst -@@ -4184,6 +4184,10 @@ Tuning +@@ -4187,6 +4187,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a greater value. @@ -37,7 +37,17 @@ 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-06-06 09:09:53 UTC +--- doc/misc/options.orig 2025-08-13 17:10:38 UTC ++++ doc/misc/options +@@ -171,6 +171,7 @@ options { + masterfile-style ( full | relative ); + match-mapped-addresses <boolean>; + max-cache-size ( default | unlimited | <sizeval> | <percentage> ); ++ override-cache-ttl <duration>; + max-cache-ttl <duration>; + max-clients-per-query <integer>; + max-ixfr-ratio ( unlimited | <percentage> ); +--- 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; @@ -47,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-06-06 09:09:53 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-06-06 09:09:53 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/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools deleted file mode 100644 index 0416f8b80b37..000000000000 --- a/dns/bind9-devel/files/extrapatch-bind-tools +++ /dev/null @@ -1,27 +0,0 @@ -Only select the "tools" part of bind for building. - ---- Makefile.am.orig 2023-12-02 10:13:03 UTC -+++ Makefile.am -@@ -17,7 +17,6 @@ bind.keys.h: bind.keys Makefile - .PHONY: doc - - EXTRA_DIST = \ -- bind.keys \ - util/bindkeys.pl \ - util/dtrace.sh \ - contrib \ ---- bin/Makefile.am.orig 2023-12-01 14:21:34 UTC -+++ bin/Makefile.am -@@ -1 +1 @@ --SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins -+SUBDIRS = dig delv dnssec tools nsupdate ---- bin/tools/Makefile.am.orig 2023-12-01 14:21:34 UTC -+++ bin/tools/Makefile.am -@@ -11,7 +11,6 @@ LDADD += \ - bin_PROGRAMS = \ - arpaname \ - mdig \ -- named-journalprint \ - named-rrchecker \ - nsec3hash - diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools deleted file mode 100644 index 9a168202eb50..000000000000 --- a/dns/bind9-devel/files/extrapatch-no-bind-tools +++ /dev/null @@ -1,40 +0,0 @@ -Exclude the "tools" from building and installing. - ---- bin/Makefile.am.orig 2024-05-03 07:23:28 UTC -+++ bin/Makefile.am -@@ -1 +1 @@ --SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins -+SUBDIRS = named rndc tools check confgen tests plugins ---- bin/tools/Makefile.am.orig 2024-05-03 07:23:29 UTC -+++ bin/tools/Makefile.am -@@ -9,29 +9,10 @@ LDADD += \ - $(LIBISC_LIBS) - - bin_PROGRAMS = \ -- arpaname \ -- mdig \ -- named-journalprint \ -- named-rrchecker \ -- nsec3hash -+ named-journalprint - - arpaname_LDADD = \ - $(LIBISC_LIBS) -- --if HAVE_DNSTAP --bin_PROGRAMS += \ -- dnstap-read -- --dnstap_read_CPPFLAGS = \ -- $(AM_CPPFLAGS) \ -- $(DNSTAP_CFLAGS) \ -- -I$(top_builddir)/lib/dns -- --dnstap_read_LDADD = \ -- $(LIBDNS_LIBS) \ -- $(LIBISC_LIBS) \ -- $(DNSTAP_LIBS) --endif - - if HAVE_LMDB - bin_PROGRAMS += \ 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-configure.ac b/dns/bind9-devel/files/patch-configure.ac deleted file mode 100644 index ecb07886e570..000000000000 --- a/dns/bind9-devel/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ -automake has warnings, it is ok here. - ---- configure.ac.orig 2022-02-09 16:40:14 UTC -+++ configure.ac -@@ -48,7 +48,7 @@ AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - AC_CONFIG_SRCDIR([bin/named/main.c]) --AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall -Werror]) -+AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall]) - AM_SILENT_RULES([yes]) - AM_EXTRA_RECURSIVE_TARGETS([test unit doc]) - diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build new file mode 100644 index 000000000000..d0e04c456b02 --- /dev/null +++ b/dns/bind9-devel/files/patch-meson.build @@ -0,0 +1,147 @@ +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') + zlib_opt = get_option('zlib') + ++bind_tools = get_option('bind-tools').enabled() ++ + if meson.version().version_compare('>=1.1.0') + build_options = meson.build_options() + if build_options == '' +@@ -976,9 +978,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false) + + 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, +@@ -1006,6 +1014,8 @@ libdns = library( + libdns = library( + 'dns', + dns_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + include_directories: dns_inc, + install: true, + install_rpath: libdir, +@@ -1040,6 +1050,8 @@ libns = library( + libns = library( + 'ns', + ns_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + objects: ns_probe_objects, + install: true, + install_rpath: libdir, +@@ -1066,6 +1078,8 @@ libisccc = library( + libisccc = library( + 'isccc', + isccc_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + implicit_include_directories: false, + include_directories: isccc_inc, + install: true, +@@ -1087,6 +1101,8 @@ libisccfg = library( + libisccfg = library( + 'isccfg', + isccfg_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + implicit_include_directories: false, + include_directories: isccfg_inc, + install: true, +@@ -1107,6 +1123,7 @@ named_srcconf = named_srcset.apply(config, strict: fal + + named_srcconf = named_srcset.apply(config, strict: false) + ++if bind_tools + executable( + 'arpaname', + arpaname_src, +@@ -1335,7 +1352,9 @@ executable( + libisc_dep, + ], + ) ++endif + ++if not bind_tools + executable( + 'named-checkconf', + named_checkconf_src, +@@ -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(), + ], + ) ++endif + ++if bind_tools + executable( + 'nsec3hash', + nsec3hash_src, +@@ -1506,7 +1531,9 @@ executable( + edit_dep, + ], + ) ++endif + ++if not bind_tools + executable( + 'rndc-confgen', + rndc_confgen_src, +@@ -1592,6 +1619,7 @@ shared_library( + libns_dep, + ], + ) ++endif + + subdir('doc') + subdir('tests') +@@ -1659,7 +1687,6 @@ print(release_date, end="") + print(release_date, end="") + ''' + +-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() + 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 new file mode 100644 index 000000000000..954a01fff5ad --- /dev/null +++ b/dns/bind9-devel/files/patch-meson__options.txt @@ -0,0 +1,10 @@ +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( + value: 'disabled', + description: 'enable the memory leak detection in external libraries (libxml2, libuv, OpenSSL)', + ) ++ ++option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only') |