New make target 'update-copyright-year'

We don't want to automatically update the copyright year as this
prevents reproducible builds.

Instead, 'make update-copyright-year' has to be executed at the
start of each new year and the changes have to be pushed.

Closes #980

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

diff --git a/cfg.mk b/cfg.mk
index 4083338d3e874526eb2a466ef6f0c4e550aa2f5f..32053787671bd359dc2b44b53a60a431fac8541e 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -43,7 +43,6 @@ local-checks-to-skip = sc_GPL_version sc_bindtextdomain                       \
        sc_two_space_separator_in_usage
 
 VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|src/.*\.bak|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$
-update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1
 
 # Explicit syntax-check exceptions.
 exclude_file_name_regexp--sc_copyright_check = ^./gnulib/.*$$
@@ -78,6 +77,12 @@ glimport:
        echo "If everything looks well, commit the gnulib update with:"
        echo "  git commit -m "Update gnulib submodule" gnulib"
 
+# Update Copyright year in tools and docs
+
+update-copyright-year:
+       $(AM_V_at)$(SED) -i "s/\"2000-[0-9]\{4,\}\"/\"2000-`date +%Y`\"/g" src/args-std.def.in
+       $(AM_V_at)$(SED) -i "s/ 2001-[0-9]\{4,\} / 2001-`date +%Y` /g" doc/gnutls.texi
+
 # Code Coverage
 
 clang:

diff --git a/configure.ac b/configure.ac
index 2d0a42665e0ff51bad1efcd8beed4fe950cf148f..2fe8dd68833e9b096457ec6f5308cba73fef95e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1098,10 +1098,6 @@ AC_DEFINE([fread_file], [_gnutls_fread_file], [static lib rename])
 AC_DEFINE([read_file], [_gnutls_read_file], [static lib rename])
 AC_DEFINE([read_binary_file], [_gnutls_read_binary_file], [static lib rename])
 
-dnl Some variables needed in makefiles
-YEAR=`date +%Y`
-AC_SUBST([YEAR], $YEAR)
-
 dnl configuration options for config file parsing (inih)
 AC_DEFINE([INI_MAX_LINE], 2048, [inih maximum line size])
 AC_DEFINE([INI_ALLOW_INLINE_COMMENTS], 1, [whether to allowin inline comments])

diff --git a/src/args-std.def.in b/src/args-std.def.in
index 93634a1857261189ab607804ae7266f1d1d02c81..4a92c448d25ec5788c0348a8695c011557a2f391 100644 (file)
--- a/src/args-std.def.in
+++ b/src/args-std.def.in
@@ -10,7 +10,7 @@ no-misuse-usage;
 export          = '#include <gettext.h>';
 
 copyright = {
-    date  = "2000-@YEAR@";
+    date  = "2000-2020";
     owner = "Free Software Foundation, and others";
     author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; "
              "see /usr/share/doc/gnutls/AUTHORS for a complete list.";