Make merge_copyrights ignore hidden files

diff --git a/util/copyrights b/util/copyrights
index bcd70b5cfdcc74dc739ce4c12158d625a8161aa5..0f8982b09e2565407e9bd98672dd00884c5f3043 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
 ./AUTHORS                                      X       2020
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./COPYING                                      X       2020
@@ -399,7 +396,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 9f5b09447e3310f2da0c6b81703db1e3eb1a1acf..3e4f24bea914faab70adaa2c5f2991e28ef76f3f 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -30,13 +30,8 @@ $year += 1900;
 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.(am|in) |   # build system doesn't need to have copyright
               /m4/ |           # build system doesn't need to have copyright
@@ -59,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