diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ba68ed6..63a1f3a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -4,7 +4,7 @@ # Author: Copyright (C) 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Configuration file for GitHub Actions build tests. Perform a standard # @@ -21,6 +21,7 @@ # 27/02/2021 MG 1.0.1 Initial release. # # 11/11/2021 MG 1.0.2 Get tags as needed for git-enhanced # # AC_INIT. # +# 22/11/2021 MG 1.0.3 Tighten SPDX tag. # # # ######################################################################### diff --git a/Makefile.am b/Makefile.am index ab27870..684bb1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ # Author: Copyright (C) 2014-2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Automake script file to generate agmaint project from source. # @@ -48,6 +48,7 @@ # by make distcheck. # # 21/05/2020 MG 1.0.11 Add sysconfdir and pkgdatadir support. # # 08/11/2021 MG 1.0.12 Add misc directory to DIST. # +# 22/11/2021 MG 1.0.13 Tighten SPDX tag. # # # ######################################################################### diff --git a/configure.ac b/configure.ac index df3be54..1a9d24b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # Author: Copyright (C) 2014-2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Autoconfigure script file to configure agmaint project. # @@ -83,6 +83,7 @@ # 11/11/2021 MG 1.1.5 If git is available and we are inside a # # git tree then use git describe to add # # further package version information. # +# 22/11/2021 MG 1.1.6 Tighten SPDX tag. # # # ######################################################################### @@ -93,7 +94,7 @@ # # ######################################### -AC_REVISION([$Revision: 1.1.5 $]) +AC_REVISION([$Revision: 1.1.6 $]) AC_PREREQ([2.69]) diff --git a/src/data/pkgdata/trusted.sh.d/Makefile.am b/src/data/pkgdata/trusted.sh.d/Makefile.am index 0019c4b..dc3d567 100644 --- a/src/data/pkgdata/trusted.sh.d/Makefile.am +++ b/src/data/pkgdata/trusted.sh.d/Makefile.am @@ -4,7 +4,7 @@ # Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Automake script file to generate apt key scripts from source. # @@ -19,6 +19,7 @@ # # # 21/05/2020 MG 1.0.1 Created. # # 13/03/2021 MG 1.0.2 Remove Bintray as it is stopping. # +# 22/11/2021 MG 1.0.3 Tighten SPDX tag. # # # ######################################################################### diff --git a/src/data/pkgdata/trusted.sh.d/add-hermes.sh.in b/src/data/pkgdata/trusted.sh.d/add-hermes.sh.in index 91d5d2b..e615e53 100644 --- a/src/data/pkgdata/trusted.sh.d/add-hermes.sh.in +++ b/src/data/pkgdata/trusted.sh.d/add-hermes.sh.in @@ -12,7 +12,7 @@ # Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To add a hermes apt key to a trusted apt keyring in the apt # @@ -61,6 +61,7 @@ # 14/03/2021 MG 1.0.2 Use hermes FQDN otherwise it does not # # work in Ubuntu containers. # # 25/04/2021 MG 1.0.3 Prefer curl to wget. # +# 22/11/2021 MG 1.0.4 Tighten SPDX tag. # # # ######################################################################### @@ -71,7 +72,7 @@ set -e ################## # Init variables # ################## -readonly version=1.0.3 # Script version +readonly version=1.0.4 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/data/pkgdata/trusted.sh.d/add-mgrant-utils-ppa.sh.in b/src/data/pkgdata/trusted.sh.d/add-mgrant-utils-ppa.sh.in index de8721b..edf4e28 100644 --- a/src/data/pkgdata/trusted.sh.d/add-mgrant-utils-ppa.sh.in +++ b/src/data/pkgdata/trusted.sh.d/add-mgrant-utils-ppa.sh.in @@ -9,10 +9,10 @@ ######################################################################### # # # Script ID: add-mgrant-utils-ppa.sh # -# Author: Copyright (C) 2020 Mark Grant # +# Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To add apt keys for package signer and ppa for the Launchpad # @@ -58,6 +58,7 @@ # Date Author Version Description # # # # 22/05/2020 MG 1.0.1 Created. # +# 22/11/2021 MG 1.0.2 Tighten SPDX tag. # # # ######################################################################### @@ -68,7 +69,7 @@ set -e ################## # Init variables # ################## -readonly version=1.0.1 # Script version +readonly version=1.0.2 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/data/pkgdata/trusted.sh.d/add-obs-debian.sh.in b/src/data/pkgdata/trusted.sh.d/add-obs-debian.sh.in index facdad4..c47cd4b 100644 --- a/src/data/pkgdata/trusted.sh.d/add-obs-debian.sh.in +++ b/src/data/pkgdata/trusted.sh.d/add-obs-debian.sh.in @@ -12,7 +12,7 @@ # Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To add apt keys for supported Debian releases at the openSUSE Build # @@ -61,6 +61,7 @@ # 22/05/2020 MG 1.0.1 Created. # # 25/04/2021 MG 1.0.2 Prefer curl to wget. # # 18/08/2021 MG 1.0.3 Add bullseye. # +# 22/11/2021 MG 1.0.4 Tighten SPDX tag. # # # ######################################################################### @@ -71,7 +72,7 @@ set -e ################## # Init variables # ################## -readonly version=1.0.2 # Script version +readonly version=1.0.4 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/data/pkgdata/trusted.sh.d/add-obs-raspbian.sh.in b/src/data/pkgdata/trusted.sh.d/add-obs-raspbian.sh.in index d8d2742..c21b518 100644 --- a/src/data/pkgdata/trusted.sh.d/add-obs-raspbian.sh.in +++ b/src/data/pkgdata/trusted.sh.d/add-obs-raspbian.sh.in @@ -12,7 +12,7 @@ # Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To add apt keys for supported Raspbian releases at the openSUSE Build # @@ -60,6 +60,7 @@ # # # 22/05/2020 MG 1.0.1 Created. # # 25/04/2021 MG 1.0.2 Prefer curl to wget. # +# 22/11/2021 MG 1.0.3 Tighten SPDX tag. # # # ######################################################################### @@ -70,7 +71,7 @@ set -e ################## # Init variables # ################## -readonly version=1.0.2 # Script version +readonly version=1.0.3 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/data/pkgdata/trusted.sh.d/add-raspberrypi.sh.in b/src/data/pkgdata/trusted.sh.d/add-raspberrypi.sh.in index c234d65..a6a0631 100644 --- a/src/data/pkgdata/trusted.sh.d/add-raspberrypi.sh.in +++ b/src/data/pkgdata/trusted.sh.d/add-raspberrypi.sh.in @@ -12,7 +12,7 @@ # Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To add a raspberrypi.org apt key to a trusted apt keyring in the apt # @@ -59,6 +59,7 @@ # # # 22/05/2020 MG 1.0.1 Created. # # 25/04/2021 MG 1.0.2 Prefer curl to wget. # +# 22/11/2021 MG 1.0.3 Tighten SPDX tag. # # # ######################################################################### @@ -69,7 +70,7 @@ set -e ################## # Init variables # ################## -readonly version=1.0.2 # Script version +readonly version=1.0.3 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/data/sysconf/Makefile.am b/src/data/sysconf/Makefile.am index 8e27ccd..c527188 100644 --- a/src/data/sysconf/Makefile.am +++ b/src/data/sysconf/Makefile.am @@ -1,10 +1,10 @@ ######################################################################### # # # Script ID: src/data/sysconf/Makefile.am # -# Author: Copyright (C) 2020 Mark Grant # +# Author: Copyright (C) 2020, 2021 Mark Grant # # # -# Released under the GPLv3 or later. # -# SPDX-License-Identifier: GPL-3.0-or-later # +# Released under the GPLv3 only. # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # AutoMake script file for the sysconf directory. # @@ -18,6 +18,7 @@ # Date Author Version Description # # # # 21/05/2020 MG 1.0.1 Created. # +# 22/11/2021 MG 1.0.2 Tighten SPDX tag. # # # ######################################################################### diff --git a/src/man/8/Makefile.am b/src/man/8/Makefile.am index 6c30a59..4d579f0 100644 --- a/src/man/8/Makefile.am +++ b/src/man/8/Makefile.am @@ -1,10 +1,10 @@ ######################################################################### # # # Script ID: src/man/8/Makefile.am # -# Author: Copyright (C) 2014-2020 Mark Grant # +# Author: Copyright (C) 2014-2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Automake script file to generate agmaint manual pages from source. # @@ -35,6 +35,7 @@ # 22/09/2019 MG 1.0.8 Remove shebang. # # 22/05/2020 MG 1.0.9 Rename script to have .sh extension. # # Add apt-key-scripts.sh man page. # +# 22/11/2021 MG 1.0.10 Tighten SPDX tag. # # # ######################################################################### diff --git a/src/man/8/agmaint.sh.8.man.in b/src/man/8/agmaint.sh.8.man.in index 3172ed9..40d49e1 100644 --- a/src/man/8/agmaint.sh.8.man.in +++ b/src/man/8/agmaint.sh.8.man.in @@ -24,9 +24,9 @@ Written by Mark Grant. REPORTING BUGS Report bugs to COPYRIGHT -Copyright (C) 2014-2017, 2019, 2020 Mark Grant. +Copyright (C) 2014-2017, 2019-2021 Mark Grant. .br -License GPLv3+: GNU GPL version 3 or later +License GPLv3: GNU GPL version 3 only .br . .br diff --git a/src/man/8/apt-key-scripts.sh.8.man.in b/src/man/8/apt-key-scripts.sh.8.man.in index 570d0f3..320ef61 100644 --- a/src/man/8/apt-key-scripts.sh.8.man.in +++ b/src/man/8/apt-key-scripts.sh.8.man.in @@ -60,7 +60,7 @@ Written by Mark Grant. COPYRIGHT Copyright (C) 2020, 2021 Mark Grant. .br -License GPLv3+: GNU GPL version 3 or later +License GPLv3: GNU GPL version 3 only .br . .br diff --git a/src/prg/bash/Makefile.am b/src/prg/bash/Makefile.am index 991d502..d764e17 100644 --- a/src/prg/bash/Makefile.am +++ b/src/prg/bash/Makefile.am @@ -1,10 +1,10 @@ ######################################################################### # # # Script ID: src/prg/bash/Makefile.am # -# Author: Copyright (C) 2014-2020 Mark Grant # +# Author: Copyright (C) 2014-2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # Automake script file to generate agmaint script from source. # @@ -31,6 +31,7 @@ # 22/09/2019 MG 1.0.8 Remove shebang. # # 21/05/2020 MG 1.0.9 Change script extension .sh # # Add apt-key-scripts.sh # +# 22/11/2021 MG 1.0.10 Tighten SPDX tag. # # # ######################################################################### diff --git a/src/prg/bash/agmaint.sh.in b/src/prg/bash/agmaint.sh.in index e2a208f..802c0ca 100644 --- a/src/prg/bash/agmaint.sh.in +++ b/src/prg/bash/agmaint.sh.in @@ -9,10 +9,10 @@ ######################################################################### # # # Script ID: agmaint.sh # -# Author: Copyright (C) 2014-2017, 2019, 2020 Mark Grant # +# Author: Copyright (C) 2014-2017, 2019-2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To simplify the running of daily apt-get maintenance commands. # @@ -80,6 +80,7 @@ # 21/05/2020 MG 1.1.1 Change script to .sh extension. # # 03/06/2020 MG 1.1.2 Pass CLA's after a -- straight to the # # apt-get commands. # +# 22/11/2021 MG 1.1.3 Tighten SPDX tag. # # # ######################################################################### @@ -87,7 +88,7 @@ ################## # Init variables # ################## -readonly version=1.1.2 # Script version +readonly version=1.1.3 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version diff --git a/src/prg/bash/apt-key-scripts.sh.in b/src/prg/bash/apt-key-scripts.sh.in index 433de5e..db7ad0f 100644 --- a/src/prg/bash/apt-key-scripts.sh.in +++ b/src/prg/bash/apt-key-scripts.sh.in @@ -9,10 +9,10 @@ ######################################################################### # # # Script ID: apt-key-scripts.sh # -# Author: Copyright (C) 2020 Mark Grant # +# Author: Copyright (C) 2020, 2021 Mark Grant # # # # Released under the GPLv3 only. # -# SPDX-License-Identifier: GPL-3.0 # +# SPDX-License-Identifier: GPL-3.0-only # # # # Purpose: # # To manage and execute scripts for maintaining apt trusted keys and # @@ -66,6 +66,7 @@ # 22/05/2020 MG 1.0.1 Created. # # 14/06/2020 MG 1.0.2 Ensure functions called by others # # appear first. # +# 22/11/2021 MG 1.0.3 Tighten SPDX tag. # # # ######################################################################### @@ -73,7 +74,7 @@ ################## # Init variables # ################## -readonly version=1.0.2 # Script version +readonly version=1.0.3 # Script version readonly outputprefix="$(basename $0): " readonly packageversion=@pkgversion@ # Package version