From e1a8a0145e515847ce0d400b976cba3ee0566425 Mon Sep 17 00:00:00 2001 From: Colin Booth 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 " -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 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 " -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 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 " -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 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 " -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 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 " -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 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 " -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 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 " 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 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 " -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 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 " -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 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 " -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 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 " -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 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 " +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 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 " -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 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 " -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