mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Remove support for adding copyright to zone data

Browse Source
This commit is contained in:
Ondřej Surý
2018-11-12 16:11:57 +01:00
parent d99788042d
commit a1de63a2d2
3 changed files with 22 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

602
util/copyrights
View File

File diff suppressed because it is too large Load Diff

13
util/merge_copyrights
View File

@@ -42,6 +42,17 @@ while (<CHANGES>) {
util/newcopyrights | # our output util/newcopyrights | # our output
\.bak$ | # created by update_copyrights \.bak$ | # created by update_copyrights
\.md$ | # READMEs and such \.md$ | # READMEs and such
\.data$ | # zone files
\.data[0-9]$ | # zone files
\.data\.in$ | # zone files
\.db$ | # zone files
\.db\.in$ | # zone files
/db\.[^/]*$ | # zone files
/[^/]*\.db\.[^/]* | # zone files
\.hints?$ | # zone files
\.hints?\.in$ | # zone files
/hints$ | # zone files
\.zone$ | # zone files
\.conf$ | # configuration files \.conf$ | # configuration files
\.conf\.in$ | # configuration files \.conf\.in$ | # configuration files
/(dnssafe|openssl)/.*\.[ch]$ | # imported /(dnssafe|openssl)/.*\.[ch]$ | # imported
@@ -96,8 +107,6 @@ while (<CHANGES>) {
$file_types{$_} = "MAKE"; $file_types{$_} = "MAKE";
} elsif ($base =~ /\/resolv.?\.conf$/) { } elsif ($base =~ /\/resolv.?\.conf$/) {
$file_types{$_} = "CONF-SH"; $file_types{$_} = "CONF-SH";
} elsif ($base =~ /\.(db|hint)$/) {
$file_types{$_} = "ZONE";
} elsif ($base =~ /\.md$/) { } elsif ($base =~ /\.md$/) {
$file_types{$_} = "MKD"; $file_types{$_} = "MKD";
} elsif ($base =~ /(\/\.(gitignore|gitattributes)|Atffile|Kyuafile|\.(gif|jpg))$/i) { } elsif ($base =~ /(\/\.(gitignore|gitattributes)|Atffile|Kyuafile|\.(gif|jpg))$/i) {

6
util/update_copyrights
View File

@@ -177,7 +177,6 @@ foreach $file (keys %file_types) {
$m4_comment = 0; $m4_comment = 0;
$sgml_comment = 0; $sgml_comment = 0;
$mkd_comment = 0; $mkd_comment = 0;
$zone_comment = 0;
$man_comment = 0; $man_comment = 0;
$python_comment = 0; $python_comment = 0;
$python_bin_comment = 0; $python_bin_comment = 0;
@@ -202,9 +201,6 @@ foreach $file (keys %file_types) {
$start_comment = "############################################################################\n"; $start_comment = "############################################################################\n";
$prefix = "# "; $prefix = "# ";
$end_comment = "############################################################################\n" $end_comment = "############################################################################\n"
} elsif ($type eq "ZONE" || $type eq "MC") {
$zone_comment = 1;
$prefix = "; ";
} elsif ($type eq "MAN") { } elsif ($type eq "MAN") {
$man_comment = 1; $man_comment = 1;
$prefix = ".\\\" "; $prefix = ".\\\" ";
@@ -305,7 +301,7 @@ foreach $file (keys %file_types) {
} else { } else {
$first = $_; $first = $_;
} }
} elsif (($m4_comment || $zone_comment || $man_comment) && } elsif (($m4_comment || $man_comment) &&
/^\Q$nonspaceprefix\E/) { /^\Q$nonspaceprefix\E/) {
while (/^\Q$nonspaceprefix\E\s*$/) { while (/^\Q$nonspaceprefix\E\s*$/) {