From bffa194e1caa7ba6c48f2a0ff2274944384e026a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Mon, 30 Mar 2026 17:52:14 +0200 Subject: [PATCH 1/2] License test data files in REUSE.toml In order to avoid the need to repeat the license header in named.conf files and zone files, add the paths to REUSE.toml to assign the license. All shared snippets in bin/tests/system/_common and bin/tests/system/**named.conf* files are covered. Note that the existing rule **/**.db** already covers zone files. Only remove the extraneous special-cases. (cherry picked from commit ef57bd3a02ff458e8c542ba9447f15106aae3a60) --- REUSE.toml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index a1e0541480..1d8ed9410b 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -10,6 +10,7 @@ path = [ "**/**.batch", "**/**.before**", "**/**.ccache", + "**/**.db**", "**/**.good", "**/**.key", "**/**.keytab", @@ -30,15 +31,8 @@ path = [ "Makefile", "Makefile.**", "bin/tests/system/**/README*", - "bin/tests/system/checkzone/zones/bad-caa-rr.db", - "bin/tests/system/checkzone/zones/bad1.db", - "bin/tests/system/checkzone/zones/crashzone.db", - "bin/tests/system/checkzone/zones/warn.deprecated.cds-sha1.db", - "bin/tests/system/checkzone/zones/warn.deprecated.digest-sha1.db", - "bin/tests/system/checkzone/zones/warn.deprecated.ds-alg.db", - "bin/tests/system/checkzone/zones/warn.deprecated.key-alg.db", - "bin/tests/system/checkzone/zones/warn.deprecated.nsec3rsasha1.db", - "bin/tests/system/checkzone/zones/warn.deprecated.rsasha1.db", + "bin/tests/system/_common/**", + "bin/tests/system/**.conf*", "bin/tests/system/dnstap/large-answer.fstrm", "bin/tests/system/doth/CA/CA.cfg", "bin/tests/system/doth/CA/index.txt", @@ -68,8 +62,6 @@ path = [ "bin/tests/system/journal/ns2/managed-keys.bind.in", "bin/tests/system/journal/ns2/managed-keys.bind.jnl.in", "bin/tests/system/keepalive/expected", - "bin/tests/system/legacy/ns6/edns512.db.signed", - "bin/tests/system/legacy/ns7/edns512-notcp.db.signed", "bin/tests/system/masterfile/knowngood.include", "bin/tests/system/masterfile/knowngood.ttl1", "bin/tests/system/masterfile/knowngood.ttl2", From d8e228bc15854c5ab337f6ab0312d3a3fbf49bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Mon, 30 Mar 2026 17:53:08 +0200 Subject: [PATCH 2/2] Remove license header files from _common test files These are either config file or zone file snippets. Their license is declared in REUSE.toml. (cherry picked from commit 2390bd3a8f636d45f017c8a61cabde243bf16a23) --- bin/tests/system/_common/controls.conf.in | 13 ------------- bin/tests/system/_common/rndc.conf | 13 ------------- bin/tests/system/_common/rndc.key | 11 ----------- bin/tests/system/_common/root.hint | 11 ----------- bin/tests/system/_common/root.hint.blackhole | 11 ----------- bin/tests/system/_common/trusted.conf.j2 | 13 ------------- 6 files changed, 72 deletions(-) diff --git a/bin/tests/system/_common/controls.conf.in b/bin/tests/system/_common/controls.conf.in index 1db9286eba..429a2d32be 100644 --- a/bin/tests/system/_common/controls.conf.in +++ b/bin/tests/system/_common/controls.conf.in @@ -1,16 +1,3 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - key rndc_key { secret "1234abcd8765"; algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/_common/rndc.conf b/bin/tests/system/_common/rndc.conf index b887ec3eda..9a26208c78 100644 --- a/bin/tests/system/_common/rndc.conf +++ b/bin/tests/system/_common/rndc.conf @@ -1,16 +1,3 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - options { default-key "rndc_key"; }; diff --git a/bin/tests/system/_common/rndc.key b/bin/tests/system/_common/rndc.key index 3ef41c30f5..5a42382142 100644 --- a/bin/tests/system/_common/rndc.key +++ b/bin/tests/system/_common/rndc.key @@ -1,14 +1,3 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - key rndc_key { secret "1234abcd8765"; algorithm hmac-sha256; diff --git a/bin/tests/system/_common/root.hint b/bin/tests/system/_common/root.hint index e0f186c2f8..753aa03684 100644 --- a/bin/tests/system/_common/root.hint +++ b/bin/tests/system/_common/root.hint @@ -1,14 +1,3 @@ -; Copyright (C) Internet Systems Consortium, Inc. ("ISC") -; -; SPDX-License-Identifier: MPL-2.0 -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, you can obtain one at https://mozilla.org/MPL/2.0/. -; -; See the COPYRIGHT file distributed with this work for additional -; information regarding copyright ownership. - $TTL 999999 . IN NS a.root-servers.nil. a.root-servers.nil. IN A 10.53.0.1 diff --git a/bin/tests/system/_common/root.hint.blackhole b/bin/tests/system/_common/root.hint.blackhole index d90ac89856..5a7ec48362 100644 --- a/bin/tests/system/_common/root.hint.blackhole +++ b/bin/tests/system/_common/root.hint.blackhole @@ -1,14 +1,3 @@ -; Copyright (C) Internet Systems Consortium, Inc. ("ISC") -; -; SPDX-License-Identifier: MPL-2.0 -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, you can obtain one at https://mozilla.org/MPL/2.0/. -; -; See the COPYRIGHT file distributed with this work for additional -; information regarding copyright ownership. - $TTL 999999 . IN NS ns99.root-servers.nil. ns99.root-servers.nil. IN A 10.53.0.99 diff --git a/bin/tests/system/_common/trusted.conf.j2 b/bin/tests/system/_common/trusted.conf.j2 index fef3a774e7..1c6af49c84 100644 --- a/bin/tests/system/_common/trusted.conf.j2 +++ b/bin/tests/system/_common/trusted.conf.j2 @@ -1,16 +1,3 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - trust-anchors { {% for ta in trust_anchors %} "@ta.domain@" @ta.type@ @ta.contents@;