[PR PATCH] Omnibus linting pass for SPDX warnings - most packages starting with H

[PR PATCH] Omnibus linting pass for SPDX warnings - most packages starting with H

[heliocat]

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

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_h
https://github.com/void-linux/void-packages/pull/30223

Omnibus linting pass for SPDX warnings - most packages starting with H
<!-- 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.)
- [x] I built this PR locally for my native architecture, (x86_6)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 474a2541b1afe11c07c5f137c857081c999703f4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 18:34:28 -0700
Subject: [PATCH 1/8] hans: fix license

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

diff --git a/srcpkgs/hans/template b/srcpkgs/hans/template
index 58624c9802c7..6a63dbd5f327 100644
--- a/srcpkgs/hans/template
+++ b/srcpkgs/hans/template
@@ -1,10 +1,10 @@
 # Template file for 'hans'
 pkgname=hans
 version=1.0
-revision=1
+revision=2
 short_desc="ICMP tunneling software"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://code.gerade.org/hans/"
 distfiles="https://github.com/friedrich/$pkgname/archive/v$version.tar.gz"
 checksum=53090083d440466e573b35f2eeab0b4b0dcd3e6290f797c999b4f5a0b5caaba2

From d91fb3d940ebd7dd8f7c4de35e1be97da249baf7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 21:47:42 -0700
Subject: [PATCH 2/8] hdf5: clarify license

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

diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template
index e035fa670ab7..915d287cd32f 100644
--- a/srcpkgs/hdf5/template
+++ b/srcpkgs/hdf5/template
@@ -1,14 +1,14 @@
 # Template file for 'hdf5'
 pkgname=hdf5
 version=1.10.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-cxx --enable-fortran"
 hostmakedepends="gcc-fortran"
 makedepends="zlib-devel"
 short_desc="Data model, library, and file format for storing and managing data"
 maintainer="pulux <pulux@pf4sh.de>"
-license="custom"
+license="custom:BSD-3-Clause-LBNL-alike"
 homepage="https://hdfgroup.org"
 distfiles="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"
 checksum=6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8

From 673c2286ddfd2f43c90260e5476d0ff654d703fc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:00:18 -0700
Subject: [PATCH 3/8] hex2hcd: fix license

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

diff --git a/srcpkgs/hex2hcd/template b/srcpkgs/hex2hcd/template
index 60e4997021ab..c8d066ed3a45 100644
--- a/srcpkgs/hex2hcd/template
+++ b/srcpkgs/hex2hcd/template
@@ -1,12 +1,12 @@
 # Template file for 'hex2hcd'
 pkgname=hex2hcd
 version=2016.02.21
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Convert *.hex firmware files to *.hcd format"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/antonio-malcolm/hex2hcd"
-license="GPL-2"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=45cab33daa404c6e66979abea975f11cb5705152c7723a2a16391f5fd1ba847b
 conflicts="bluez" # /usr/bin/hex2hcd

From ec1f478743fb14411c590dff32d2edd797f32435 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:02:22 -0700
Subject: [PATCH 4/8] heyu: fix license

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

diff --git a/srcpkgs/heyu/template b/srcpkgs/heyu/template
index 6c2999fd29f5..93b3ad7cc582 100644
--- a/srcpkgs/heyu/template
+++ b/srcpkgs/heyu/template
@@ -1,13 +1,13 @@
 # Template file for 'heyu'
 pkgname=heyu
 version=2.10.1
-revision=2
+revision=3
 build_style=configure
 configure_script="./Configure"
 configure_args="linux"
 short_desc="X10 automation for Linux"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.heyu.org"
 distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz"
 checksum=621a20f45eef62070b3f95ad17ecbc3e7e1f7352d25dac86093ff6938b606baa

From 26206cc644a141a0501ae0356176ddc910759b32 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:18:23 -0700
Subject: [PATCH 5/8] hnb: fix license

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

diff --git a/srcpkgs/hnb/template b/srcpkgs/hnb/template
index 5721e32d121c..45460afa1fd1 100644
--- a/srcpkgs/hnb/template
+++ b/srcpkgs/hnb/template
@@ -1,11 +1,11 @@
 # Template file for 'hnb'
 pkgname=hnb
 version=1.9.17
-revision=2
+revision=3
 makedepends="ncurses-devel"
-short_desc="A curses program to structure many kinds of data in one place"
+short_desc="Curses program to structure many kinds of data in one place"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://hnb.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/hnb/hnb/${version}/hnb-${version}.tar.gz"
 checksum=c233c00aaef5b7fb93759d7888c885f99f40aec689a7f3e0d5d8b5797bf80cd4

From 657da6d2127a8907dcddbf136661da00f5f1fb81 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:25:12 -0700
Subject: [PATCH 6/8] httpry: fix license, other lint

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

diff --git a/srcpkgs/httpry/template b/srcpkgs/httpry/template
index fca0351703bc..b1f1890cdaca 100644
--- a/srcpkgs/httpry/template
+++ b/srcpkgs/httpry/template
@@ -1,19 +1,19 @@
 # Template file for 'httpry'
 pkgname=httpry
 version=0.1.8
-revision=1
+revision=2
+wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
 makedepends="libpcap-devel"
 short_desc="HTTP logging and information retrieval tool"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
+license="GPL-2.0-only"
 homepage="http://dumpsterventures.com/jason/httpry/"
-license="GPL-2"
 distfiles="https://github.com/jbittel/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=b3bcbec3fc6b72342022e940de184729d9cdecb30aa754a2c994073447468cf0
-wrksrc="${pkgname}-${pkgname}-${version}"
 
 post_extract() {
-	sed -i -e'/^CC /d' \
+	vsed -i -e'/^CC /d' \
 		-e 's/^CCFLAGS .*/CCFLAGS=$(CFLAGS) $(LDFLAGS)/' Makefile
 }
 

From 303c45599628afa106e93da98dd955ed05877ed7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:31:04 -0700
Subject: [PATCH 7/8] httrack: fix license, other lint

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

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 090ec56ca85d..31dcf7ebe1e9 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,16 +1,16 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
-short_desc="A free and easy-to-use offline browser utility"
+makedepends="zlib-devel openssl-devel"
+short_desc="Free and easy-to-use offline browser utility"
 maintainer="mid-kid <esteve.varela@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 40a6f8573c749dbd241674165fe9efc0e03149f2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:37:57 -0700
Subject: [PATCH 8/8] hyphen: fix license

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

diff --git a/srcpkgs/hyphen/template b/srcpkgs/hyphen/template
index 601c94277c09..3bbc84659c41 100644
--- a/srcpkgs/hyphen/template
+++ b/srcpkgs/hyphen/template
@@ -1,16 +1,20 @@
-# Template file for 'altlinuxHyph'
+# Template file for 'hyphen'
 pkgname=hyphen
 version=2.8.8
-revision=2
+revision=3
 build_style=gnu-configure
-short_desc="ALTLinux hyphenation library"
 hostmakedepends="perl"
+short_desc="ALTLinux hyphenation library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1"
 homepage="http://sourceforge.net/projects/hunspell/files/Hyphen"
 distfiles="${SOURCEFORGE_SITE}/hunspell/$pkgname-$version.tar.gz"
 checksum=304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 
+post_install() {
+	vlicense COPYING
+}
+
 hyphen-tools_package() {
 	depends="hyphen>=${version}_${revision}"
 	short_desc+=" - tools"

Re: [PR PATCH] [Merged]: Omnibus linting pass for SPDX warnings - most packages starting with H

[ericonr]

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

There's a merged pull request on the void-packages repository

Omnibus linting pass for SPDX warnings - most packages starting with H
https://github.com/void-linux/void-packages/pull/30223

Description:
<!-- 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.)
- [x] I built this PR locally for my native architecture, (x86_6)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl