From 539f09761c0b1f77707bb30f5621695d0a9f7bc3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 10 Jun 2021 19:16:22 +0200 Subject: Add GPL-3.0-or-later SPDX identifier to all scripts Add the SPDX license identifier GPL-3.0-or-later to the header of all scripts without a specific license and upgrading those that are stated as GPL-2.0 to become GPL-3.0-or-later. --- arch-nspawn.in | 10 +--------- archbuild.in | 3 ++- archco.in | 3 ++- archrelease.in | 3 ++- bash_completion.in | 3 ++- checkpkg.in | 3 ++- commitpkg.in | 3 ++- crossrepomove.in | 3 ++- find-libdeps.in | 3 ++- finddeps.in | 2 +- lddd.in | 2 +- lib/archroot.sh | 3 ++- lib/common.sh | 5 +++-- lib/valid-repos.sh | 3 ++- lib/valid-tags.sh | 3 ++- makechrootpkg.in | 10 +--------- makerepropkg.in | 17 +++-------------- mkarchroot.in | 10 +--------- offload-build.in | 18 +++--------------- rebuildpkgs.in | 3 ++- sogrep.in | 18 +++--------------- zsh_completion.in | 3 ++- 22 files changed, 43 insertions(+), 88 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index a612624..275cff7 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/archbuild.in b/archbuild.in index 7cd65bd..e6cf19a 100644 --- a/archbuild.in +++ b/archbuild.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/archco.in b/archco.in index 77cc8c4..a93d819 100644 --- a/archco.in +++ b/archco.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/archrelease.in b/archrelease.in index 491e68f..252db28 100644 --- a/archrelease.in +++ b/archrelease.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/valid-tags.sh) diff --git a/bash_completion.in b/bash_completion.in index 9feef74..e7925b3 100644 --- a/bash_completion.in +++ b/bash_completion.in @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later _devtools_compgen() { local i r diff --git a/checkpkg.in b/checkpkg.in index d7c0948..f40989d 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later shopt -s extglob diff --git a/commitpkg.in b/commitpkg.in index eb0fc55..9d1c3aa 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/crossrepomove.in b/crossrepomove.in index a88b722..c028d62 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/find-libdeps.in b/find-libdeps.in index 35094d5..e1423b8 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/finddeps.in b/finddeps.in index 7237d67..05b3530 100644 --- a/finddeps.in +++ b/finddeps.in @@ -2,7 +2,7 @@ # # finddeps - find packages that depend on a given depname # -# License: Unspecified +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/lddd.in b/lddd.in index 908923b..12f8d67 100644 --- a/lddd.in +++ b/lddd.in @@ -2,7 +2,7 @@ # # lddd - find broken library links on your machine # -# License: Unspecified +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/lib/archroot.sh b/lib/archroot.sh index 8f063cd..d7917da 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/lib/common.sh b/lib/common.sh index 12604d8..0092a45 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,7 +1,8 @@ #!/hint/bash +# # This may be included with or without `set -euE` - -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later [[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0 _INCLUDE_COMMON_SH="$(set +o|grep nounset)" diff --git a/lib/valid-repos.sh b/lib/valid-repos.sh index 252fdcf..9ac9639 100644 --- a/lib/valid-repos.sh +++ b/lib/valid-repos.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/lib/valid-tags.sh b/lib/valid-tags.sh index 3cfe046..d628fd1 100644 --- a/lib/valid-tags.sh +++ b/lib/valid-tags.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/makechrootpkg.in b/makechrootpkg.in index d7e4ea9..7944ada 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/makerepropkg.in b/makerepropkg.in index 1b1987b..ec9cd36 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -1,21 +1,10 @@ #!/bin/bash -# makerepropkg - rebuild a package to see if it is reproducible # -# Copyright (c) 2019 by Eli Schwartz +# makerepropkg - rebuild a package to see if it is reproducible # -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/mkarchroot.in b/mkarchroot.in index 11d5eb9..3e08af2 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/offload-build.in b/offload-build.in index d40b004..9e9d71e 100755 --- a/offload-build.in +++ b/offload-build.in @@ -1,22 +1,10 @@ #!/bin/bash # -# offload-build - build a PKGBUILD on a remote server using makechrootpkg. +# offload-build - build a PKGBUILD on a remote server using makechrootpkg. # -# Copyright (c) 2019 by Eli Schwartz -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later source /usr/share/makepkg/util/config.sh diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 704563c..5091dc2 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later # # This script rebuilds a list of packages in order # and reports anything that fails diff --git a/sogrep.in b/sogrep.in index 676d9df..dfdd104 100755 --- a/sogrep.in +++ b/sogrep.in @@ -1,22 +1,10 @@ #!/bin/bash # -# sogrep - find shared library links in an Arch Linux repository. +# sogrep - find shared library links in an Arch Linux repository. # -# Copyright (c) 2019 by Eli Schwartz -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/zsh_completion.in b/zsh_completion.in index 7ff5a69..7a3516a 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,5 +1,6 @@ #compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/valid-tags.sh) m4_include(lib/valid-repos.sh) -- cgit v1.2.3-70-g09d2