Re: [PR PATCH] [Updated] Linting pass 1 of many for SPDX errors, covers all packages starting with digits and a

[heliocat <heliocat@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint
https://github.com/void-linux/void-packages/pull/29738

Linting pass 1 of many for SPDX errors, covers all packages starting with digits and a
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29738.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint-29738.patch --]
[-- Type: text/x-diff, Size: 16303 bytes --]

From 9e1f37d6caf71aec96cf57409afe72f02e7fe8d6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 18:41:00 -0700
Subject: [PATCH 01/15] liba52: fix license

---
 srcpkgs/liba52/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template
index f0ae78985cb6..f94b04c876d1 100644
--- a/srcpkgs/liba52/template
+++ b/srcpkgs/liba52/template
@@ -1,14 +1,14 @@
 # Template file for 'liba52'
 pkgname=liba52
 version=0.7.4
-revision=8
+revision=9
 wrksrc="a52dec-${version}"
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="automake libtool"
 short_desc="Free ATSC A/52 stream decoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://liba52.sourceforge.net/"
 distfiles="http://liba52.sourceforge.net/files/a52dec-${version}.tar.gz"
 checksum=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33

From e9be09850824b8dc598de3bf4e8cb80322004498 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 18:46:48 -0700
Subject: [PATCH 02/15] 9base: fix license, note LPL exceptions, fix download
 URL

---
 srcpkgs/9base/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template
index feade2c2eb4f..5ae9c4916a20 100644
--- a/srcpkgs/9base/template
+++ b/srcpkgs/9base/template
@@ -1,7 +1,7 @@
-# Template file for '9base'.
+# Template file for '9base'
 pkgname=9base
 version=6.0.20190911
-revision=1
+revision=2
 _githash=63916da7bd6d73d9a405ce83fc4ca34845667cce
 wrksrc="9base-${_githash}"
 build_style=gnu-makefile
@@ -9,10 +9,10 @@ build_style=gnu-makefile
 hostmakedepends="byacc"
 short_desc="Revived minimalist port of Plan 9 userland to Unix"
 maintainer='Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>'
-license="custom"
+license="MIT, custom:LPL-1.02 with exceptions"
 homepage="http://git.suckless.org/9base"
 # Checked out from http://git.suckless.org/9base/ and created tarball with 'git archive'.
-distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.gz"
+distfiles="https://sources.voidlinux.org/9base-${version}/9base-${_githash}.tar.gz"
 checksum=bb8cd1e0060824914839fd090353971862a1025ae4b8ea5d1e99618ddd1b160f
 conflicts="plan9port"
 provides="plan9port-20160418_4"

From 38fc2c9e73704f0b08d1b4965e177cc0e1490771 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 18:51:56 -0700
Subject: [PATCH 03/15] aalib: fix license

---
 srcpkgs/aalib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template
index 5181baec748b..7102b7e95f6c 100644
--- a/srcpkgs/aalib/template
+++ b/srcpkgs/aalib/template
@@ -1,14 +1,14 @@
 # Template file for 'aalib'
 pkgname=aalib
 version=1.4rc5
-revision=1
+revision=2
 wrksrc="aalib-1.4.0"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Portable ASCII art GFX library"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
 homepage="http://aa-project.sourceforge.net/aalib/"
-license="LGPL-2"
 distfiles="${SOURCEFORGE_SITE}/aa-project/${pkgname}-${version}.tar.gz"
 checksum=fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee
 

From e1a22fc81e62ba6e08a1864c9608ff882802a169 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 18:54:50 -0700
Subject: [PATCH 04/15] abook: fix license

---
 srcpkgs/abook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/abook/template b/srcpkgs/abook/template
index 084c78f74ec5..9538e8d1f4da 100644
--- a/srcpkgs/abook/template
+++ b/srcpkgs/abook/template
@@ -1,14 +1,14 @@
 # Template file for 'abook'
 pkgname=abook
 version=0.6.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gettext gettext-devel tar"
 makedepends="ncurses-devel readline-devel"
+short_desc="Text-based addressbook designed to use with mutt mail client"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://abook.sourceforge.net/"
-short_desc="Text-based addressbook designed to use with mutt mail client"
 distfiles="http://abook.sourceforge.net/devel/${pkgname}-${version}.tar.gz"
 checksum=f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9
 

From ba4c69415e8073bc5ce1578dbd1bfdf398744dbb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 18:59:10 -0700
Subject: [PATCH 05/15] abootimg: fix license, fix template ordering

---
 srcpkgs/abootimg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/abootimg/template b/srcpkgs/abootimg/template
index 8a39564185e5..e35e4fbb366f 100644
--- a/srcpkgs/abootimg/template
+++ b/srcpkgs/abootimg/template
@@ -1,14 +1,14 @@
 # Template file for 'abootimg'
 pkgname=abootimg
 version=0.6.20160512
-revision=1
+revision=2
 _commit="1ebeb393252ab5aeed62e34bc439b6728444f06e"
-build_style=gnu-makefile
 wrksrc="abootimg-$_commit-$_commit"
+build_style=gnu-makefile
 makedepends="libblkid-devel"
 short_desc="Manipulate Android Boot Images"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://gitorious.org/ac100/abootimg"
 distfiles="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$_commit>archive.tar.gz"
 checksum=36efff208101a8d04cc84085849cda3300cea71f062c8d425c534e5f85f6cc3f

From 52d995bdc199bc7e7b76c4f1119b2c47227c6716 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 19:04:01 -0700
Subject: [PATCH 06/15] advancecomp: fix license, update short_desc

---
 srcpkgs/advancecomp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/advancecomp/template b/srcpkgs/advancecomp/template
index bca9d61ef55d..ac70d3fd7a89 100644
--- a/srcpkgs/advancecomp/template
+++ b/srcpkgs/advancecomp/template
@@ -1,12 +1,12 @@
 # Template file for 'advancecomp'
 pkgname=advancecomp
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="zlib-devel"
-short_desc="A collection of recompression utilities for ZIP/PNG/GZ"
+short_desc="Command-line recompression utilities for ZIP/PNG/GZ"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.advancemame.it/comp-readme.html"
 distfiles="https://github.com/amadvance/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8

From a27087475343740b529b0d9fe2aa8b886acb5ce3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 19:10:12 -0700
Subject: [PATCH 07/15] airspy: fix license

---
 srcpkgs/airspy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/airspy/template b/srcpkgs/airspy/template
index 1665d72f6270..a81e3470d205 100644
--- a/srcpkgs/airspy/template
+++ b/srcpkgs/airspy/template
@@ -1,7 +1,7 @@
 # Template file for 'airspy'
 pkgname=airspy
 version=1.0.9
-revision=1
+revision=2
 wrksrc=airspyone_host-${version}
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libusb-devel"
 _desc="Tiny and efficient software defined radio (SDR)"
 short_desc="${_desc} - tools"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://airspy.com/"
 distfiles="https://github.com/airspy/airspyone_host/archive/v${version}.tar.gz"
 checksum=967ef256596d4527b81f007f77b91caec3e9f5ab148a8fec436a703db85234cc

From eb5ac882667f1566ab75251971591e873c2b41cc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 19:11:23 -0700
Subject: [PATCH 08/15] aldo: fix license

---
 srcpkgs/aldo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aldo/template b/srcpkgs/aldo/template
index b4b0a75498b5..7d2feccb68c6 100644
--- a/srcpkgs/aldo/template
+++ b/srcpkgs/aldo/template
@@ -1,12 +1,12 @@
 # Template file for 'aldo'
 pkgname=aldo
 version=0.7.7
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libao-devel"
 short_desc="Morse code learning tool with four training methods"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.nongnu.org/aldo/"
 distfiles="${NONGNU_SITE}/aldo/aldo-${version}.tar.bz2"
 checksum=f1b8849d09267fff3c1f5122097d90fec261291f51b1e075f37fad8f1b7d9f92

From c8e4a89b9d0672fd8cc3eddde0ac150bd6193395 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 19:12:48 -0700
Subject: [PATCH 09/15] an: fix license

---
 srcpkgs/an/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 85e94f7bc72c..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,13 +1,13 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=6
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
 short_desc="Very fast anagram generator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/an"
 distfiles="${DEBIAN_SITE}/main/a/an/an_${version}.orig.tar.xz"
 checksum=b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5

From 5aa48bd452743930de0afd5471f8dca7b7d8603b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 19:24:40 -0700
Subject: [PATCH 10/15] aoeui: fix license

---
 srcpkgs/aoeui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aoeui/template b/srcpkgs/aoeui/template
index 52bc1a822bd7..603c89d6cd72 100644
--- a/srcpkgs/aoeui/template
+++ b/srcpkgs/aoeui/template
@@ -1,14 +1,14 @@
 # Template file for 'aoeui'
 pkgname=aoeui
 version=1.7
-revision=6
+revision=7
 _githash=4e5dee93ebbaf5bd7bd7da80ce34b2eef196cd08
 wrksrc="${pkgname}-${_githash}"
 build_style=gnu-makefile
 hostmakedepends="m4"
 short_desc="Lightweight UNIX-friendly text editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pklausler/aoeui"
 distfiles="https://github.com/pklausler/aoeui/archive/${_githash}.tar.gz"
 checksum=3b06c7950b0fcbdfe57e78de8cb9b9d7af141932459a32d72a029f96839d667f

From c803f022ce89449d9b951c48f37fb6bb7c16c987 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:07:26 -0700
Subject: [PATCH 11/15] armagetronad: verify python version, fix license

---
 srcpkgs/armagetronad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index b6c02bdf7fba..54dbe663f39c 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -1,7 +1,7 @@
 # Template file for 'armagetronad'
 pkgname=armagetronad
 version=0.2.8.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/games/${pkgname}/*.cfg
  /etc/games/${pkgname}/*.srv"
@@ -11,11 +11,11 @@ makedepends="libX11-devel libxml2-devel libICE-devel libpng-devel glu-devel
  libjpeg-turbo-devel SDL_image-devel SDL_mixer-devel"
 short_desc="3D Lightcycle game from the movie Tron with advanced capabilities"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://armagetronad.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
 checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
-python_version=2 #unverified
+python_version=2
 
 do_configure() {
 	mkdir build_dedicated

From 0e1490d60368c9f63bffbeec507b659cd7335baa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:22:53 -0700
Subject: [PATCH 12/15] arpwatch: fix license

---
 srcpkgs/arpwatch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arpwatch/template b/srcpkgs/arpwatch/template
index 5eb0da24e5d7..84c9624a49ec 100644
--- a/srcpkgs/arpwatch/template
+++ b/srcpkgs/arpwatch/template
@@ -1,12 +1,12 @@
 # Template file for 'arpwatch'
 pkgname=arpwatch
 version=2.1a15
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Ethernet/FDDI station activity monitor"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD"
+license="BSD-3-Clause-LBNL"
 homepage="ftp://ftp.ee.lbl.gov"
 distfiles="ftp://ftp.ee.lbl.gov/$pkgname-$version.tar.gz"
 checksum=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898

From 280cfdc1615e1e809f2caa207f3f03c01aba27ba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:25:44 -0700
Subject: [PATCH 13/15] ascii: fix license

---
 srcpkgs/ascii/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ascii/template b/srcpkgs/ascii/template
index 0e391d49b21a..87d8edd27fe8 100644
--- a/srcpkgs/ascii/template
+++ b/srcpkgs/ascii/template
@@ -1,10 +1,10 @@
 # Template file for 'ascii'
 pkgname=ascii
 version=3.18
-revision=1
+revision=2
 short_desc="List ASCII idiomatic names and octal/decimal code-point forms"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://www.catb.org/~esr/ascii"
 distfiles="http://www.catb.org/~esr/ascii/ascii-${version}.tar.gz"
 checksum=728422d5f4da61a37a17b4364d06708e543297de0a5f70305243236d80df072d

From fd46654104b03fb3ee41f40290b087a25331bfaf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:32:44 -0700
Subject: [PATCH 14/15] assimp: fix license, reorder template

---
 srcpkgs/assimp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index 4dbfa000916e..f521d3922e05 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -1,18 +1,18 @@
 # Template file for 'assimp'
 pkgname=assimp
 version=5.0.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DASSIMP_BUILD_SAMPLES=OFF"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
+depends="libassimp>=${version}_${revision}"
 short_desc="Import library for various well-known 3D model formats"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
-depends="libassimp>=${version}_${revision}"
 
 post_install() {
 	vlicense LICENSE

From 8f973458d309e6cf907a0182f578c474495d396c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:36:46 -0700
Subject: [PATCH 15/15] at: fix license, reorder template

---
 srcpkgs/at/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/at/template b/srcpkgs/at/template
index 9caa1a53e63f..172ab638ee48 100644
--- a/srcpkgs/at/template
+++ b/srcpkgs/at/template
@@ -1,21 +1,21 @@
 # Template file for 'at'
 pkgname=at
 version=3.1.23
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-jobdir=/var/spool/atd --with-atspool=/var/spool/atd
  --sbindir=/usr/bin --with-daemon_username=at --with-daemon_groupname=at
  SENDMAIL=/usr/sbin/sendmail"
-disable_parallel_build=yes
 hostmakedepends="flex"
 makedepends="pam-devel libfl-devel"
 depends="virtual?smtp-server"
 short_desc="Run commands at a specified time"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://packages.qa.debian.org/a/at.html"
 distfiles="${DEBIAN_SITE}/main/a/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710
+disable_parallel_build=yes
 
 conf_files="/etc/at.deny"
 system_accounts="at"