Happy new years, Here are some patches so 'make syntax-check' passes in GNU hello.
Collin
>From b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b Mon Sep 17 00:00:00 2001 Message-ID: <b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b.1767484791.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sat, 3 Jan 2026 15:27:55 -0800 Subject: [PATCH 1/3] build: update gnulib submodule to latest * bootstrap: Update using './bootstrap --bootstrap-sync'. --- bootstrap | 19 ++++++++++--------- gnulib | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bootstrap b/bootstrap index fef3cbc..19f9424 100755 --- a/bootstrap +++ b/bootstrap @@ -3,9 +3,9 @@ # Bootstrap this package from checked-out sources. -scriptversion=2024-07-04.10; # UTC +scriptversion=2025-06-10.02; # UTC -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,9 +37,9 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-02-16.12; # UTC +scriptlibversion=2025-12-04.19; # UTC -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ export LC_ALL # Honor $PERL, but work even if there is none. PERL="${PERL-perl}" -default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git +default_gnulib_url=https://https.git.savannah.gnu.org/git/gnulib.git # Copyright year, for the --version output. copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'` @@ -861,7 +861,8 @@ autopull() elif check_exists git-merge-changelog; then echo "$0: initializing git-merge-changelog driver" git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' - git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + git config merge.merge-changelog.driver \ + 'git-merge-changelog %O %A %B "%Y"' else echo "$0: consider installing git-merge-changelog from gnulib" fi @@ -1337,7 +1338,7 @@ autogen() # Invoke autoreconf with --force --install to ensure upgrades of tools # such as ylwrap. - AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + AUTORECONFFLAGS="--verbose --install --force $ACLOCAL_FLAGS" AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. @@ -1413,7 +1414,7 @@ autogen() # Local Variables: # eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptlibversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: @@ -1624,7 +1625,7 @@ fi # Local Variables: # eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/gnulib b/gnulib index 50f95b4..5b2d19f 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 50f95b448151c1e1695fca2f67cb7991b57e874b +Subproject commit 5b2d19fa6e0f889853050965f714a7084cd60846 -- 2.52.0
>From c6958d9d027f681ba2d8ea061f087376cc25fe10 Mon Sep 17 00:00:00 2001 Message-ID: <c6958d9d027f681ba2d8ea061f087376cc25fe10.1767484791.git.collin.fu...@gmail.com> In-Reply-To: <b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b.1767484791.git.collin.fu...@gmail.com> References: <b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b.1767484791.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sat, 3 Jan 2026 15:32:57 -0800 Subject: [PATCH 2/3] maint: run 'make update-copyright' * NEWS: Update using 'make update-NEWS-hash'. --- AUTHORS | 2 +- ChangeLog.O | 2 +- Makefile.am | 2 +- NEWS | 2 +- README | 2 +- README-dev | 2 +- THANKS | 2 +- bootstrap.conf | 2 +- build-aux/git-version-gen | 4 ++-- cfg.mk | 4 ++-- configure.ac | 2 +- doc/ChangeLog | 2 +- doc/hello.texi | 2 +- doc/local.mk | 2 +- man/ChangeLog | 2 +- po/ChangeLog | 2 +- po/POTFILES.in | 2 +- src/ChangeLog | 2 +- src/hello.c | 2 +- src/system.h | 2 +- tests/ChangeLog | 2 +- tests/atexit-1 | 2 +- tests/greeting-1 | 2 +- tests/greeting-2 | 2 +- tests/hello-1 | 2 +- tests/last-1 | 2 +- tests/operand-1 | 2 +- tests/traditional-1 | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/AUTHORS b/AUTHORS index 57d0ecb..d9949b1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ Authors of GNU Hello. - Copyright (C) 1999-2025 Free Software Foundation, Inc. + Copyright (C) 1999-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/ChangeLog.O b/ChangeLog.O index 141fc75..d8697c7 100644 --- a/ChangeLog.O +++ b/ChangeLog.O @@ -1104,7 +1104,7 @@ Sat Apr 1 00:27:19 1978 Brian Kernighan (bwk at research) * Initial version. -Copyright 1993-2025 Free Software Foundation, Inc. +Copyright 1993-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice diff --git a/Makefile.am b/Makefile.am index d946a21..6f9556b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # and all subdirectories). # Makefile for the top-level directory of GNU hello. # -# Copyright 1997-2025 Free Software Foundation, Inc. +# Copyright 1997-2026 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/NEWS b/NEWS index e20bf60..cb7a939 100644 --- a/NEWS +++ b/NEWS @@ -139,6 +139,6 @@ Version 2.7 (28 March 2011) * There is now a `NEWS' file (this one), giving a history of user-visible changes. - Copyright (C) 1992-2025 Free Software Foundation, Inc. + Copyright (C) 1992-2026 Free Software Foundation, Inc. This file is distributed under the same license as the GNU hello package. diff --git a/README b/README index c9893e6..09711d2 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ This is the README file for the GNU Hello distribution. Hello prints a friendly greeting. It also serves as a sample GNU package, showing practices that may be useful for GNU projects. - Copyright (C) 1992-2025 Free Software Foundation, Inc. + Copyright (C) 1992-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/README-dev b/README-dev index f784d11..22a45e1 100644 --- a/README-dev +++ b/README-dev @@ -1,6 +1,6 @@ This README.dev file describes the development environment. - Copyright (C) 2002-2025 Free Software Foundation, Inc. + Copyright (C) 2002-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/THANKS b/THANKS index e82f35d..9c76c19 100644 --- a/THANKS +++ b/THANKS @@ -1,6 +1,6 @@ Additional contributors to GNU Hello. - Copyright (C) 1999-2025 Free Software Foundation, Inc. + Copyright (C) 1999-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/bootstrap.conf b/bootstrap.conf index acb948c..e3eab52 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2025 Free Software Foundation, Inc. +# Copyright (C) 2006-2026 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 3442923..4032f70 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -2,7 +2,7 @@ # Print a version string. scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2007-2025 Free Software Foundation, Inc. +# Copyright (C) 2007-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ me=$0 version="git-version-gen $scriptversion -Copyright 2011-2025 Free Software Foundation, Inc. +Copyright 2011-2026 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." diff --git a/cfg.mk b/cfg.mk index f6c6e10..3c85dec 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,6 +1,6 @@ # Configuration for maintainer-makefile # -# Copyright (c) 2012-2025 Free Software Foundation, Inc. +# Copyright (c) 2012-2026 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ local-checks-to-skip = \ sc_indent # Set format of NEWS -old_NEWS_hash := 28d8a815b6ee60b5d8daf5283c6902c6 +old_NEWS_hash := 5940357565cd8d809d708da94f93f47f update-copyright-env = \ UPDATE_COPYRIGHT_FORCE=1 \ diff --git a/configure.ac b/configure.ac index 4fe2b21..0474374 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright (C) 2004-2025 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2026 Free Software Foundation, Inc. dnl This file is free software; as a special exception the author gives dnl unlimited permission to copy and/or distribute it, with or without diff --git a/doc/ChangeLog b/doc/ChangeLog index 3f56f26..c378527 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -172,7 +172,7 @@ Tue Dec 19 08:26:09 1995 Karl Eichwalder <[email protected]> * Makefile.in, version.texi: New file. -Copyright 1995-2025 Free Software Foundation, Inc. +Copyright 1995-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/doc/hello.texi b/doc/hello.texi index 33659ce..6aabd64 100644 --- a/doc/hello.texi +++ b/doc/hello.texi @@ -15,7 +15,7 @@ This manual is for GNU Hello (version @value{VERSION}, @value{UPDATED}), which prints a friendly greeting (and serves as an example GNU package). -Copyright @copyright{} 1992--2025 Free Software Foundation, Inc. +Copyright @copyright{} 1992--2026 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/local.mk b/doc/local.mk index 9bcab7a..75dbc5a 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -1,7 +1,7 @@ # Make hello documentation. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 1995-2025 Free Software Foundation, Inc. +# Copyright (C) 1995-2026 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/man/ChangeLog b/man/ChangeLog index 6b5e354..0309cd1 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -58,7 +58,7 @@ * Makefile.am: New file; filled with template information from the textutils package. -Copyright (C) 1999-2025 Free Software Foundation, Inc. +Copyright (C) 1999-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/po/ChangeLog b/po/ChangeLog index f5a61d6..6593df2 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -572,7 +572,7 @@ Fri Dec 15 11:59:51 1995 Karl Eichwalder <[email protected]> * POTFILES.in: New file. Lists `getopt.c', `getopt1.c', `hello.c', and `version.c'. -Copyright (C) 1995-2025 Free Software Foundation, Inc. +Copyright (C) 1995-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/po/POTFILES.in b/po/POTFILES.in index 2823cdf..81a7068 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2025 Free Software Foundation, Inc. +# Copyright (C) 2005-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/src/ChangeLog b/src/ChangeLog index f4635c2..dce441e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -348,7 +348,7 @@ Tue Dec 19 08:26:09 1995 Karl Eichwalder <[email protected]> * Makefile.in: New file. -Copyright 1995-2025 Free Software Foundation, Inc. +Copyright 1995-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/src/hello.c b/src/hello.c index 81cff50..c6b4698 100644 --- a/src/hello.c +++ b/src/hello.c @@ -1,6 +1,6 @@ /* hello.c -- print a greeting message and exit. - Copyright 1992-2025 Free Software Foundation, Inc. + Copyright 1992-2026 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system.h b/src/system.h index 5b521b8..97ad7a5 100644 --- a/src/system.h +++ b/src/system.h @@ -1,6 +1,6 @@ /* system.h: system-dependent declarations; include this first. - Copyright 1996-2025 Free Software Foundation, Inc. + Copyright 1996-2026 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/ChangeLog b/tests/ChangeLog index 2a41ae9..80781e0 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -46,7 +46,7 @@ Mon Dec 30 17:29:37 1996 Karl Eichwalder <[email protected]> * testdata: Copied from `../src/'. -Copyright 1996-2025 Free Software Foundation, Inc. +Copyright 1996-2026 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/tests/atexit-1 b/tests/atexit-1 index c0fb068..2d906f1 100755 --- a/tests/atexit-1 +++ b/tests/atexit-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test atexit handling. # -# Copyright (C) 2019-2025 Free Software Foundation, Inc. +# Copyright (C) 2019-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/greeting-1 b/tests/greeting-1 index 461b09d..d32285e 100755 --- a/tests/greeting-1 +++ b/tests/greeting-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test arbitrary --greeting. # -# Copyright (C) 2001-2025 Free Software Foundation, Inc. +# Copyright (C) 2001-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/greeting-2 b/tests/greeting-2 index e2ff89b..3b83704 100755 --- a/tests/greeting-2 +++ b/tests/greeting-2 @@ -2,7 +2,7 @@ # Test very long --greeting argument, and also show skipping a test. # (And one way to compute full moons.) # -# Copyright (C) 2001-2025 Free Software Foundation, Inc. +# Copyright (C) 2001-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/hello-1 b/tests/hello-1 index ec3379c..46a4a0e 100755 --- a/tests/hello-1 +++ b/tests/hello-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test standard GNU greeting. # -# Copyright (C) 2001-2025 Free Software Foundation, Inc. +# Copyright (C) 2001-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/last-1 b/tests/last-1 index 48ebaff..e147c79 100755 --- a/tests/last-1 +++ b/tests/last-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test that last greeting option specified is what counts. # -# Copyright 2008-2025 Free Software Foundation, Inc. +# Copyright 2008-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/operand-1 b/tests/operand-1 index 8c8c93b..a48a680 100755 --- a/tests/operand-1 +++ b/tests/operand-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test extra operands fail correct way. # -# Copyright (C) 2019-2025 Free Software Foundation, Inc. +# Copyright (C) 2019-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/traditional-1 b/tests/traditional-1 index f6df33d..dc0509e 100755 --- a/tests/traditional-1 +++ b/tests/traditional-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test traditional greeting. # -# Copyright (C) 2001-2025 Free Software Foundation, Inc. +# Copyright (C) 2001-2026 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright -- 2.52.0
>From 570fb07b70cff385de7dd70c5316aa764eb107cd Mon Sep 17 00:00:00 2001 Message-ID: <570fb07b70cff385de7dd70c5316aa764eb107cd.1767484791.git.collin.fu...@gmail.com> In-Reply-To: <b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b.1767484791.git.collin.fu...@gmail.com> References: <b5a763c1e6ace81f4fd89c2c8516b445e5a08e7b.1767484791.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sat, 3 Jan 2026 15:50:43 -0800 Subject: [PATCH 3/3] maint: fix 'make syntax-check' failure * doc/.gitignore: Add a newline so the sc_prohibit_empty_lines_at_EOF syntax-check no longer fails. --- doc/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/.gitignore b/doc/.gitignore index 6e95f6d..b52d18e 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,4 +1,4 @@ /version.texi /gendocs_template /gendocs_template_min -/manual/ \ No newline at end of file +/manual/ -- 2.52.0
