* [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R
@ 2021-05-12 19:44 heliocat
2021-05-12 20:39 ` [PR PATCH] [Updated] " heliocat
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: heliocat @ 2021-05-12 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is a new pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_r
https://github.com/void-linux/void-packages/pull/30825
Omnibus lint pass for SPDX warnings - packages starting with R
<!-- 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_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/30825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_r-30825.patch --]
[-- Type: text/x-diff, Size: 17618 bytes --]
From e1a8a0145e515847ce0d400b976cba3ee0566425 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:28:50 -0700
Subject: [PATCH 01/15] ragel: fix license
---
srcpkgs/ragel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ragel/template b/srcpkgs/ragel/template
index f054f975db31..7e8afaa3232e 100644
--- a/srcpkgs/ragel/template
+++ b/srcpkgs/ragel/template
@@ -1,11 +1,11 @@
# Template file for 'ragel'
pkgname=ragel
version=6.10
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Compile regular languages into executable state machines"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.colm.net/open-source/ragel/"
distfiles="http://www.colm.net/files/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
From f2e8758210348ed62c64b866c08f8cb163d11d1d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:43:30 -0700
Subject: [PATCH 02/15] rage-player: fix license
---
srcpkgs/rage-player/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index 7891887ddf77..c81765b0b5e5 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
# Template file for 'rage-player'
pkgname=rage-player
version=0.3.1
-revision=1
+revision=2
wrksrc="rage-${version}"
build_style=meson
hostmakedepends="pkg-config efl-devel"
@@ -9,8 +9,8 @@ makedepends="efl-devel"
depends="desktop-file-utils"
short_desc="Video and Audio player written with Enlightenment Foundation Libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-Clause-BSD"
-homepage="https://www.enlightenment.org/p.php?p=about/rage"
+license="BSD-2-Clause"
+homepage="https://www.enlightenment.org/about-rage"
distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
From e9720c5ea0bf4e9c90b094aeb47441fd5c2b0937 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 21:18:53 -0700
Subject: [PATCH 03/15] raptor: fix license, http->https
---
srcpkgs/raptor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 5408f6b745fb..28b08b98a061 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
# Template file for 'raptor'
pkgname=raptor
version=2.0.15
-revision=3
+revision=4
wrksrc="raptor2-${version}"
build_style=gnu-configure
configure_args="--disable-static --with-yajl=no"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config"
makedepends="libcurl-devel libxml2-devel libxslt-devel"
short_desc="Raptor RDF Syntax Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/raptor"
-distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/raptor"
+distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
libraptor_package() {
From c41a6332469288f13a1374fbd7184a98d578bd98 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:12 -0700
Subject: [PATCH 04/15] rasqal: fix license, http->https
---
srcpkgs/rasqal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template
index 2d00a45376e6..94505b18612f 100644
--- a/srcpkgs/rasqal/template
+++ b/srcpkgs/rasqal/template
@@ -1,7 +1,7 @@
# Template file for 'rasqal'
pkgname=rasqal
version=0.9.33
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-release"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="mpfr-devel raptor-devel"
checkdepends="perl"
short_desc="RDF Query Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/rasqal"
-distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/rasqal"
+distfiles="https://librdf.org/dist/source/rasqal-${version}.tar.gz"
checksum=6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
librasqal_package() {
From 5d06b71e830273fbf5540e5b4fd049aefd510992 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:34 -0700
Subject: [PATCH 05/15] rdis-git: fix license
---
srcpkgs/rdis-git/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index 5aaa5d669b7a..55945877ba2a 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,12 +1,12 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=12
+revision=13
hostmakedepends="pkg-config git"
makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
short_desc="A binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/endeav0r/rdis"
do_fetch() {
From f8ceb6d59fd57bebca1d8a495312305e8b47d17c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:16:40 -0700
Subject: [PATCH 06/15] read-edid: fix license
---
srcpkgs/read-edid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/read-edid/template b/srcpkgs/read-edid/template
index ef0abdc4b908..5d3d64b05338 100644
--- a/srcpkgs/read-edid/template
+++ b/srcpkgs/read-edid/template
@@ -1,7 +1,7 @@
# Template file for 'read-edid'
pkgname=read-edid
version=3.0.2
-revision=3
+revision=4
build_style=cmake
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) makedepends="libx86-devel";;
@@ -9,7 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
short_desc="Hardware information-gathering tool for VESA PnP monitors"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:BSD-2-Clause-alike"
homepage="http://www.polypux.org/projects/read-edid/"
distfiles="http://www.polypux.org/projects/read-edid/${pkgname}-${version}.tar.gz"
checksum=c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f
From 9957dd1e9040a286a84477e573f421966f881cac Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:47:14 -0700
Subject: [PATCH 07/15] redland: fix license, http->https
---
srcpkgs/redland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index c58096e673dd..ae426a5310ad 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
pkgname=redland
version=1.0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-release --with-raptor=system
--with-rasqal=system --with-sqlite=3"
@@ -12,9 +12,9 @@ makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel
postgresql-libs-devel sqlite-devel unixodbc-devel"
maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="${_desc} - Utilities"
-license="GPL-2, LGPL-2.1"
-homepage="http://librdf.org"
-distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, Apache-2.0"
+homepage="https://librdf.org"
+distfiles="https://librdf.org/dist/source/redland-${version}.tar.gz"
checksum=de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
librdf_package() {
From d24cd8a4962f8e8fb3e31223fe0f6219a6dc145f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:50:03 -0700
Subject: [PATCH 08/15] redshift: fix license, other lint
---
srcpkgs/redshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index 8db3878a5027..b907fc9019c4 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,9 +1,8 @@
# Template file for 'redshift'
pkgname=redshift
version=1.12
-revision=3
+revision=4
build_style=gnu-configure
-build_options="geoclue2"
configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"
hostmakedepends="gettext-devel intltool pkg-config python3-devel"
makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
@@ -11,15 +10,15 @@ makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
depends="$(vopt_if geoclue2 'geoclue2')"
short_desc="Adjusts the color temperature of your screen to your surroundings"
maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://jonls.dk/redshift/"
distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"
checksum=d2f8c5300e3ce2a84fe6584d2f1483aa9eadc668ab1951b2c2b8a03ece3a22ba
+build_options="geoclue2"
redshift-gtk_package() {
depends="${sourcepkg}-${version}_${revision} gtk+3 python3-gobject
python3-xdg desktop-file-utils"
- pycompile_module="redshift_gtk"
short_desc+=" - GTK+ UI"
pkg_install() {
vmove usr/bin/redshift-gtk
From df90603063a16352c557ac82bd9f73208e581c8e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:55:24 -0700
Subject: [PATCH 09/15] renameutils: fix license, sed->vsed
---
srcpkgs/renameutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/renameutils/template b/srcpkgs/renameutils/template
index 5ea0f17f8926..a81adbc52dff 100644
--- a/srcpkgs/renameutils/template
+++ b/srcpkgs/renameutils/template
@@ -1,17 +1,17 @@
# Template file for 'renameutils'
pkgname=renameutils
version=0.12.0
-revision=2
+revision=3
build_style=gnu-configure
makedepends="readline-devel"
short_desc="Programs designed to make renaming of files faster and less cumbersome"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/renameutils/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3
-post_extract() {
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.am
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.in
+post_patch() {
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.am
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.in
}
From 6d9308de36deefd8c340824c14b3da1bdd4bf24e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:01:11 -0700
Subject: [PATCH 10/15] reop: fix license, http->https, re-enable SSL
verification
---
srcpkgs/reop/template | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template
index 86ab010657c5..def5e5cc1617 100644
--- a/srcpkgs/reop/template
+++ b/srcpkgs/reop/template
@@ -1,21 +1,15 @@
# Template file for 'reop'
pkgname=reop
version=2.1.1
-revision=2
+revision=3
makedepends="libsodium-devel"
short_desc="Create and verify cryptographic signatures"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="ISC, BSD"
-homepage="http://www.tedunangst.com/flak/post/reop"
-distfiles="http://www.tedunangst.com/flak/files/reop-${version}.tgz"
+license="ISC"
+homepage="https://www.tedunangst.com/flak/post/reop"
+distfiles="https://www.tedunangst.com/flak/files/reop-${version}.tgz"
checksum=fa8ae058c51efec5bde39fab15b4275e6394d9ab1dd2190ffdba3cf9983fdcac
-pre_fetch() {
- # 301 redirect to https://www.tedunangst.com/flak/files/reop-2.1.0.tgz
- # [...]
- # Certificate verification failed for /C=US/ST=PA/O=tedunangst.com/CN=www.tedunangst.com/emailAddress=tedu@tedunangst.com
- export SSL_NO_VERIFY_PEER=1
-}
do_build() {
make -f GNUmakefile \
CC="$CC" CFLAGS="$CFLAGS" \
From a5b82f50f4810919da4143c4a890486b7142f764 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:03:48 -0700
Subject: [PATCH 11/15] rix: fix license, other lint
---
srcpkgs/rix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template
index 23d16e5e2da2..3c58f126458a 100644
--- a/srcpkgs/rix/template
+++ b/srcpkgs/rix/template
@@ -1,12 +1,12 @@
# Template file for 'rix'
pkgname=rix
version=0.3.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="bison flex"
-short_desc="An expressive and efficient language for the C ecosystem"
+short_desc="Expressive and efficient language for the C ecosystem"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/riolet/rix"
distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz"
checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c
From 9996c4cb9874201cae20fed241c04a1a27107187 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:10:12 -0700
Subject: [PATCH 12/15] robotfindskitten: fix license, other lint
---
srcpkgs/robotfindskitten/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/robotfindskitten/template b/srcpkgs/robotfindskitten/template
index 3fe9a742cbe7..7f23f08746e7 100644
--- a/srcpkgs/robotfindskitten/template
+++ b/srcpkgs/robotfindskitten/template
@@ -1,14 +1,14 @@
# Template file for 'robotfindskitten'
pkgname=robotfindskitten
version=2.7182818.701
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="setconf"
makedepends="ncurses-devel"
short_desc="Yet another zen simulation"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.robotfindskitten.org"
-license="GPL-2"
distfiles="http://robotfindskitten.org/download/POSIX/${pkgname}-${version}.tar.gz"
checksum=7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719
@@ -19,4 +19,3 @@ pre_configure() {
post_install() {
vinstall nki/vanilla.nki 644 usr/share/games/robotfindskitten
}
-
From e753abdc701ed693579a562c4d49649b37ca4219 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:30:22 -0700
Subject: [PATCH 13/15] rtmidi: fix license
---
srcpkgs/rtmidi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template
index e78dd05a0136..04bebb410485 100644
--- a/srcpkgs/rtmidi/template
+++ b/srcpkgs/rtmidi/template
@@ -1,14 +1,14 @@
# Template file for 'rtmidi'
pkgname=rtmidi
version=4.0.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-alsa --with-jack"
hostmakedepends="automake libtool"
makedepends="alsa-lib-devel jack-devel"
short_desc="C++ classes for realtime MIDI input/output"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="RtMidi, MIT"
+license="MIT"
homepage="http://www.music.mcgill.ca/~gary/rtmidi/"
distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz"
checksum=d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
From 98c874fe6b59bbd8adf4adb071e8489d166f4ebc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:37:29 -0700
Subject: [PATCH 14/15] rtmpdump: fix license
---
srcpkgs/rtmpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 911122cc807a..561317d1e117 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,13 +1,13 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=9
+revision=10
_patchlevel=${version##*.}
create_wrksrc=yes
makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://rtmpdump.mplayerhq.hu/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz"
checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f
From 719aebe14d26e32563165c0ffe9cb52c3dbb7667 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:40:49 -0700
Subject: [PATCH 15/15] rusty-diceware: fix license
---
srcpkgs/rusty-diceware/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rusty-diceware/template b/srcpkgs/rusty-diceware/template
index bf5254ecefbd..e8ea7191e4e2 100644
--- a/srcpkgs/rusty-diceware/template
+++ b/srcpkgs/rusty-diceware/template
@@ -1,12 +1,12 @@
# Template file for 'rusty-diceware'
pkgname=rusty-diceware
version=0.3.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=cargo
short_desc="Commandline diceware, sans dice, written in rustlang"
maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
-license="AGPL-3.0"
+license="AGPL-3.0-only"
homepage="https://gitlab.com/yuvallanger/rusty-diceware"
distfiles="https://gitlab.com/yuvallanger/rusty-diceware/-/archive/v${version}/rusty-diceware-v${version}.tar.gz"
checksum=79c02206ad825604507be96623d6de9185c837900bce9b1d392095e789c06f61
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with R
2021-05-12 19:44 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R heliocat
@ 2021-05-12 20:39 ` heliocat
2021-06-10 7:49 ` heliocat
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: heliocat @ 2021-05-12 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_r
https://github.com/void-linux/void-packages/pull/30825
Omnibus lint pass for SPDX warnings - packages starting with R
<!-- 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_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/30825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_r-30825.patch --]
[-- Type: text/x-diff, Size: 16586 bytes --]
From e1a8a0145e515847ce0d400b976cba3ee0566425 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:28:50 -0700
Subject: [PATCH 01/14] ragel: fix license
---
srcpkgs/ragel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ragel/template b/srcpkgs/ragel/template
index f054f975db31..7e8afaa3232e 100644
--- a/srcpkgs/ragel/template
+++ b/srcpkgs/ragel/template
@@ -1,11 +1,11 @@
# Template file for 'ragel'
pkgname=ragel
version=6.10
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Compile regular languages into executable state machines"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.colm.net/open-source/ragel/"
distfiles="http://www.colm.net/files/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
From f2e8758210348ed62c64b866c08f8cb163d11d1d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:43:30 -0700
Subject: [PATCH 02/14] rage-player: fix license
---
srcpkgs/rage-player/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index 7891887ddf77..c81765b0b5e5 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
# Template file for 'rage-player'
pkgname=rage-player
version=0.3.1
-revision=1
+revision=2
wrksrc="rage-${version}"
build_style=meson
hostmakedepends="pkg-config efl-devel"
@@ -9,8 +9,8 @@ makedepends="efl-devel"
depends="desktop-file-utils"
short_desc="Video and Audio player written with Enlightenment Foundation Libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-Clause-BSD"
-homepage="https://www.enlightenment.org/p.php?p=about/rage"
+license="BSD-2-Clause"
+homepage="https://www.enlightenment.org/about-rage"
distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
From e9720c5ea0bf4e9c90b094aeb47441fd5c2b0937 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 21:18:53 -0700
Subject: [PATCH 03/14] raptor: fix license, http->https
---
srcpkgs/raptor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 5408f6b745fb..28b08b98a061 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
# Template file for 'raptor'
pkgname=raptor
version=2.0.15
-revision=3
+revision=4
wrksrc="raptor2-${version}"
build_style=gnu-configure
configure_args="--disable-static --with-yajl=no"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config"
makedepends="libcurl-devel libxml2-devel libxslt-devel"
short_desc="Raptor RDF Syntax Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/raptor"
-distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/raptor"
+distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
libraptor_package() {
From c41a6332469288f13a1374fbd7184a98d578bd98 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:12 -0700
Subject: [PATCH 04/14] rasqal: fix license, http->https
---
srcpkgs/rasqal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template
index 2d00a45376e6..94505b18612f 100644
--- a/srcpkgs/rasqal/template
+++ b/srcpkgs/rasqal/template
@@ -1,7 +1,7 @@
# Template file for 'rasqal'
pkgname=rasqal
version=0.9.33
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-release"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="mpfr-devel raptor-devel"
checkdepends="perl"
short_desc="RDF Query Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/rasqal"
-distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/rasqal"
+distfiles="https://librdf.org/dist/source/rasqal-${version}.tar.gz"
checksum=6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
librasqal_package() {
From a6feaf200ec36c6579763eec04e724a105912d77 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:34 -0700
Subject: [PATCH 05/14] rdis-git: fix license
---
srcpkgs/rdis-git/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index 5aaa5d669b7a..ff8c03081de7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,12 +1,12 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=12
+revision=13
hostmakedepends="pkg-config git"
makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
-short_desc="A binary analysis tool for Linux"
+short_desc="Binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/endeav0r/rdis"
do_fetch() {
From e04ed956df559660075366b9102a473b73e1eb72 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:16:40 -0700
Subject: [PATCH 06/14] read-edid: fix license
---
srcpkgs/read-edid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/read-edid/template b/srcpkgs/read-edid/template
index ef0abdc4b908..5d3d64b05338 100644
--- a/srcpkgs/read-edid/template
+++ b/srcpkgs/read-edid/template
@@ -1,7 +1,7 @@
# Template file for 'read-edid'
pkgname=read-edid
version=3.0.2
-revision=3
+revision=4
build_style=cmake
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) makedepends="libx86-devel";;
@@ -9,7 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
short_desc="Hardware information-gathering tool for VESA PnP monitors"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:BSD-2-Clause-alike"
homepage="http://www.polypux.org/projects/read-edid/"
distfiles="http://www.polypux.org/projects/read-edid/${pkgname}-${version}.tar.gz"
checksum=c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f
From a9282112c05ef2fb8a7b208e5ce47fc719511c3b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:47:14 -0700
Subject: [PATCH 07/14] redland: fix license, http->https
---
srcpkgs/redland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index c58096e673dd..ae426a5310ad 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
pkgname=redland
version=1.0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-release --with-raptor=system
--with-rasqal=system --with-sqlite=3"
@@ -12,9 +12,9 @@ makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel
postgresql-libs-devel sqlite-devel unixodbc-devel"
maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="${_desc} - Utilities"
-license="GPL-2, LGPL-2.1"
-homepage="http://librdf.org"
-distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, Apache-2.0"
+homepage="https://librdf.org"
+distfiles="https://librdf.org/dist/source/redland-${version}.tar.gz"
checksum=de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
librdf_package() {
From 7fc1e1ad6d2af63834eda19e70fb011e1eb0c447 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:50:03 -0700
Subject: [PATCH 08/14] redshift: fix license, other lint
---
srcpkgs/redshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index 8db3878a5027..b907fc9019c4 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,9 +1,8 @@
# Template file for 'redshift'
pkgname=redshift
version=1.12
-revision=3
+revision=4
build_style=gnu-configure
-build_options="geoclue2"
configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"
hostmakedepends="gettext-devel intltool pkg-config python3-devel"
makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
@@ -11,15 +10,15 @@ makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
depends="$(vopt_if geoclue2 'geoclue2')"
short_desc="Adjusts the color temperature of your screen to your surroundings"
maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://jonls.dk/redshift/"
distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"
checksum=d2f8c5300e3ce2a84fe6584d2f1483aa9eadc668ab1951b2c2b8a03ece3a22ba
+build_options="geoclue2"
redshift-gtk_package() {
depends="${sourcepkg}-${version}_${revision} gtk+3 python3-gobject
python3-xdg desktop-file-utils"
- pycompile_module="redshift_gtk"
short_desc+=" - GTK+ UI"
pkg_install() {
vmove usr/bin/redshift-gtk
From 6b2abd5feb162d9275def670d5b5ba7311a67ac9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:55:24 -0700
Subject: [PATCH 09/14] renameutils: fix license, sed->vsed
---
srcpkgs/renameutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/renameutils/template b/srcpkgs/renameutils/template
index 5ea0f17f8926..a81adbc52dff 100644
--- a/srcpkgs/renameutils/template
+++ b/srcpkgs/renameutils/template
@@ -1,17 +1,17 @@
# Template file for 'renameutils'
pkgname=renameutils
version=0.12.0
-revision=2
+revision=3
build_style=gnu-configure
makedepends="readline-devel"
short_desc="Programs designed to make renaming of files faster and less cumbersome"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/renameutils/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3
-post_extract() {
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.am
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.in
+post_patch() {
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.am
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.in
}
From 3bfba62cd411e5f24c6f712bfc5875c0af67304b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:01:11 -0700
Subject: [PATCH 10/14] reop: fix license, http->https, re-enable SSL
verification
---
srcpkgs/reop/template | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template
index 86ab010657c5..def5e5cc1617 100644
--- a/srcpkgs/reop/template
+++ b/srcpkgs/reop/template
@@ -1,21 +1,15 @@
# Template file for 'reop'
pkgname=reop
version=2.1.1
-revision=2
+revision=3
makedepends="libsodium-devel"
short_desc="Create and verify cryptographic signatures"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="ISC, BSD"
-homepage="http://www.tedunangst.com/flak/post/reop"
-distfiles="http://www.tedunangst.com/flak/files/reop-${version}.tgz"
+license="ISC"
+homepage="https://www.tedunangst.com/flak/post/reop"
+distfiles="https://www.tedunangst.com/flak/files/reop-${version}.tgz"
checksum=fa8ae058c51efec5bde39fab15b4275e6394d9ab1dd2190ffdba3cf9983fdcac
-pre_fetch() {
- # 301 redirect to https://www.tedunangst.com/flak/files/reop-2.1.0.tgz
- # [...]
- # Certificate verification failed for /C=US/ST=PA/O=tedunangst.com/CN=www.tedunangst.com/emailAddress=tedu@tedunangst.com
- export SSL_NO_VERIFY_PEER=1
-}
do_build() {
make -f GNUmakefile \
CC="$CC" CFLAGS="$CFLAGS" \
From 7026524e3604819cc21a0aa36a93014b48e3af53 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:03:48 -0700
Subject: [PATCH 11/14] rix: fix license, other lint
---
srcpkgs/rix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template
index 23d16e5e2da2..3c58f126458a 100644
--- a/srcpkgs/rix/template
+++ b/srcpkgs/rix/template
@@ -1,12 +1,12 @@
# Template file for 'rix'
pkgname=rix
version=0.3.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="bison flex"
-short_desc="An expressive and efficient language for the C ecosystem"
+short_desc="Expressive and efficient language for the C ecosystem"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/riolet/rix"
distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz"
checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c
From 7c7884632ad52708f0c2dedf111f27b384df754a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:10:12 -0700
Subject: [PATCH 12/14] robotfindskitten: fix license, other lint
---
srcpkgs/robotfindskitten/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/robotfindskitten/template b/srcpkgs/robotfindskitten/template
index 3fe9a742cbe7..7f23f08746e7 100644
--- a/srcpkgs/robotfindskitten/template
+++ b/srcpkgs/robotfindskitten/template
@@ -1,14 +1,14 @@
# Template file for 'robotfindskitten'
pkgname=robotfindskitten
version=2.7182818.701
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="setconf"
makedepends="ncurses-devel"
short_desc="Yet another zen simulation"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.robotfindskitten.org"
-license="GPL-2"
distfiles="http://robotfindskitten.org/download/POSIX/${pkgname}-${version}.tar.gz"
checksum=7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719
@@ -19,4 +19,3 @@ pre_configure() {
post_install() {
vinstall nki/vanilla.nki 644 usr/share/games/robotfindskitten
}
-
From c954be3b69df7610efdaf14bcd7617d61f302434 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:30:22 -0700
Subject: [PATCH 13/14] rtmidi: fix license
---
srcpkgs/rtmidi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template
index e78dd05a0136..04bebb410485 100644
--- a/srcpkgs/rtmidi/template
+++ b/srcpkgs/rtmidi/template
@@ -1,14 +1,14 @@
# Template file for 'rtmidi'
pkgname=rtmidi
version=4.0.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-alsa --with-jack"
hostmakedepends="automake libtool"
makedepends="alsa-lib-devel jack-devel"
short_desc="C++ classes for realtime MIDI input/output"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="RtMidi, MIT"
+license="MIT"
homepage="http://www.music.mcgill.ca/~gary/rtmidi/"
distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz"
checksum=d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
From 5c083bd01ba7e66370bc352148806027a3a91d7f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:37:29 -0700
Subject: [PATCH 14/14] rtmpdump: fix license
---
srcpkgs/rtmpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 911122cc807a..561317d1e117 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,13 +1,13 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=9
+revision=10
_patchlevel=${version##*.}
create_wrksrc=yes
makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://rtmpdump.mplayerhq.hu/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz"
checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with R
2021-05-12 19:44 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R heliocat
2021-05-12 20:39 ` [PR PATCH] [Updated] " heliocat
@ 2021-06-10 7:49 ` heliocat
2021-06-26 18:44 ` heliocat
2021-08-28 9:57 ` [PR PATCH] [Closed]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: heliocat @ 2021-06-10 7:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_r
https://github.com/void-linux/void-packages/pull/30825
Omnibus lint pass for SPDX warnings - packages starting with R
<!-- 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_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/30825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_r-30825.patch --]
[-- Type: text/x-diff, Size: 16586 bytes --]
From 81d1822207f501e2f3248d91f58554dd174cbc4d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:28:50 -0700
Subject: [PATCH 01/14] ragel: fix license
---
srcpkgs/ragel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ragel/template b/srcpkgs/ragel/template
index f054f975db31..7e8afaa3232e 100644
--- a/srcpkgs/ragel/template
+++ b/srcpkgs/ragel/template
@@ -1,11 +1,11 @@
# Template file for 'ragel'
pkgname=ragel
version=6.10
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Compile regular languages into executable state machines"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.colm.net/open-source/ragel/"
distfiles="http://www.colm.net/files/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
From 2f20ec8c0ac7ae564327a0aff81def7958cfbcb8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:43:30 -0700
Subject: [PATCH 02/14] rage-player: fix license
---
srcpkgs/rage-player/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index 7891887ddf77..c81765b0b5e5 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
# Template file for 'rage-player'
pkgname=rage-player
version=0.3.1
-revision=1
+revision=2
wrksrc="rage-${version}"
build_style=meson
hostmakedepends="pkg-config efl-devel"
@@ -9,8 +9,8 @@ makedepends="efl-devel"
depends="desktop-file-utils"
short_desc="Video and Audio player written with Enlightenment Foundation Libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-Clause-BSD"
-homepage="https://www.enlightenment.org/p.php?p=about/rage"
+license="BSD-2-Clause"
+homepage="https://www.enlightenment.org/about-rage"
distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
From 25ced4e97654d78743c1b2a7ddb5f8d58b6b05c4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 21:18:53 -0700
Subject: [PATCH 03/14] raptor: fix license, http->https
---
srcpkgs/raptor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 5408f6b745fb..28b08b98a061 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
# Template file for 'raptor'
pkgname=raptor
version=2.0.15
-revision=3
+revision=4
wrksrc="raptor2-${version}"
build_style=gnu-configure
configure_args="--disable-static --with-yajl=no"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config"
makedepends="libcurl-devel libxml2-devel libxslt-devel"
short_desc="Raptor RDF Syntax Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/raptor"
-distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/raptor"
+distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
libraptor_package() {
From 98ba3b319d8e22ec71b4d343d19aaedfb7995ec8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:12 -0700
Subject: [PATCH 04/14] rasqal: fix license, http->https
---
srcpkgs/rasqal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template
index 2d00a45376e6..94505b18612f 100644
--- a/srcpkgs/rasqal/template
+++ b/srcpkgs/rasqal/template
@@ -1,7 +1,7 @@
# Template file for 'rasqal'
pkgname=rasqal
version=0.9.33
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-release"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="mpfr-devel raptor-devel"
checkdepends="perl"
short_desc="RDF Query Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/rasqal"
-distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/rasqal"
+distfiles="https://librdf.org/dist/source/rasqal-${version}.tar.gz"
checksum=6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
librasqal_package() {
From 18e00800f901a51e9370c2e59946f17ce93dae4d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:34 -0700
Subject: [PATCH 05/14] rdis-git: fix license
---
srcpkgs/rdis-git/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index 5aaa5d669b7a..ff8c03081de7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,12 +1,12 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=12
+revision=13
hostmakedepends="pkg-config git"
makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
-short_desc="A binary analysis tool for Linux"
+short_desc="Binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/endeav0r/rdis"
do_fetch() {
From b90870e2db9e5aeb34d4238f789944cb68ba401e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:16:40 -0700
Subject: [PATCH 06/14] read-edid: fix license
---
srcpkgs/read-edid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/read-edid/template b/srcpkgs/read-edid/template
index ef0abdc4b908..5d3d64b05338 100644
--- a/srcpkgs/read-edid/template
+++ b/srcpkgs/read-edid/template
@@ -1,7 +1,7 @@
# Template file for 'read-edid'
pkgname=read-edid
version=3.0.2
-revision=3
+revision=4
build_style=cmake
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) makedepends="libx86-devel";;
@@ -9,7 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
short_desc="Hardware information-gathering tool for VESA PnP monitors"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:BSD-2-Clause-alike"
homepage="http://www.polypux.org/projects/read-edid/"
distfiles="http://www.polypux.org/projects/read-edid/${pkgname}-${version}.tar.gz"
checksum=c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f
From 9e1810dc213d199440c20bd927232639eca642e8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:47:14 -0700
Subject: [PATCH 07/14] redland: fix license, http->https
---
srcpkgs/redland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index c58096e673dd..ae426a5310ad 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
pkgname=redland
version=1.0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-release --with-raptor=system
--with-rasqal=system --with-sqlite=3"
@@ -12,9 +12,9 @@ makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel
postgresql-libs-devel sqlite-devel unixodbc-devel"
maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="${_desc} - Utilities"
-license="GPL-2, LGPL-2.1"
-homepage="http://librdf.org"
-distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, Apache-2.0"
+homepage="https://librdf.org"
+distfiles="https://librdf.org/dist/source/redland-${version}.tar.gz"
checksum=de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
librdf_package() {
From 3c2f03b2a71176ab1235460d06c9d6573affa650 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:50:03 -0700
Subject: [PATCH 08/14] redshift: fix license, other lint
---
srcpkgs/redshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index 8db3878a5027..b907fc9019c4 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,9 +1,8 @@
# Template file for 'redshift'
pkgname=redshift
version=1.12
-revision=3
+revision=4
build_style=gnu-configure
-build_options="geoclue2"
configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"
hostmakedepends="gettext-devel intltool pkg-config python3-devel"
makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
@@ -11,15 +10,15 @@ makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
depends="$(vopt_if geoclue2 'geoclue2')"
short_desc="Adjusts the color temperature of your screen to your surroundings"
maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://jonls.dk/redshift/"
distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"
checksum=d2f8c5300e3ce2a84fe6584d2f1483aa9eadc668ab1951b2c2b8a03ece3a22ba
+build_options="geoclue2"
redshift-gtk_package() {
depends="${sourcepkg}-${version}_${revision} gtk+3 python3-gobject
python3-xdg desktop-file-utils"
- pycompile_module="redshift_gtk"
short_desc+=" - GTK+ UI"
pkg_install() {
vmove usr/bin/redshift-gtk
From 4ca5f9dc8ccc96984ea514a6be6063fdb6e18ecc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:55:24 -0700
Subject: [PATCH 09/14] renameutils: fix license, sed->vsed
---
srcpkgs/renameutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/renameutils/template b/srcpkgs/renameutils/template
index 5ea0f17f8926..a81adbc52dff 100644
--- a/srcpkgs/renameutils/template
+++ b/srcpkgs/renameutils/template
@@ -1,17 +1,17 @@
# Template file for 'renameutils'
pkgname=renameutils
version=0.12.0
-revision=2
+revision=3
build_style=gnu-configure
makedepends="readline-devel"
short_desc="Programs designed to make renaming of files faster and less cumbersome"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/renameutils/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3
-post_extract() {
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.am
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.in
+post_patch() {
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.am
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.in
}
From 57c6a62559fc405973a8941d0c1b407955d5a630 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:01:11 -0700
Subject: [PATCH 10/14] reop: fix license, http->https, re-enable SSL
verification
---
srcpkgs/reop/template | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template
index 86ab010657c5..def5e5cc1617 100644
--- a/srcpkgs/reop/template
+++ b/srcpkgs/reop/template
@@ -1,21 +1,15 @@
# Template file for 'reop'
pkgname=reop
version=2.1.1
-revision=2
+revision=3
makedepends="libsodium-devel"
short_desc="Create and verify cryptographic signatures"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="ISC, BSD"
-homepage="http://www.tedunangst.com/flak/post/reop"
-distfiles="http://www.tedunangst.com/flak/files/reop-${version}.tgz"
+license="ISC"
+homepage="https://www.tedunangst.com/flak/post/reop"
+distfiles="https://www.tedunangst.com/flak/files/reop-${version}.tgz"
checksum=fa8ae058c51efec5bde39fab15b4275e6394d9ab1dd2190ffdba3cf9983fdcac
-pre_fetch() {
- # 301 redirect to https://www.tedunangst.com/flak/files/reop-2.1.0.tgz
- # [...]
- # Certificate verification failed for /C=US/ST=PA/O=tedunangst.com/CN=www.tedunangst.com/emailAddress=tedu@tedunangst.com
- export SSL_NO_VERIFY_PEER=1
-}
do_build() {
make -f GNUmakefile \
CC="$CC" CFLAGS="$CFLAGS" \
From 54e9596a109fed0182b06e2507e60a5fcdb9c9b6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:03:48 -0700
Subject: [PATCH 11/14] rix: fix license, other lint
---
srcpkgs/rix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template
index 23d16e5e2da2..3c58f126458a 100644
--- a/srcpkgs/rix/template
+++ b/srcpkgs/rix/template
@@ -1,12 +1,12 @@
# Template file for 'rix'
pkgname=rix
version=0.3.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="bison flex"
-short_desc="An expressive and efficient language for the C ecosystem"
+short_desc="Expressive and efficient language for the C ecosystem"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/riolet/rix"
distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz"
checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c
From e3e48f796edf198aca6c7389088522b5702635ba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:10:12 -0700
Subject: [PATCH 12/14] robotfindskitten: fix license, other lint
---
srcpkgs/robotfindskitten/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/robotfindskitten/template b/srcpkgs/robotfindskitten/template
index 3fe9a742cbe7..7f23f08746e7 100644
--- a/srcpkgs/robotfindskitten/template
+++ b/srcpkgs/robotfindskitten/template
@@ -1,14 +1,14 @@
# Template file for 'robotfindskitten'
pkgname=robotfindskitten
version=2.7182818.701
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="setconf"
makedepends="ncurses-devel"
short_desc="Yet another zen simulation"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.robotfindskitten.org"
-license="GPL-2"
distfiles="http://robotfindskitten.org/download/POSIX/${pkgname}-${version}.tar.gz"
checksum=7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719
@@ -19,4 +19,3 @@ pre_configure() {
post_install() {
vinstall nki/vanilla.nki 644 usr/share/games/robotfindskitten
}
-
From efb38be632ec50b388775b793189e580858baf17 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:30:22 -0700
Subject: [PATCH 13/14] rtmidi: fix license
---
srcpkgs/rtmidi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template
index e78dd05a0136..04bebb410485 100644
--- a/srcpkgs/rtmidi/template
+++ b/srcpkgs/rtmidi/template
@@ -1,14 +1,14 @@
# Template file for 'rtmidi'
pkgname=rtmidi
version=4.0.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-alsa --with-jack"
hostmakedepends="automake libtool"
makedepends="alsa-lib-devel jack-devel"
short_desc="C++ classes for realtime MIDI input/output"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="RtMidi, MIT"
+license="MIT"
homepage="http://www.music.mcgill.ca/~gary/rtmidi/"
distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz"
checksum=d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
From b702adcedd83472da3c78ff2a71ad7a153be5016 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:37:29 -0700
Subject: [PATCH 14/14] rtmpdump: fix license
---
srcpkgs/rtmpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 911122cc807a..561317d1e117 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,13 +1,13 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=9
+revision=10
_patchlevel=${version##*.}
create_wrksrc=yes
makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://rtmpdump.mplayerhq.hu/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz"
checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with R
2021-05-12 19:44 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R heliocat
2021-05-12 20:39 ` [PR PATCH] [Updated] " heliocat
2021-06-10 7:49 ` heliocat
@ 2021-06-26 18:44 ` heliocat
2021-08-28 9:57 ` [PR PATCH] [Closed]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: heliocat @ 2021-06-26 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_r
https://github.com/void-linux/void-packages/pull/30825
Omnibus lint pass for SPDX warnings - packages starting with R
<!-- 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_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/30825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_r-30825.patch --]
[-- Type: text/x-diff, Size: 16586 bytes --]
From 47ceeefcfcbe443d158d98dca721ef6ae69f660c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:28:50 -0700
Subject: [PATCH 01/14] ragel: fix license
---
srcpkgs/ragel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ragel/template b/srcpkgs/ragel/template
index f054f975db31..7e8afaa3232e 100644
--- a/srcpkgs/ragel/template
+++ b/srcpkgs/ragel/template
@@ -1,11 +1,11 @@
# Template file for 'ragel'
pkgname=ragel
version=6.10
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Compile regular languages into executable state machines"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.colm.net/open-source/ragel/"
distfiles="http://www.colm.net/files/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
From f819b6dd68bef73518e7d58ed9f263b4a46fd5ec Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 18:43:30 -0700
Subject: [PATCH 02/14] rage-player: fix license
---
srcpkgs/rage-player/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index 7891887ddf77..c81765b0b5e5 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
# Template file for 'rage-player'
pkgname=rage-player
version=0.3.1
-revision=1
+revision=2
wrksrc="rage-${version}"
build_style=meson
hostmakedepends="pkg-config efl-devel"
@@ -9,8 +9,8 @@ makedepends="efl-devel"
depends="desktop-file-utils"
short_desc="Video and Audio player written with Enlightenment Foundation Libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-Clause-BSD"
-homepage="https://www.enlightenment.org/p.php?p=about/rage"
+license="BSD-2-Clause"
+homepage="https://www.enlightenment.org/about-rage"
distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
From 962ea71197bfa521594dc6b1984068ae703a96b3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 21:18:53 -0700
Subject: [PATCH 03/14] raptor: fix license, http->https
---
srcpkgs/raptor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 5408f6b745fb..28b08b98a061 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
# Template file for 'raptor'
pkgname=raptor
version=2.0.15
-revision=3
+revision=4
wrksrc="raptor2-${version}"
build_style=gnu-configure
configure_args="--disable-static --with-yajl=no"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config"
makedepends="libcurl-devel libxml2-devel libxslt-devel"
short_desc="Raptor RDF Syntax Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/raptor"
-distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/raptor"
+distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
libraptor_package() {
From 31a82bc5bd7f845e378b4950701dbe4cfaf19530 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:12 -0700
Subject: [PATCH 04/14] rasqal: fix license, http->https
---
srcpkgs/rasqal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template
index 2d00a45376e6..94505b18612f 100644
--- a/srcpkgs/rasqal/template
+++ b/srcpkgs/rasqal/template
@@ -1,7 +1,7 @@
# Template file for 'rasqal'
pkgname=rasqal
version=0.9.33
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-release"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="mpfr-devel raptor-devel"
checkdepends="perl"
short_desc="RDF Query Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://librdf.org/rasqal"
-distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
+homepage="https://librdf.org/rasqal"
+distfiles="https://librdf.org/dist/source/rasqal-${version}.tar.gz"
checksum=6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
librasqal_package() {
From cb3f758198766a622b007526ee4d52e8203b3d27 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 10:22:34 -0700
Subject: [PATCH 05/14] rdis-git: fix license
---
srcpkgs/rdis-git/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index 5aaa5d669b7a..ff8c03081de7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,12 +1,12 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=12
+revision=13
hostmakedepends="pkg-config git"
makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
-short_desc="A binary analysis tool for Linux"
+short_desc="Binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/endeav0r/rdis"
do_fetch() {
From f55686f2a79160a1db6d3eb61cea02cd84aef741 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:16:40 -0700
Subject: [PATCH 06/14] read-edid: fix license
---
srcpkgs/read-edid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/read-edid/template b/srcpkgs/read-edid/template
index ef0abdc4b908..5d3d64b05338 100644
--- a/srcpkgs/read-edid/template
+++ b/srcpkgs/read-edid/template
@@ -1,7 +1,7 @@
# Template file for 'read-edid'
pkgname=read-edid
version=3.0.2
-revision=3
+revision=4
build_style=cmake
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) makedepends="libx86-devel";;
@@ -9,7 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
short_desc="Hardware information-gathering tool for VESA PnP monitors"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:BSD-2-Clause-alike"
homepage="http://www.polypux.org/projects/read-edid/"
distfiles="http://www.polypux.org/projects/read-edid/${pkgname}-${version}.tar.gz"
checksum=c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f
From 968f531eb12991106840ec9aa8bb8d3bea502b8e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:47:14 -0700
Subject: [PATCH 07/14] redland: fix license, http->https
---
srcpkgs/redland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index c58096e673dd..ae426a5310ad 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
pkgname=redland
version=1.0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-release --with-raptor=system
--with-rasqal=system --with-sqlite=3"
@@ -12,9 +12,9 @@ makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel
postgresql-libs-devel sqlite-devel unixodbc-devel"
maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="${_desc} - Utilities"
-license="GPL-2, LGPL-2.1"
-homepage="http://librdf.org"
-distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, Apache-2.0"
+homepage="https://librdf.org"
+distfiles="https://librdf.org/dist/source/redland-${version}.tar.gz"
checksum=de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
librdf_package() {
From b7bd4d6f64c278d5cf51d3979020f5aca65d4449 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:50:03 -0700
Subject: [PATCH 08/14] redshift: fix license, other lint
---
srcpkgs/redshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index 8db3878a5027..b907fc9019c4 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,9 +1,8 @@
# Template file for 'redshift'
pkgname=redshift
version=1.12
-revision=3
+revision=4
build_style=gnu-configure
-build_options="geoclue2"
configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"
hostmakedepends="gettext-devel intltool pkg-config python3-devel"
makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
@@ -11,15 +10,15 @@ makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2
depends="$(vopt_if geoclue2 'geoclue2')"
short_desc="Adjusts the color temperature of your screen to your surroundings"
maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://jonls.dk/redshift/"
distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"
checksum=d2f8c5300e3ce2a84fe6584d2f1483aa9eadc668ab1951b2c2b8a03ece3a22ba
+build_options="geoclue2"
redshift-gtk_package() {
depends="${sourcepkg}-${version}_${revision} gtk+3 python3-gobject
python3-xdg desktop-file-utils"
- pycompile_module="redshift_gtk"
short_desc+=" - GTK+ UI"
pkg_install() {
vmove usr/bin/redshift-gtk
From 39dac59dc7424295b904f2348e2805f5096bb662 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:55:24 -0700
Subject: [PATCH 09/14] renameutils: fix license, sed->vsed
---
srcpkgs/renameutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/renameutils/template b/srcpkgs/renameutils/template
index 5ea0f17f8926..a81adbc52dff 100644
--- a/srcpkgs/renameutils/template
+++ b/srcpkgs/renameutils/template
@@ -1,17 +1,17 @@
# Template file for 'renameutils'
pkgname=renameutils
version=0.12.0
-revision=2
+revision=3
build_style=gnu-configure
makedepends="readline-devel"
short_desc="Programs designed to make renaming of files faster and less cumbersome"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/renameutils/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3
-post_extract() {
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.am
- sed -i 's/($bindir)/$(bindir)/' src/Makefile.in
+post_patch() {
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.am
+ vsed -i 's/($bindir)/$(bindir)/' src/Makefile.in
}
From 885499ba12f52ee43228141ed0fa642a6ce3d03c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:01:11 -0700
Subject: [PATCH 10/14] reop: fix license, http->https, re-enable SSL
verification
---
srcpkgs/reop/template | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template
index 86ab010657c5..def5e5cc1617 100644
--- a/srcpkgs/reop/template
+++ b/srcpkgs/reop/template
@@ -1,21 +1,15 @@
# Template file for 'reop'
pkgname=reop
version=2.1.1
-revision=2
+revision=3
makedepends="libsodium-devel"
short_desc="Create and verify cryptographic signatures"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="ISC, BSD"
-homepage="http://www.tedunangst.com/flak/post/reop"
-distfiles="http://www.tedunangst.com/flak/files/reop-${version}.tgz"
+license="ISC"
+homepage="https://www.tedunangst.com/flak/post/reop"
+distfiles="https://www.tedunangst.com/flak/files/reop-${version}.tgz"
checksum=fa8ae058c51efec5bde39fab15b4275e6394d9ab1dd2190ffdba3cf9983fdcac
-pre_fetch() {
- # 301 redirect to https://www.tedunangst.com/flak/files/reop-2.1.0.tgz
- # [...]
- # Certificate verification failed for /C=US/ST=PA/O=tedunangst.com/CN=www.tedunangst.com/emailAddress=tedu@tedunangst.com
- export SSL_NO_VERIFY_PEER=1
-}
do_build() {
make -f GNUmakefile \
CC="$CC" CFLAGS="$CFLAGS" \
From ba5bdca6e43ed0aa51bd7c82950c6122e652612a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:03:48 -0700
Subject: [PATCH 11/14] rix: fix license, other lint
---
srcpkgs/rix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template
index 23d16e5e2da2..3c58f126458a 100644
--- a/srcpkgs/rix/template
+++ b/srcpkgs/rix/template
@@ -1,12 +1,12 @@
# Template file for 'rix'
pkgname=rix
version=0.3.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="bison flex"
-short_desc="An expressive and efficient language for the C ecosystem"
+short_desc="Expressive and efficient language for the C ecosystem"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/riolet/rix"
distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz"
checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c
From 25c332874df9021701dfc0c9d4e9d46eb2f8409e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:10:12 -0700
Subject: [PATCH 12/14] robotfindskitten: fix license, other lint
---
srcpkgs/robotfindskitten/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/robotfindskitten/template b/srcpkgs/robotfindskitten/template
index 3fe9a742cbe7..7f23f08746e7 100644
--- a/srcpkgs/robotfindskitten/template
+++ b/srcpkgs/robotfindskitten/template
@@ -1,14 +1,14 @@
# Template file for 'robotfindskitten'
pkgname=robotfindskitten
version=2.7182818.701
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="setconf"
makedepends="ncurses-devel"
short_desc="Yet another zen simulation"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.robotfindskitten.org"
-license="GPL-2"
distfiles="http://robotfindskitten.org/download/POSIX/${pkgname}-${version}.tar.gz"
checksum=7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719
@@ -19,4 +19,3 @@ pre_configure() {
post_install() {
vinstall nki/vanilla.nki 644 usr/share/games/robotfindskitten
}
-
From 9bd573e32c70872816ac1fe47b5890c883e4edbe Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:30:22 -0700
Subject: [PATCH 13/14] rtmidi: fix license
---
srcpkgs/rtmidi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template
index e78dd05a0136..04bebb410485 100644
--- a/srcpkgs/rtmidi/template
+++ b/srcpkgs/rtmidi/template
@@ -1,14 +1,14 @@
# Template file for 'rtmidi'
pkgname=rtmidi
version=4.0.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-alsa --with-jack"
hostmakedepends="automake libtool"
makedepends="alsa-lib-devel jack-devel"
short_desc="C++ classes for realtime MIDI input/output"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="RtMidi, MIT"
+license="MIT"
homepage="http://www.music.mcgill.ca/~gary/rtmidi/"
distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz"
checksum=d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
From aa389472f8fa1ea6cc0348b8103ea9600b540f6d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 12:37:29 -0700
Subject: [PATCH 14/14] rtmpdump: fix license
---
srcpkgs/rtmpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 911122cc807a..561317d1e117 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,13 +1,13 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=9
+revision=10
_patchlevel=${version##*.}
create_wrksrc=yes
makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://rtmpdump.mplayerhq.hu/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz"
checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: Omnibus lint pass for SPDX warnings - packages starting with R
2021-05-12 19:44 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R heliocat
` (2 preceding siblings ...)
2021-06-26 18:44 ` heliocat
@ 2021-08-28 9:57 ` sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-08-28 9:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
There's a closed pull request on the void-packages repository
Omnibus lint pass for SPDX warnings - packages starting with R
https://github.com/void-linux/void-packages/pull/30825
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_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-28 9:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-12 19:44 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with R heliocat
2021-05-12 20:39 ` [PR PATCH] [Updated] " heliocat
2021-06-10 7:49 ` heliocat
2021-06-26 18:44 ` heliocat
2021-08-28 9:57 ` [PR PATCH] [Closed]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).