head 1.2; access; symbols perseant-exfatfs-base-20261102:1.2 netbsd-10-2-RELEASE:1.1.1.1 netbsd-9-5-RELEASE:1.1.1.1 perseant-exfatfs-base-20250801:1.2 netbsd-10-1-RELEASE:1.1.1.1 bind-9-18-30:1.1.1.1 perseant-exfatfs-base-20240630:1.1.1.1 perseant-exfatfs:1.1.1.1.0.16 perseant-exfatfs-base:1.1.1.1 netbsd-9-4-RELEASE:1.1.1.1 netbsd-10-0-RELEASE:1.1.1.1 netbsd-10-0-RC6:1.1.1.1 netbsd-10-0-RC5:1.1.1.1 bind-9-18-24-1:1.1.1.1 bind-9-18-24:1.1.1.1 netbsd-10-0-RC4:1.1.1.1 netbsd-10-0-RC3:1.1.1.1 netbsd-10-0-RC2:1.1.1.1 netbsd-10-0-RC1:1.1.1.1 bind-9-16-42:1.1.1.1 bind-9-16-37:1.1.1.1 netbsd-10:1.1.1.1.0.14 netbsd-10-base:1.1.1.1 bind-9-16-33:1.1.1.1 netbsd-9-3-RELEASE:1.1.1.1 bind-9-16-20:1.1.1.1 cjep_sun2x-base1:1.1.1.1 cjep_sun2x:1.1.1.1.0.12 cjep_sun2x-base:1.1.1.1 cjep_staticlib_x-base1:1.1.1.1 netbsd-9-2-RELEASE:1.1.1.1 cjep_staticlib_x:1.1.1.1.0.10 cjep_staticlib_x-base:1.1.1.1 bind-9-16-15:1.1.1.1 bind-9-16-12:1.1.1.1 netbsd-9-1-RELEASE:1.1.1.1 bind-9-16-5:1.1.1.1 bind-9-16-3:1.1.1.1 phil-wifi-20200421:1.1.1.1 phil-wifi-20200411:1.1.1.1 is-mlppp:1.1.1.1.0.8 is-mlppp-base:1.1.1.1 phil-wifi-20200406:1.1.1.1 netbsd-9-0-RELEASE:1.1.1.1 netbsd-9-0-RC2:1.1.1.1 netbsd-9-0-RC1:1.1.1.1 bind-9-14-8:1.1.1.1 phil-wifi-20191119:1.1.1.1 bind-9-14-7:1.1.1.1 bind-9-14-5:1.1.1.1 netbsd-9:1.1.1.1.0.6 netbsd-9-base:1.1.1.1 phil-wifi:1.1.1.1.0.4 phil-wifi-20190609:1.1.1.1 bind-9-14-1:1.1.1.1 bind-9-13-7:1.1.1.1 pgoyette-compat-merge-20190127:1.1.1.1.2.2 pgoyette-compat-20190127:1.1.1.1 pgoyette-compat-20190118:1.1.1.1 bind-9-13-5-W1:1.1.1.1 pgoyette-compat-1226:1.1.1.1 pgoyette-compat-1126:1.1.1.1 pgoyette-compat-1020:1.1.1.1 pgoyette-compat-0930:1.1.1.1 pgoyette-compat:1.1.1.1.0.2 pgoyette-compat-0906:1.1.1.1 bind-9-12-2-P1:1.1.1.1 ISC:1.1.1; locks; strict; comment @# @; 1.2 date 2025.01.26.16.25.16; author christos; state dead; branches; next 1.1; commitid n28cV5J7HVthU0HF; 1.1 date 2018.08.12.12.07.51; author christos; state Exp; branches 1.1.1.1; next ; commitid vA9SFKj6FegqiPNA; 1.1.1.1 date 2018.08.12.12.07.51; author christos; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1 1.1.1.1.16.1; next ; commitid vA9SFKj6FegqiPNA; 1.1.1.1.2.1 date 2018.08.12.12.07.51; author pgoyette; state dead; branches; next 1.1.1.1.2.2; commitid HCi1bXD317XIK0RA; 1.1.1.1.2.2 date 2018.09.06.06.54.51; author pgoyette; state Exp; branches; next ; commitid HCi1bXD317XIK0RA; 1.1.1.1.4.1 date 2018.08.12.12.07.51; author christos; state dead; branches; next 1.1.1.1.4.2; commitid jtc8rnCzWiEEHGqB; 1.1.1.1.4.2 date 2019.06.10.22.04.29; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.1.1.1.16.1 date 2025.08.02.05.53.12; author perseant; state dead; branches; next ; commitid 23j6GFaDws3O875G; desc @@ 1.2 log @Merge conflicts between 9.18.30 and 9.20.4 @ text @INSERT INTO `records` (`zone`, `ttl`, `type`, `host`, `mx_priority`, `data`, `primary_ns`, `resp_contact`, `serial`, `refresh`, `retry`, `expire`, `minimum`) VALUES ('example.com', 86400, 'SOA', '@@', NULL, NULL, 'ns1.example.com.', 'info.example.com.', 2011043001, 10800, 7200, 604800, 86400), ('example.com', 86400, 'NS', '@@', NULL, 'ns1.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'NS', '@@', NULL, 'ns2.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'MX', '@@', 10, 'mail.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', '@@', NULL, '192.168.0.2', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'CNAME', 'www', NULL, '@@', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns1', NULL, '192.168.0.111', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns2', NULL, '192.168.0.222', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'mail', NULL, '192.168.0.3', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'TXT', '@@', NULL, 'v=spf1 ip:192.168.0.3 ~all', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `xfr` (`zone`, `client`) VALUES ('example.com', '127.0.0.1'); @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import bind-9.12.2-P2 since bind-9.10 (the last BSD version) is now out of support. The changes since our last version imported (9.10.7) version are too big to include inline here; please consult the CHANGES file in this directory. @ text @@ 1.1.1.1.16.1 log @Sync with HEAD @ text @@ 1.1.1.1.4.1 log @file dlz.data was added on branch phil-wifi on 2019-06-10 22:04:29 +0000 @ text @d1 18 @ 1.1.1.1.4.2 log @Sync with HEAD @ text @a0 18 INSERT INTO `records` (`zone`, `ttl`, `type`, `host`, `mx_priority`, `data`, `primary_ns`, `resp_contact`, `serial`, `refresh`, `retry`, `expire`, `minimum`) VALUES ('example.com', 86400, 'SOA', '@@', NULL, NULL, 'ns1.example.com.', 'info.example.com.', 2011043001, 10800, 7200, 604800, 86400), ('example.com', 86400, 'NS', '@@', NULL, 'ns1.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'NS', '@@', NULL, 'ns2.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'MX', '@@', 10, 'mail.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', '@@', NULL, '192.168.0.2', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'CNAME', 'www', NULL, '@@', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns1', NULL, '192.168.0.111', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns2', NULL, '192.168.0.222', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'mail', NULL, '192.168.0.3', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'TXT', '@@', NULL, 'v=spf1 ip:192.168.0.3 ~all', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `xfr` (`zone`, `client`) VALUES ('example.com', '127.0.0.1'); @ 1.1.1.1.2.1 log @file dlz.data was added on branch pgoyette-compat on 2018-09-06 06:54:51 +0000 @ text @d1 18 @ 1.1.1.1.2.2 log @Sync with HEAD Resolve a couple of conflicts (result of the uimin/uimax changes) @ text @a0 18 INSERT INTO `records` (`zone`, `ttl`, `type`, `host`, `mx_priority`, `data`, `primary_ns`, `resp_contact`, `serial`, `refresh`, `retry`, `expire`, `minimum`) VALUES ('example.com', 86400, 'SOA', '@@', NULL, NULL, 'ns1.example.com.', 'info.example.com.', 2011043001, 10800, 7200, 604800, 86400), ('example.com', 86400, 'NS', '@@', NULL, 'ns1.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'NS', '@@', NULL, 'ns2.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'MX', '@@', 10, 'mail.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', '@@', NULL, '192.168.0.2', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'CNAME', 'www', NULL, '@@', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns1', NULL, '192.168.0.111', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'ns2', NULL, '192.168.0.222', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'A', 'mail', NULL, '192.168.0.3', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('example.com', 86400, 'TXT', '@@', NULL, 'v=spf1 ip:192.168.0.3 ~all', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `xfr` (`zone`, `client`) VALUES ('example.com', '127.0.0.1'); @