head	1.2;
access;
symbols
	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.15;	author christos;	state dead;
branches;
next	1.1;
commitid	n28cV5J7HVthU0HF;

1.1
date	2018.08.12.12.07.50;	author christos;	state Exp;
branches
	1.1.1.1;
next	;
commitid	vA9SFKj6FegqiPNA;

1.1.1.1
date	2018.08.12.12.07.50;	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.50;	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.50;	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.28;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.1.1.1.16.1
date	2025.08.02.05.53.11;	author perseant;	state dead;
branches;
next	;
commitid	23j6GFaDws3O875G;


desc
@@


1.2
log
@Merge conflicts between 9.18.30 and 9.20.4
@
text
@use BindDB;
insert into `Zones`
    ( `id`, `domain`, `host`, `admin`, `serial`, `expire`,
    `refresh`, `retry`, `minimum`, `ttl`, `writeable`) VALUES
    (1, 'example.com', '@@', 'info', 2014040100, 10800,
    7200, 604800, 86400, 86400, 1);

insert into `ZoneData`
    (`id`, `zone_id`, `name`, `type`, `data`) VALUES
    ('', 1, '@@', 'NS', 'ns1.example.com.'),
    ('', 1, '@@', 'NS', 'ns2.example.com.'),
    ('', 1, '@@', 'MX', '10 mail.example.com.'),
    ('', 1, '@@', 'A', '192.168.0.2'),
    ('', 1, '@@', 'TXT', '"v=spf1 ip:192.168.0.3 ~all"'),
    ('', 1, 'www', 'CNAME', 'example.com.'),
    ('', 1, 'mail', 'A', '192.168.0.3'),
    ('', 1, 'ns1', 'A', '192.168.1.111'),
    ('', 1, 'ns2', 'A', '192.168.1.222');
@


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:28 +0000
@
text
@d1 18
@


1.1.1.1.4.2
log
@Sync with HEAD
@
text
@a0 18
use BindDB;
insert into `Zones`
    ( `id`, `domain`, `host`, `admin`, `serial`, `expire`,
    `refresh`, `retry`, `minimum`, `ttl`, `writeable`) VALUES
    (1, 'example.com', '@@', 'info', 2014040100, 10800,
    7200, 604800, 86400, 86400, 1);

insert into `ZoneData`
    (`id`, `zone_id`, `name`, `type`, `data`) VALUES
    ('', 1, '@@', 'NS', 'ns1.example.com.'),
    ('', 1, '@@', 'NS', 'ns2.example.com.'),
    ('', 1, '@@', 'MX', '10 mail.example.com.'),
    ('', 1, '@@', 'A', '192.168.0.2'),
    ('', 1, '@@', 'TXT', '"v=spf1 ip:192.168.0.3 ~all"'),
    ('', 1, 'www', 'CNAME', 'example.com.'),
    ('', 1, 'mail', 'A', '192.168.0.3'),
    ('', 1, 'ns1', 'A', '192.168.1.111'),
    ('', 1, 'ns2', 'A', '192.168.1.222');
@


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
use BindDB;
insert into `Zones`
    ( `id`, `domain`, `host`, `admin`, `serial`, `expire`,
    `refresh`, `retry`, `minimum`, `ttl`, `writeable`) VALUES
    (1, 'example.com', '@@', 'info', 2014040100, 10800,
    7200, 604800, 86400, 86400, 1);

insert into `ZoneData`
    (`id`, `zone_id`, `name`, `type`, `data`) VALUES
    ('', 1, '@@', 'NS', 'ns1.example.com.'),
    ('', 1, '@@', 'NS', 'ns2.example.com.'),
    ('', 1, '@@', 'MX', '10 mail.example.com.'),
    ('', 1, '@@', 'A', '192.168.0.2'),
    ('', 1, '@@', 'TXT', '"v=spf1 ip:192.168.0.3 ~all"'),
    ('', 1, 'www', 'CNAME', 'example.com.'),
    ('', 1, 'mail', 'A', '192.168.0.3'),
    ('', 1, 'ns1', 'A', '192.168.1.111'),
    ('', 1, 'ns2', 'A', '192.168.1.222');
@