Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues - most packages starting with 'O'

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

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

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

https://github.com/heliocat/void-packages lint_o
https://github.com/void-linux/void-packages/pull/30734

Omnibus lint pass for SPDX issues - most packages starting with 'O'
Bunch of messy stuff this go-around so not at all comprehensive in the grand scheme of things.

#### 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_64)
- [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/30734.patch is attached

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

From 97fc6787b8eeede64fc38b52bd596b00329ea868 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 6 May 2021 19:38:35 -0700
Subject: [PATCH 1/9] omxplayer: fix license

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

diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index f20b056f406f..8ffe7a953722 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -1,10 +1,10 @@
 # Template file for 'omxplayer'
 pkgname=omxplayer
 version=20190102
-revision=1
+revision=2
 short_desc="Commandline OMX player for the Raspberry Pi"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/popcornmix/omxplayer"
 
 _commit="f06235cc9690a6d58187514452df8cf8fcdaacec"

From dc9eb80b9bc69c5f0b72a1829978d35a05d54106 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 6 May 2021 20:35:12 -0700
Subject: [PATCH 2/9] openbox: fix license, verify python version, vsed

---
 srcpkgs/openbox/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index fb62d8d4fedb..bbc6012279fb 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -1,7 +1,7 @@
 # Template file for 'openbox'
 pkgname=openbox
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-startup-notification $(vopt_enable svg librsvg)"
 hostmakedepends="automake libtool pkg-config gettext-devel"
@@ -15,11 +15,11 @@ conf_files="
 	/etc/xdg/openbox/autostart"
 short_desc="Standards compliant, fast, light-weight, extensible window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.openbox.org"
 distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
 checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
-python_version=2 #unverified
+python_version=2
 
 # Package build options
 build_options="svg"
@@ -31,9 +31,9 @@ pre_configure() {
 post_install() {
 	rm ${DESTDIR}/usr/bin/{gdm-control,gnome-panel-control}
 
-	sed -i 's:startkde:/usr/bin/\0:' \
+	vsed -i 's:startkde:/usr/bin/\0:' \
 		${DESTDIR}/usr/share/xsessions/openbox-kde.desktop
-	sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
+	vsed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
 		${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop
 }
 openbox-devel_package() {

From 1cf759de8e12b24130ccd110953f1bc28f3fc3d4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 10:53:01 -0700
Subject: [PATCH 3/9] opencsg: fix license, other lint, remove sed in
 do_build()

---
 srcpkgs/opencsg/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 7a3a63cf85d7..7b5e1cd8af06 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -1,21 +1,19 @@
 # Template file for 'opencsg'
-
-pkgname="opencsg"
-version="1.4.2"
-revision=3
-short_desc="A library that does image-based CSG rendering using OpenGL"
+pkgname=opencsg
+version=1.4.2
+revision=4
+wrksrc="OpenCSG-${version}"
+build_wrksrc="src"
+makedepends="glew-devel libfreeglut-devel"
+short_desc="Library for image-based CSG rendering using OpenGL"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.opencsg.org"
 distfiles="http://www.opencsg.org/OpenCSG-${version}.tar.gz"
 checksum="d952ec5d3a2e46a30019c210963fcddff66813efc9c29603b72f9553adff4afb"
-wrksrc="OpenCSG-${version}"
-build_wrksrc="src"
 
-makedepends="glew-devel libfreeglut-devel"
 
 do_build() {
-	sed -i 's@-Wl,-rpath,\.\./lib@@' Makefile	# no rpath
 	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
 }
 

From 2742ba3f9baf333668f50f502f162840f1a7e194 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 11:05:52 -0700
Subject: [PATCH 4/9] open-isns: fix license, remove superfluous post_extract,
 other lint

---
 srcpkgs/open-isns/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index af670232cefb..a19070262746 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,23 +1,19 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
+makedepends="openssl-devel"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/open-iscsi/open-isns"
 distfiles="https://github.com/open-iscsi/open-isns/archive/v${version}.tar.gz"
 checksum=f672ec86b6c9e984843a7a28d76f07e26393499c486f86034b8b18caa8deb556
 
-post_extract() {
-	sed -i 's/ -Werror / /' configure
-}
-
 libisns_package() {
 	short_desc+=" - library"
 	pkg_install() {

From 7bccdb4ac0a48e3a86afe3954a705dbe3037452c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 11:10:49 -0700
Subject: [PATCH 5/9] openobex: fix license, remove superfluous sed

---
 srcpkgs/openobex/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template
index 5fe6faa6089a..b151a9fd6d73 100644
--- a/srcpkgs/openobex/template
+++ b/srcpkgs/openobex/template
@@ -1,14 +1,14 @@
 # Template file for 'openobex'
 pkgname=openobex
 version=1.7.2
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-Source"
 build_style=cmake
 hostmakedepends="pkg-config libxslt docbook-xsl"
 makedepends="libusb-devel libbluetooth-devel eudev-libudev-devel"
 short_desc="OBEX protocol implementation"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://dev.zuckschwerdt.org/openobex/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-Source.tar.gz"
 checksum=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc
@@ -16,8 +16,7 @@ checksum=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc
 replaces="libopenobex>=0"
 
 pre_configure() {
-	sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in
-	sed -i 's|^project ( openobex \(C.*\) )|project ( openobex \1 CXX )|' CMakeLists.txt
+	vsed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in
 }
 
 openobex-devel_package() {

From 7588ad33ecff7a5dce572bcadc22359254d6eeee Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 11:19:16 -0700
Subject: [PATCH 6/9] openspades: fix license

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

diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 216f6dcc3ca5..10a545e52d9b 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
 # into a -data subpackage !!!
 pkgname=openspades
 version=0.1.3
-revision=2
+revision=3
 archs="x86_64* i686*"
 create_wrksrc=true
 build_wrksrc="openspades-${version}"
@@ -16,7 +16,7 @@ makedepends="SDL2_image-devel freealut-devel freetype-devel glew-devel
 depends="libopenal xdg-utils"
 short_desc="Compatible open source client of Ace of Spades 0.75 "
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later, OFL-1.1, OpenSpades-Non-GPL-Pak-License"
+license="GPL-3.0-or-later, OFL-1.1, custom:OpenSpades-Non-GPL-Pak-License"
 homepage="http://openspades.yvt.jp/"
 distfiles="https://github.com/yvt/openspades/archive/v${version}.tar.gz
  https://github.com/yvt/openspades-paks/releases/download/r33/OpenSpadesDevPackage-r33.zip"

From 27bd6ae5024bbcf6ba92ea070fe1791558e693b0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 11:19:51 -0700
Subject: [PATCH 7/9] optipng: fix license

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

diff --git a/srcpkgs/optipng/template b/srcpkgs/optipng/template
index 51fb818c6874..b636b58ec6ce 100644
--- a/srcpkgs/optipng/template
+++ b/srcpkgs/optipng/template
@@ -1,12 +1,12 @@
 # Template file for 'optipng'
 pkgname=optipng
 version=0.7.7
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libpng-devel"
 short_desc="Advanced PNG Optimizer"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://optipng.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452

From 913d20d5564223aef40327b62a9f42226899a295 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 15:21:49 -0700
Subject: [PATCH 8/9] otpw: fix license, other lint

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

diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template
index 03c9c86d6a19..95a6dcfb69b8 100644
--- a/srcpkgs/otpw/template
+++ b/srcpkgs/otpw/template
@@ -1,12 +1,12 @@
 # Template file for 'otpw'
 pkgname=otpw
 version=1.5
-revision=5
+revision=6
 conf_files="/etc/pam.d/ssh-otpw"
 makedepends="pam-devel"
-short_desc="A one-time password login package"
+short_desc="One-time password login package"
 maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://www.cl.cam.ac.uk/~mgk25/otpw.html"
 distfiles="https://www.cl.cam.ac.uk/%7Emgk25/download/otpw-${version}.tar.gz"
 checksum=98aca38a61c7713677b96f24426ca7053480c0fd077d91b1e99bc9f92ccb832a

From a884c91dcd3149ce03bae9072d57b6a937166cca Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 16:28:29 -0700
Subject: [PATCH 9/9] oue: clarify license, update distfile location

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

diff --git a/srcpkgs/oue/template b/srcpkgs/oue/template
index 73b3a74b1e0d..603c3d34e6bf 100644
--- a/srcpkgs/oue/template
+++ b/srcpkgs/oue/template
@@ -1,16 +1,16 @@
 # Template file for 'oue'
 pkgname=oue
 version=2.31
-revision=4
+revision=5
 hostmakedepends="msrc_base-devel"
 makedepends="gdbm-devel"
 depends="msrc_base"
 short_desc="Only unique element filter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:MIT-0-like"
 homepage="http://www.databits.net/~ksb/msrc/local/bin/oue/oue.html"
-distfiles="http://www.npcguild.org/~ksb/rpms/SOURCES/${pkgname}-${version}.tgz"
-checksum=5b559a869ad7dabc8e45c4ce3e3a6bb3e22b8ee7d9e8ebb0e8a4fbf1ab56e821
+distfiles="http://www.databits.net/~ksb/dl/${pkgname}-${version}.tgz"
+checksum=55248f7fd6cdfe56c3d09029624c4144503721058b24fcae664265afef8f2efd
 
 do_build() {
 	CFLAGS+=" $LDFLAGS"