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

Merge branch '687-reduce-the-overall-files-we-consider-copyrightable' into 'master'

Browse Source 
Resolve "Reduce the overall files we consider copyrightable"

Closes #687

See merge request isc-projects/bind9!1026
This commit is contained in:
Ondřej Surý
2018-11-12 10:14:33 -05:00
parent 62a92b7784 a1de63a2d2
commit cc60f3a3be
3 changed files with 53 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1287
util/copyrights
View File

File diff suppressed because it is too large Load Diff

19
util/merge_copyrights
View File

@@ -42,6 +42,19 @@ while (<CHANGES>) {
util/newcopyrights | # our output
\.bak$ | # created by update_copyrights
\.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\.in$ | # configuration files
/(dnssafe|openssl)/.*\.[ch]$ | # imported
doc/(draft|expired|rfc)/ # imported
%x);
@@ -92,14 +105,8 @@ while (<CHANGES>) {
$base = $base . ".docbook";
} elsif ($base =~ /\/Makefile$/) {
$file_types{$_} = "MAKE";
} elsif ($base =~ /\/(named|rndc|good|bad).{0,2}\.conf$/) {
$file_types{$_} = "CONF-C";
} elsif ($base =~ /\/checkconf\/(good|bad)-.*\.conf$/) {
$file_types{$_} = "CONF-C";
} elsif ($base =~ /\/resolv.?\.conf$/) {
$file_types{$_} = "CONF-SH";
} elsif ($base =~ /\.(db|hint)$/) {
$file_types{$_} = "ZONE";
} elsif ($base =~ /\.md$/) {
$file_types{$_} = "MKD";
} elsif ($base =~ /(\/\.(gitignore|gitattributes)|Atffile|Kyuafile|\.(gif|jpg))$/i) {

10
util/update_copyrights
View File

@@ -177,14 +177,13 @@ foreach $file (keys %file_types) {
$m4_comment = 0;
$sgml_comment = 0;
$mkd_comment = 0;
$zone_comment = 0;
$man_comment = 0;
$python_comment = 0;
$python_bin_comment = 0;
$start_comment = "";
$end_comment = "";
$first = "";
if ($type =~ /^(C|YACC|CONF-C)$/) {
if ($type =~ /^(C|YACC)$/) {
$c_comment = 1;
$start_comment = "/*\n";
$prefix = " * ";
@@ -202,9 +201,6 @@ foreach $file (keys %file_types) {
$start_comment = "############################################################################\n";
$prefix = "# ";
$end_comment = "############################################################################\n"
} elsif ($type eq "ZONE" || $type eq "MC") {
$zone_comment = 1;
$prefix = "; ";
} elsif ($type eq "MAN") {
$man_comment = 1;
$prefix = ".\\\" ";
@@ -305,7 +301,7 @@ foreach $file (keys %file_types) {
} else {
$first = $_;
}
} elsif (($m4_comment || $zone_comment || $man_comment) &&
} elsif (($m4_comment || $man_comment) &&
/^\Q$nonspaceprefix\E/) {
while (/^\Q$nonspaceprefix\E\s*$/) {
@@ -518,7 +514,7 @@ foreach $file (keys %file_types) {
print TARGET "\n";
}
if (($type eq "C" || $type eq "CONF-C") &&
if (($type eq "C") &&
$sysyears =~ /$this_year/) {
my $body = "";
while (<SOURCE>) {