Make merge_copyrights ignore hidden files

(cherry picked from commit 6d46082d82408845dcbb185f702d57d04d3ccf3c)

diff --git a/util/copyrights b/util/copyrights
index 02a1df3324404a11883d7fc7c62bf612c9a397d3..51206088c4cae559f5c04e50e45c8885c418f887 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,6 +1,3 @@
-./.gitlab-ci.yml                               X       2018,2019,2020
-./.pylintrc                                    X       2020
-./.uncrustify.cfg                              X       2018,2019,2020
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./CODE_OF_CONDUCT                              X       2019,2020
 ./CONTRIBUTING                                 X       2017,2018,2019,2020
@@ -531,7 +528,6 @@
 ./bin/tests/system/dnssec/ns2/sign.sh          SH      2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/system/dnssec/ns3/sign.sh          SH      2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/system/dnssec/ns3/unsupported-algorithm.key        X       2018,2019,2020
-./bin/tests/system/dnssec/ns5/.gitignore       X       2015,2018,2019
 ./bin/tests/system/dnssec/ns5/sign.sh          SH      2015,2016,2017,2018,2019,2020
 ./bin/tests/system/dnssec/ns6/named.args       X       2013,2014,2016,2018,2019,2020
 ./bin/tests/system/dnssec/ns6/sign.sh          SH      2013,2014,2016,2017,2018,2019,2020

diff --git a/util/merge_copyrights b/util/merge_copyrights
index d00fb9e5aecb0a6a01bc36dd471d1c16133bd4af..5aa3464fdf706bf816d1a62408e960cfda8ef41e 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -31,12 +31,8 @@ open(CHANGES, "git ls-files | sed 's;^;./;' | sort |") || die "git ls-files: $!"
 while (<CHANGES>) {
     chomp;
 
-    next if (m%/\.\# |         # CVS old conflict file
-              /CVS/ |          # CVS directory
-              /\.git/ |                # git directory
-              /\.gitignore |   # .gitignore files
-              /\.gitattributes |   # .gitattributes files
-              /\.clang-format |   # .clang-format files
+    next if (m%/\. |         # just ignore all hidden files
+              /ChangeLog       |   #
               Makefile.in  |   # build system doesn't need to have copyright
               /m4/ |           # build system doesn't need to have copyright
               /configure   |   # build system doesn't need to have copyright
@@ -58,7 +54,6 @@ while (<CHANGES>) {
               /cocci/.* |      # coccinelle spatch files
               \.conf$ |        # configuration files
               \.conf\.in$ |    # configuration files
-              \.dir-locals\.el | # emacs local variables
               /(dnssafe|openssl)/.*\.[ch]$ |   # imported
               doc/(draft|expired|rfc)/ |       # imported
               \.txt$           # text files don't really need copyright