From 634b5ebac6213d2361555318c75a21f96881b3f2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 1 Jan 2022 11:05:05 -0800 Subject: [PATCH] Update copyright dates not handled by scripts/update-copyrights. I've updated copyright dates in glibc for 2022. This is the patch for the changes not generated by scripts/update-copyrights and subsequent build / regeneration of generated files. As well as the usual annual updates, mainly dates in --version output (minus csu/version.c which previously had to be handled manually but is now successfully updated by update-copyrights), there is a small change to the copyright notice in NEWS which should let NEWS get updated automatically next year. Please remember to include 2022 in the dates for any new files added in future (which means updating any existing uncommitted patches you have that add new files to use the new copyright dates in them). --- catgets/gencat.c | 2 +- debug/catchsegv.sh | 2 +- debug/pcprofiledump.c | 2 +- debug/xtrace.sh | 2 +- elf/ldconfig.c | 2 +- elf/ldd.bash.in | 2 +- elf/pldd.c | 2 +- elf/sotruss.sh | 2 +- elf/sprof.c | 2 +- iconv/iconv_prog.c | 2 +- iconv/iconvconfig.c | 2 +- locale/programs/locale.c | 2 +- locale/programs/localedef.c | 2 +- login/programs/pt_chown.c | 2 +- malloc/memusage.sh | 2 +- malloc/memusagestat.c | 2 +- malloc/mtrace.pl | 2 +- nscd/nscd.c | 2 +- nss/getent.c | 2 +- nss/makedb.c | 2 +- posix/getconf.c | 2 +- scripts/test-installation.pl | 2 +- sysdeps/unix/sysv/linux/lddlibc4.c | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/catgets/gencat.c b/catgets/gencat.c index 911d24249b5..cebf1fd4358 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -245,7 +245,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh index e9bf4df4b70..f8328eee69b 100755 --- a/debug/catchsegv.sh +++ b/debug/catchsegv.sh @@ -39,7 +39,7 @@ EOF ;; --v | --ve | --ver | --vers | --versi | --versio | --version) echo 'catchsegv @PKGVERSION@@VERSION@' - echo 'Copyright (C) 2021 Free Software Foundation, Inc. + echo 'Copyright (C) 2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Written by Ulrich Drepper.' diff --git a/debug/pcprofiledump.c b/debug/pcprofiledump.c index c57ac810a36..b2258f864f5 100644 --- a/debug/pcprofiledump.c +++ b/debug/pcprofiledump.c @@ -225,6 +225,6 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/debug/xtrace.sh b/debug/xtrace.sh index 08e5d57b94f..8c56e01449f 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -63,7 +63,7 @@ do_version() { printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2021" +" "2022" printf $"Written by %s. " "Ulrich Drepper" exit 0 diff --git a/elf/ldconfig.c b/elf/ldconfig.c index c363a9596b9..057c3dd666b 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -328,7 +328,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Andreas Jaeger"); } diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in index d52414336cd..3253b32ef81 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -38,7 +38,7 @@ while test $# -gt 0; do printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2021" +" "2022" printf $"Written by %s and %s. " "Roland McGrath" "Ulrich Drepper" exit 0 diff --git a/elf/pldd.c b/elf/pldd.c index 81ff7ac6380..f720b2c5150 100644 --- a/elf/pldd.c +++ b/elf/pldd.c @@ -263,7 +263,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/elf/sotruss.sh b/elf/sotruss.sh index df0bdfdb444..22327eac5c0 100755 --- a/elf/sotruss.sh +++ b/elf/sotruss.sh @@ -75,7 +75,7 @@ while test $# -gt 0; do printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2021" +" "2022" printf $"Written by %s.\n" "Ulrich Drepper" exit 0 ;; diff --git a/elf/sprof.c b/elf/sprof.c index 44be8b43ba3..405fbcbf387 100644 --- a/elf/sprof.c +++ b/elf/sprof.c @@ -390,7 +390,7 @@ Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ "), - "2021"); + "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index e176c89560e..9a2e4ff23fe 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -405,7 +405,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 6296b0dc9a9..24a167b5d98 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -398,7 +398,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/locale/programs/locale.c b/locale/programs/locale.c index 24ac0c95ffd..1b51b50d681 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -293,7 +293,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 3d39daaad1c..35a092a1118 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -460,7 +460,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c index 90c677c358d..8447caf0d60 100644 --- a/login/programs/pt_chown.c +++ b/login/programs/pt_chown.c @@ -63,7 +63,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); } static char * diff --git a/malloc/memusage.sh b/malloc/memusage.sh index 2bb81013bd9..f447160b7d0 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -70,7 +70,7 @@ do_version() { printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2021" +" "2022" printf $"Written by %s. " "Ulrich Drepper" exit 0 diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c index 0c7a9dc724b..a1ee5cfacdc 100644 --- a/malloc/memusagestat.c +++ b/malloc/memusagestat.c @@ -581,6 +581,6 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl index 142e2a11eef..042df725eb5 100644 --- a/malloc/mtrace.pl +++ b/malloc/mtrace.pl @@ -44,7 +44,7 @@ sub usage { $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" || $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") { print "mtrace $PKGVERSION$VERSION\n"; - print "Copyright (C) 2021 Free Software Foundation, Inc.\n"; + print "Copyright (C) 2022 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; print "Written by Ulrich Drepper \n"; diff --git a/nscd/nscd.c b/nscd/nscd.c index 41c047c60b2..1897cae671b 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -522,7 +522,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk and Ulrich Drepper"); } diff --git a/nss/getent.c b/nss/getent.c index 6265455a9f6..8178b4b4700 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -88,7 +88,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk"); } diff --git a/nss/makedb.c b/nss/makedb.c index afd35b22d35..d3fc1c5af9a 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -386,7 +386,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/posix/getconf.c b/posix/getconf.c index 0bdbb5fd8e8..a1adbc4b50e 100644 --- a/posix/getconf.c +++ b/posix/getconf.c @@ -486,7 +486,7 @@ main (int argc, char *argv[]) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); printf (gettext ("Written by %s.\n"), "Roland McGrath"); return 0; } diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index 261a5f96c9f..98c825332f4 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -58,7 +58,7 @@ sub installation_problem { $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" || $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") { print "test-installation (GNU $PACKAGE)\n"; - print "Copyright (C) 2021 Free Software Foundation, Inc.\n"; + print "Copyright (C) 2022 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; print "Written by Andreas Jaeger \n"; diff --git a/sysdeps/unix/sysv/linux/lddlibc4.c b/sysdeps/unix/sysv/linux/lddlibc4.c index 3c7f8978dee..153d2ad183c 100644 --- a/sysdeps/unix/sysv/linux/lddlibc4.c +++ b/sysdeps/unix/sysv/linux/lddlibc4.c @@ -68,7 +68,7 @@ main (int argc, char *argv[]) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2021"); +"), "2022"); return 0; }