[-- Attachment #1: Type: text/plain, Size: 1619 bytes --] There is a new pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_i https://github.com/void-linux/void-packages/pull/30573 Omnibus lint pass for SPDX errors, most packages starting with I <!-- 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, (ARCH-LIBC) - [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/30573.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_i-30573.patch --] [-- Type: text/x-diff, Size: 14587 bytes --] From 17beb18ceaabee1e2be614fe7c516d4811746d2d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 14 Apr 2021 11:02:42 -0700 Subject: [PATCH 01/14] iat: fix license, short desc --- srcpkgs/iat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template index f7921c53bf14..7d0dd685d250 100644 --- a/srcpkgs/iat/template +++ b/srcpkgs/iat/template @@ -1,11 +1,11 @@ # Template file for 'iat' pkgname=iat version=0.1.7 -revision=3 +revision=4 build_style=gnu-configure -short_desc="A tool for detecting the structure of many types of CD/DVD image" +short_desc="Tool for detecting the structure of many types of CD/DVD image" maintainer="Orphaned <orphan@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://sourceforge.net/projects/iat.berlios/" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz" checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21 From d036f2ef1536a56aba0792230136a48c82358326 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:14:57 -0700 Subject: [PATCH 02/14] id3: fix license --- srcpkgs/id3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template index 336382beefe4..4c6330ff92ea 100644 --- a/srcpkgs/id3/template +++ b/srcpkgs/id3/template @@ -1,12 +1,12 @@ # Template file for 'id3' pkgname=id3 version=0.80 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="prefix=/usr mandir=/usr/share/man" short_desc="Tool for manipulating id3 and id3v2 tags in multiple files" maintainer="Orphaned <orphan@voidlinux.org>" -license="BSD" +license="BSD-2-Clause" homepage="https://squell.github.io/id3/" distfiles="https://github.com/squell/id3/releases/download/${version}/id3-${version}.tar.gz" checksum=aa61735c5806ed77b71de1408a78371d04add8c8c9b1532a055949081e5a35e2 From a4f4203f4ea242b0087085d00985af5f3fbac815 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:16:50 -0700 Subject: [PATCH 03/14] id3ted: fix license --- srcpkgs/id3ted/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template index 2b3f0e54c206..b993e5a37137 100644 --- a/srcpkgs/id3ted/template +++ b/srcpkgs/id3ted/template @@ -1,12 +1,12 @@ # Template file for 'id3ted' pkgname=id3ted version=1.0 -revision=1 +revision=2 build_style=gnu-makefile makedepends="file-devel taglib-devel" short_desc="Command line id3 tag editor" maintainer="Piotr Wójcik <chocimier@tlen.pl>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/muennich/id3ted" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1 From d1cb223af7df2d4cb92ee552e9c5aefb7135bf68 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:21:16 -0700 Subject: [PATCH 04/14] idesk: fix license --- srcpkgs/idesk/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/idesk/template b/srcpkgs/idesk/template index 8181d8fa3ed1..19d6d4979b36 100644 --- a/srcpkgs/idesk/template +++ b/srcpkgs/idesk/template @@ -1,15 +1,15 @@ # Template file for 'idesk' pkgname=idesk version=0.7.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel libpng-devel libXft-devel libXpm-devel tiff-devel" short_desc="Gives users of minimal wm's icons on their desktop" maintainer="Orphaned <orphan@voidlinux.org>" +license="BSD-3-Clause" homepage="http://idesk.sourceforge.net" -license="BSD" distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2" checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3 @@ -27,4 +27,3 @@ pre_configure() { post_install() { vlicense COPYING } - From 98cb0003af63a5285f21311f006e4d601787ef92 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:31:57 -0700 Subject: [PATCH 05/14] idle3-tools: fix license --- srcpkgs/idle3-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/idle3-tools/template b/srcpkgs/idle3-tools/template index 58342b9d7ed8..30c4d084ef4d 100644 --- a/srcpkgs/idle3-tools/template +++ b/srcpkgs/idle3-tools/template @@ -1,12 +1,12 @@ # Template file for 'idle3-tools' pkgname=idle3-tools version=0.9.1 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" short_desc="Read, Set or disable the idle3 timer of Western Digital drives" maintainer="Christopher Brannon <chris@the-brannons.com>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://idle3-tools.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum=9778060c7873ad2c9c40db3a7049d8ca22535427b982ff12f5bd519f703f2a02 From 4caacf86968367825ad0ed6067b8610bcdfb6c8c Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Fri, 23 Apr 2021 12:09:21 -0700 Subject: [PATCH 06/14] ifenslave: fix license --- srcpkgs/ifenslave/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template index 6f3b554bee9d..377f1bf55113 100644 --- a/srcpkgs/ifenslave/template +++ b/srcpkgs/ifenslave/template @@ -1,11 +1,11 @@ # Template file for 'ifenslave' pkgname=ifenslave version=1.1.0 -revision=6 +revision=7 short_desc="Attach and detach slave interfaces to a bonding device" -homepage="http://www.kernel.org" -license="GPL-2" maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-only" +homepage="http://www.kernel.org" do_build() { ${CC} ${CFLAGS} -fPIE ${LDFLAGS} -pie -Wall -Wstrict-prototypes \ From 93b3f62ebd7416e7f7a156b919f3a786c6e66c30 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:16:18 -0700 Subject: [PATCH 07/14] ifstatus: fix license --- srcpkgs/ifstatus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifstatus/template b/srcpkgs/ifstatus/template index f1e9d9f4d802..cbc0845cfeb9 100644 --- a/srcpkgs/ifstatus/template +++ b/srcpkgs/ifstatus/template @@ -1,18 +1,18 @@ # Template file for 'ifstatus' pkgname=ifstatus version=2.0.0 -revision=1 +revision=2 wrksrc=ifstatus-v${version} build_style=gnu-makefile -patch_args="-Np1" hostmakedepends="pkg-config" makedepends="ncurses-devel" short_desc="Display network traffic on console" maintainer="lemmi <lemmi@nerd2nerd.org>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ifstatus.sourceforge.net/graphic/index.html" distfiles="http://ifstatus.sourceforge.net/download/ifstatus-v${version}.tar.gz" checksum=7b4a6124b02e41b4fe532a634bbc66e5749145d1963455190c20f5518513c258 +patch_args="-Np1" do_install() { vbin ifstatus From 379e9475da17771a045452694cfcc331d86b8f8e Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:18:35 -0700 Subject: [PATCH 08/14] input-utils: fix license, other lint --- srcpkgs/input-utils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/input-utils/template b/srcpkgs/input-utils/template index 35b48c548e26..0bb836ca0090 100644 --- a/srcpkgs/input-utils/template +++ b/srcpkgs/input-utils/template @@ -1,15 +1,15 @@ # Template file for 'input-utils' pkgname=input-utils version=1.3 -revision=1 +revision=2 +wrksrc="input-${version}" build_style=gnu-makefile -maintainer="Orphaned <orphan@voidlinux.org>" short_desc="Small collection of input layer utilities" +maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-or-later" homepage="https://www.kraxel.org/blog/linux/input/" -license="GPL-2" distfiles="https://www.kraxel.org/releases/input/input-${version}.tar.gz" checksum=9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 -wrksrc="input-${version}" do_install() { vman lsinput.man lsinput.8 From 519e253f3ebb861ca08eb68cf8b0dbdd1c6961aa Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:20:30 -0700 Subject: [PATCH 09/14] intel-video-accel: fix license, lint, orphan --- srcpkgs/intel-video-accel/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/intel-video-accel/template b/srcpkgs/intel-video-accel/template index 23a306d29d0d..0cd0ef25e3af 100644 --- a/srcpkgs/intel-video-accel/template +++ b/srcpkgs/intel-video-accel/template @@ -1,14 +1,14 @@ # Template file for 'intel-video-accel' pkgname=intel-video-accel version=1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=meta -homepage="http://www.voidlinux.org" -short_desc="Intel Video Acceleration meta-pkg" -maintainer="Juan RP <xtraeme@gmail.com>" -license="Public domain" depends="libva-intel-driver linux-firmware-intel" +short_desc="Intel Video Acceleration meta-pkg" +maintainer="Orphaned <orphan@voidlinux.org>" +license="Public Domain" +homepage="http://www.voidlinux.org" case "$XBPS_TARGET_MACHINE" in x86_64*) depends+=" intel-media-driver";; esac From 587ce3dd51afc2b8f9365ce683b43d497d4cd0b2 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:38:07 -0700 Subject: [PATCH 10/14] iouyap: fix license --- srcpkgs/iouyap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template index 09cd966c6e12..e1dd0c7c9a27 100644 --- a/srcpkgs/iouyap/template +++ b/srcpkgs/iouyap/template @@ -1,12 +1,12 @@ # Template file for 'iouyap' pkgname=iouyap version=0.97 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex" short_desc="Bridge IOU to UDP, TAP and Ethernet" maintainer="Michael Aldridge <maldridge@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/GNS3/iouyap" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf From eab838be73dd7dbaa55ab8d79d9de82ccc031e2f Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:47:35 -0700 Subject: [PATCH 11/14] ipmitool: fix license --- srcpkgs/ipmitool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index eab8e525c878..bad8867e910b 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,12 +1,12 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=8 +revision=9 build_style=gnu-configure makedepends="openssl-devel" short_desc="Command-line interface to IPMI-enabled devices" maintainer="Frank Steinborn <steinex@nognu.de>" -license="BSD" +license="BSD-3-Clause" homepage="http://ipmitool.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 From 60f0b34826a15219714388080e148847cbd0b775 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:50:28 -0700 Subject: [PATCH 12/14] iprange: fix license --- srcpkgs/iprange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iprange/template b/srcpkgs/iprange/template index 31c86d224f4a..9369c0d93472 100644 --- a/srcpkgs/iprange/template +++ b/srcpkgs/iprange/template @@ -1,13 +1,13 @@ # Template file for 'iprange' pkgname=iprange version=1.0.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-man" hostmakedepends="automake" short_desc="Manage IP ranges" maintainer="Diogo Leal <diogo@diogoleal.com>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/firehol/iprange/" distfiles="https://github.com/firehol/iprange/archive/v${version}.tar.gz" checksum=17732630a014d233807a20a4abbd7cdf2a930c92fcc1b4e5ca2a55e9c0ea4973 From 8d70105c39ace6ff163e44d5699a5e9fb70db7b8 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:58:14 -0700 Subject: [PATCH 13/14] irrlicht: fix license --- srcpkgs/irrlicht/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template index b8e852b7be5d..191d8b6dcc1b 100644 --- a/srcpkgs/irrlicht/template +++ b/srcpkgs/irrlicht/template @@ -1,12 +1,12 @@ # Template file for 'irrlicht' pkgname=irrlicht version=1.8.4 -revision=2 +revision=3 hostmakedepends="unzip pkg-config" makedepends="libjpeg-turbo-devel libpng-devel libXcursor-devel libXext-devel MesaLib-devel" short_desc="Lightning fast realtime 3D engine" maintainer="Orphaned <orphan@voidlinux.org>" -license="LGPL-2.1" +license="BSD-3-Clause, bzip2-1.0.5, IJG, Libpng" homepage="http://irrlicht.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.zip" checksum=f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 @@ -46,6 +46,9 @@ do_install() { ln -s libIrrlicht.so.${version} libIrrlicht.so.1 } +post_install() { + vlicense doc/irrlicht-license.txt +} irrlicht-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" From a845348cf5283457bb875154fcf3abb008ed024e Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 28 Apr 2021 00:26:32 -0700 Subject: [PATCH 14/14] isl15: fix license, other lint --- srcpkgs/isl15/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template index 25daa4358d8b..fefa40790ed6 100644 --- a/srcpkgs/isl15/template +++ b/srcpkgs/isl15/template @@ -1,21 +1,22 @@ -# Template file for 'isl15'. +# Template file for 'isl15' pkgname=isl15 version=0.19 -revision=1 +revision=3 wrksrc="isl-${version}" bootstrap=yes build_style=gnu-configure makedepends="gmp-devel" short_desc="Integer Set Library" maintainer="Orphaned <orphan@voidlinux.org>" +license="MIT" homepage="http://freecode.com/projects/isl" -license="LGPL-2.1" distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2" checksum=d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8 post_install() { # Remove gdb python files. rm -f ${DESTDIR}/usr/lib/*.py + vlicense LICENSE } isl15-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --] There is an updated pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_i https://github.com/void-linux/void-packages/pull/30573 Omnibus lint pass for SPDX errors, most packages starting with I <!-- 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, (ARCH-LIBC) - [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/30573.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_i-30573.patch --] [-- Type: text/x-diff, Size: 14587 bytes --] From 4260dca8e2963bdea5a7b590f59eba9838ae0d8f Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 14 Apr 2021 11:02:42 -0700 Subject: [PATCH 01/14] iat: fix license, short desc --- srcpkgs/iat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template index f7921c53bf14..7d0dd685d250 100644 --- a/srcpkgs/iat/template +++ b/srcpkgs/iat/template @@ -1,11 +1,11 @@ # Template file for 'iat' pkgname=iat version=0.1.7 -revision=3 +revision=4 build_style=gnu-configure -short_desc="A tool for detecting the structure of many types of CD/DVD image" +short_desc="Tool for detecting the structure of many types of CD/DVD image" maintainer="Orphaned <orphan@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://sourceforge.net/projects/iat.berlios/" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz" checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21 From 35490dd3552af02bb2b23d278156842dadadbc7f Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:14:57 -0700 Subject: [PATCH 02/14] id3: fix license --- srcpkgs/id3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template index 336382beefe4..4c6330ff92ea 100644 --- a/srcpkgs/id3/template +++ b/srcpkgs/id3/template @@ -1,12 +1,12 @@ # Template file for 'id3' pkgname=id3 version=0.80 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="prefix=/usr mandir=/usr/share/man" short_desc="Tool for manipulating id3 and id3v2 tags in multiple files" maintainer="Orphaned <orphan@voidlinux.org>" -license="BSD" +license="BSD-2-Clause" homepage="https://squell.github.io/id3/" distfiles="https://github.com/squell/id3/releases/download/${version}/id3-${version}.tar.gz" checksum=aa61735c5806ed77b71de1408a78371d04add8c8c9b1532a055949081e5a35e2 From f08e5927e6302450cd3a91cffbc2d171bd9e127f Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:16:50 -0700 Subject: [PATCH 03/14] id3ted: fix license --- srcpkgs/id3ted/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template index 2b3f0e54c206..b993e5a37137 100644 --- a/srcpkgs/id3ted/template +++ b/srcpkgs/id3ted/template @@ -1,12 +1,12 @@ # Template file for 'id3ted' pkgname=id3ted version=1.0 -revision=1 +revision=2 build_style=gnu-makefile makedepends="file-devel taglib-devel" short_desc="Command line id3 tag editor" maintainer="Piotr Wójcik <chocimier@tlen.pl>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/muennich/id3ted" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1 From 204952d9bb817e2ad5067054512a5044e13f69ba Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:21:16 -0700 Subject: [PATCH 04/14] idesk: fix license --- srcpkgs/idesk/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/idesk/template b/srcpkgs/idesk/template index 8181d8fa3ed1..19d6d4979b36 100644 --- a/srcpkgs/idesk/template +++ b/srcpkgs/idesk/template @@ -1,15 +1,15 @@ # Template file for 'idesk' pkgname=idesk version=0.7.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel libpng-devel libXft-devel libXpm-devel tiff-devel" short_desc="Gives users of minimal wm's icons on their desktop" maintainer="Orphaned <orphan@voidlinux.org>" +license="BSD-3-Clause" homepage="http://idesk.sourceforge.net" -license="BSD" distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2" checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3 @@ -27,4 +27,3 @@ pre_configure() { post_install() { vlicense COPYING } - From 7b6068f12f3f2babdc8d767b1f17f3ec70464dbf Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:31:57 -0700 Subject: [PATCH 05/14] idle3-tools: fix license --- srcpkgs/idle3-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/idle3-tools/template b/srcpkgs/idle3-tools/template index 58342b9d7ed8..30c4d084ef4d 100644 --- a/srcpkgs/idle3-tools/template +++ b/srcpkgs/idle3-tools/template @@ -1,12 +1,12 @@ # Template file for 'idle3-tools' pkgname=idle3-tools version=0.9.1 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" short_desc="Read, Set or disable the idle3 timer of Western Digital drives" maintainer="Christopher Brannon <chris@the-brannons.com>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://idle3-tools.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum=9778060c7873ad2c9c40db3a7049d8ca22535427b982ff12f5bd519f703f2a02 From d9cd2b7e8e95d29b1f63da1e6467012d7a807fc1 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Fri, 23 Apr 2021 12:09:21 -0700 Subject: [PATCH 06/14] ifenslave: fix license --- srcpkgs/ifenslave/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template index 6f3b554bee9d..377f1bf55113 100644 --- a/srcpkgs/ifenslave/template +++ b/srcpkgs/ifenslave/template @@ -1,11 +1,11 @@ # Template file for 'ifenslave' pkgname=ifenslave version=1.1.0 -revision=6 +revision=7 short_desc="Attach and detach slave interfaces to a bonding device" -homepage="http://www.kernel.org" -license="GPL-2" maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-only" +homepage="http://www.kernel.org" do_build() { ${CC} ${CFLAGS} -fPIE ${LDFLAGS} -pie -Wall -Wstrict-prototypes \ From b00c2fad7666c4377f3dc151e50c86698c926ace Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:16:18 -0700 Subject: [PATCH 07/14] ifstatus: fix license --- srcpkgs/ifstatus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifstatus/template b/srcpkgs/ifstatus/template index f1e9d9f4d802..cbc0845cfeb9 100644 --- a/srcpkgs/ifstatus/template +++ b/srcpkgs/ifstatus/template @@ -1,18 +1,18 @@ # Template file for 'ifstatus' pkgname=ifstatus version=2.0.0 -revision=1 +revision=2 wrksrc=ifstatus-v${version} build_style=gnu-makefile -patch_args="-Np1" hostmakedepends="pkg-config" makedepends="ncurses-devel" short_desc="Display network traffic on console" maintainer="lemmi <lemmi@nerd2nerd.org>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ifstatus.sourceforge.net/graphic/index.html" distfiles="http://ifstatus.sourceforge.net/download/ifstatus-v${version}.tar.gz" checksum=7b4a6124b02e41b4fe532a634bbc66e5749145d1963455190c20f5518513c258 +patch_args="-Np1" do_install() { vbin ifstatus From c9af26fdbc22be62c54c49e50829a6298948ddf1 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:18:35 -0700 Subject: [PATCH 08/14] input-utils: fix license, other lint --- srcpkgs/input-utils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/input-utils/template b/srcpkgs/input-utils/template index 35b48c548e26..0bb836ca0090 100644 --- a/srcpkgs/input-utils/template +++ b/srcpkgs/input-utils/template @@ -1,15 +1,15 @@ # Template file for 'input-utils' pkgname=input-utils version=1.3 -revision=1 +revision=2 +wrksrc="input-${version}" build_style=gnu-makefile -maintainer="Orphaned <orphan@voidlinux.org>" short_desc="Small collection of input layer utilities" +maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-or-later" homepage="https://www.kraxel.org/blog/linux/input/" -license="GPL-2" distfiles="https://www.kraxel.org/releases/input/input-${version}.tar.gz" checksum=9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 -wrksrc="input-${version}" do_install() { vman lsinput.man lsinput.8 From cf17e9f757fde23630b59575a6adefcf7b713467 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:20:30 -0700 Subject: [PATCH 09/14] intel-video-accel: fix license, lint, orphan --- srcpkgs/intel-video-accel/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/intel-video-accel/template b/srcpkgs/intel-video-accel/template index 23a306d29d0d..0cd0ef25e3af 100644 --- a/srcpkgs/intel-video-accel/template +++ b/srcpkgs/intel-video-accel/template @@ -1,14 +1,14 @@ # Template file for 'intel-video-accel' pkgname=intel-video-accel version=1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=meta -homepage="http://www.voidlinux.org" -short_desc="Intel Video Acceleration meta-pkg" -maintainer="Juan RP <xtraeme@gmail.com>" -license="Public domain" depends="libva-intel-driver linux-firmware-intel" +short_desc="Intel Video Acceleration meta-pkg" +maintainer="Orphaned <orphan@voidlinux.org>" +license="Public Domain" +homepage="http://www.voidlinux.org" case "$XBPS_TARGET_MACHINE" in x86_64*) depends+=" intel-media-driver";; esac From e9371983eb76c025c8a676a5f07a86a9b0afa850 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:38:07 -0700 Subject: [PATCH 10/14] iouyap: fix license --- srcpkgs/iouyap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template index 09cd966c6e12..e1dd0c7c9a27 100644 --- a/srcpkgs/iouyap/template +++ b/srcpkgs/iouyap/template @@ -1,12 +1,12 @@ # Template file for 'iouyap' pkgname=iouyap version=0.97 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex" short_desc="Bridge IOU to UDP, TAP and Ethernet" maintainer="Michael Aldridge <maldridge@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/GNS3/iouyap" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf From f30fa88dab0373f496083d05da43392dd9c5d994 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:47:35 -0700 Subject: [PATCH 11/14] ipmitool: fix license --- srcpkgs/ipmitool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index eab8e525c878..bad8867e910b 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,12 +1,12 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=8 +revision=9 build_style=gnu-configure makedepends="openssl-devel" short_desc="Command-line interface to IPMI-enabled devices" maintainer="Frank Steinborn <steinex@nognu.de>" -license="BSD" +license="BSD-3-Clause" homepage="http://ipmitool.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 From 3ecff51f640f7d3496b9b648a11145ce26c9a3dd Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:50:28 -0700 Subject: [PATCH 12/14] iprange: fix license --- srcpkgs/iprange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iprange/template b/srcpkgs/iprange/template index 31c86d224f4a..9369c0d93472 100644 --- a/srcpkgs/iprange/template +++ b/srcpkgs/iprange/template @@ -1,13 +1,13 @@ # Template file for 'iprange' pkgname=iprange version=1.0.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-man" hostmakedepends="automake" short_desc="Manage IP ranges" maintainer="Diogo Leal <diogo@diogoleal.com>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/firehol/iprange/" distfiles="https://github.com/firehol/iprange/archive/v${version}.tar.gz" checksum=17732630a014d233807a20a4abbd7cdf2a930c92fcc1b4e5ca2a55e9c0ea4973 From 0594cc65c26bfeaf143e235a91fd7ad11cae8c99 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:58:14 -0700 Subject: [PATCH 13/14] irrlicht: fix license --- srcpkgs/irrlicht/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template index b8e852b7be5d..191d8b6dcc1b 100644 --- a/srcpkgs/irrlicht/template +++ b/srcpkgs/irrlicht/template @@ -1,12 +1,12 @@ # Template file for 'irrlicht' pkgname=irrlicht version=1.8.4 -revision=2 +revision=3 hostmakedepends="unzip pkg-config" makedepends="libjpeg-turbo-devel libpng-devel libXcursor-devel libXext-devel MesaLib-devel" short_desc="Lightning fast realtime 3D engine" maintainer="Orphaned <orphan@voidlinux.org>" -license="LGPL-2.1" +license="BSD-3-Clause, bzip2-1.0.5, IJG, Libpng" homepage="http://irrlicht.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.zip" checksum=f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 @@ -46,6 +46,9 @@ do_install() { ln -s libIrrlicht.so.${version} libIrrlicht.so.1 } +post_install() { + vlicense doc/irrlicht-license.txt +} irrlicht-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" From a20a3670a7108153e7f906f14b2fcd03172d66d6 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 28 Apr 2021 00:26:32 -0700 Subject: [PATCH 14/14] isl15: fix license, other lint --- srcpkgs/isl15/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template index 25daa4358d8b..fefa40790ed6 100644 --- a/srcpkgs/isl15/template +++ b/srcpkgs/isl15/template @@ -1,21 +1,22 @@ -# Template file for 'isl15'. +# Template file for 'isl15' pkgname=isl15 version=0.19 -revision=1 +revision=3 wrksrc="isl-${version}" bootstrap=yes build_style=gnu-configure makedepends="gmp-devel" short_desc="Integer Set Library" maintainer="Orphaned <orphan@voidlinux.org>" +license="MIT" homepage="http://freecode.com/projects/isl" -license="LGPL-2.1" distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2" checksum=d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8 post_install() { # Remove gdb python files. rm -f ${DESTDIR}/usr/lib/*.py + vlicense LICENSE } isl15-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --] There is an updated pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_i https://github.com/void-linux/void-packages/pull/30573 Omnibus lint pass for SPDX errors, most packages starting with I <!-- 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, (ARCH-LIBC) - [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/30573.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_i-30573.patch --] [-- Type: text/x-diff, Size: 14587 bytes --] From bd23b0fc6941025d31b3beb62579bdb1f89bbf4e Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 14 Apr 2021 11:02:42 -0700 Subject: [PATCH 01/14] iat: fix license, short desc --- srcpkgs/iat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template index f7921c53bf14..7d0dd685d250 100644 --- a/srcpkgs/iat/template +++ b/srcpkgs/iat/template @@ -1,11 +1,11 @@ # Template file for 'iat' pkgname=iat version=0.1.7 -revision=3 +revision=4 build_style=gnu-configure -short_desc="A tool for detecting the structure of many types of CD/DVD image" +short_desc="Tool for detecting the structure of many types of CD/DVD image" maintainer="Orphaned <orphan@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://sourceforge.net/projects/iat.berlios/" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz" checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21 From fd0a9c69a4a3d562579cb829c1c7e970e6783a92 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:14:57 -0700 Subject: [PATCH 02/14] id3: fix license --- srcpkgs/id3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template index 336382beefe4..4c6330ff92ea 100644 --- a/srcpkgs/id3/template +++ b/srcpkgs/id3/template @@ -1,12 +1,12 @@ # Template file for 'id3' pkgname=id3 version=0.80 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="prefix=/usr mandir=/usr/share/man" short_desc="Tool for manipulating id3 and id3v2 tags in multiple files" maintainer="Orphaned <orphan@voidlinux.org>" -license="BSD" +license="BSD-2-Clause" homepage="https://squell.github.io/id3/" distfiles="https://github.com/squell/id3/releases/download/${version}/id3-${version}.tar.gz" checksum=aa61735c5806ed77b71de1408a78371d04add8c8c9b1532a055949081e5a35e2 From ceba6adcee760744d826493fa5fef124a5db5419 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:16:50 -0700 Subject: [PATCH 03/14] id3ted: fix license --- srcpkgs/id3ted/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template index 2b3f0e54c206..b993e5a37137 100644 --- a/srcpkgs/id3ted/template +++ b/srcpkgs/id3ted/template @@ -1,12 +1,12 @@ # Template file for 'id3ted' pkgname=id3ted version=1.0 -revision=1 +revision=2 build_style=gnu-makefile makedepends="file-devel taglib-devel" short_desc="Command line id3 tag editor" maintainer="Piotr Wójcik <chocimier@tlen.pl>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/muennich/id3ted" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1 From 234352a7eb25353cf63ebfc031740e36b9d731be Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:21:16 -0700 Subject: [PATCH 04/14] idesk: fix license --- srcpkgs/idesk/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/idesk/template b/srcpkgs/idesk/template index 8181d8fa3ed1..19d6d4979b36 100644 --- a/srcpkgs/idesk/template +++ b/srcpkgs/idesk/template @@ -1,15 +1,15 @@ # Template file for 'idesk' pkgname=idesk version=0.7.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel libpng-devel libXft-devel libXpm-devel tiff-devel" short_desc="Gives users of minimal wm's icons on their desktop" maintainer="Orphaned <orphan@voidlinux.org>" +license="BSD-3-Clause" homepage="http://idesk.sourceforge.net" -license="BSD" distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2" checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3 @@ -27,4 +27,3 @@ pre_configure() { post_install() { vlicense COPYING } - From c2001aaeef5570ea6eb8df34838380dad4f106c5 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:31:57 -0700 Subject: [PATCH 05/14] idle3-tools: fix license --- srcpkgs/idle3-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/idle3-tools/template b/srcpkgs/idle3-tools/template index 58342b9d7ed8..30c4d084ef4d 100644 --- a/srcpkgs/idle3-tools/template +++ b/srcpkgs/idle3-tools/template @@ -1,12 +1,12 @@ # Template file for 'idle3-tools' pkgname=idle3-tools version=0.9.1 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" short_desc="Read, Set or disable the idle3 timer of Western Digital drives" maintainer="Christopher Brannon <chris@the-brannons.com>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://idle3-tools.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum=9778060c7873ad2c9c40db3a7049d8ca22535427b982ff12f5bd519f703f2a02 From 7047911fed3490c5f51bc9916ac12cd660c380d4 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Fri, 23 Apr 2021 12:09:21 -0700 Subject: [PATCH 06/14] ifenslave: fix license --- srcpkgs/ifenslave/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template index 6f3b554bee9d..377f1bf55113 100644 --- a/srcpkgs/ifenslave/template +++ b/srcpkgs/ifenslave/template @@ -1,11 +1,11 @@ # Template file for 'ifenslave' pkgname=ifenslave version=1.1.0 -revision=6 +revision=7 short_desc="Attach and detach slave interfaces to a bonding device" -homepage="http://www.kernel.org" -license="GPL-2" maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-only" +homepage="http://www.kernel.org" do_build() { ${CC} ${CFLAGS} -fPIE ${LDFLAGS} -pie -Wall -Wstrict-prototypes \ From 389b829323ae39d3b2922ebd78e1b2ae69ec6602 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:16:18 -0700 Subject: [PATCH 07/14] ifstatus: fix license --- srcpkgs/ifstatus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifstatus/template b/srcpkgs/ifstatus/template index f1e9d9f4d802..cbc0845cfeb9 100644 --- a/srcpkgs/ifstatus/template +++ b/srcpkgs/ifstatus/template @@ -1,18 +1,18 @@ # Template file for 'ifstatus' pkgname=ifstatus version=2.0.0 -revision=1 +revision=2 wrksrc=ifstatus-v${version} build_style=gnu-makefile -patch_args="-Np1" hostmakedepends="pkg-config" makedepends="ncurses-devel" short_desc="Display network traffic on console" maintainer="lemmi <lemmi@nerd2nerd.org>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ifstatus.sourceforge.net/graphic/index.html" distfiles="http://ifstatus.sourceforge.net/download/ifstatus-v${version}.tar.gz" checksum=7b4a6124b02e41b4fe532a634bbc66e5749145d1963455190c20f5518513c258 +patch_args="-Np1" do_install() { vbin ifstatus From 57c3179400498a389d918fcf700609d183519ee6 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:18:35 -0700 Subject: [PATCH 08/14] input-utils: fix license, other lint --- srcpkgs/input-utils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/input-utils/template b/srcpkgs/input-utils/template index 35b48c548e26..0bb836ca0090 100644 --- a/srcpkgs/input-utils/template +++ b/srcpkgs/input-utils/template @@ -1,15 +1,15 @@ # Template file for 'input-utils' pkgname=input-utils version=1.3 -revision=1 +revision=2 +wrksrc="input-${version}" build_style=gnu-makefile -maintainer="Orphaned <orphan@voidlinux.org>" short_desc="Small collection of input layer utilities" +maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-or-later" homepage="https://www.kraxel.org/blog/linux/input/" -license="GPL-2" distfiles="https://www.kraxel.org/releases/input/input-${version}.tar.gz" checksum=9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 -wrksrc="input-${version}" do_install() { vman lsinput.man lsinput.8 From c2ba87b5647184c3f0f4a368004c5f44d5240c44 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:20:30 -0700 Subject: [PATCH 09/14] intel-video-accel: fix license, lint, orphan --- srcpkgs/intel-video-accel/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/intel-video-accel/template b/srcpkgs/intel-video-accel/template index 23a306d29d0d..0cd0ef25e3af 100644 --- a/srcpkgs/intel-video-accel/template +++ b/srcpkgs/intel-video-accel/template @@ -1,14 +1,14 @@ # Template file for 'intel-video-accel' pkgname=intel-video-accel version=1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=meta -homepage="http://www.voidlinux.org" -short_desc="Intel Video Acceleration meta-pkg" -maintainer="Juan RP <xtraeme@gmail.com>" -license="Public domain" depends="libva-intel-driver linux-firmware-intel" +short_desc="Intel Video Acceleration meta-pkg" +maintainer="Orphaned <orphan@voidlinux.org>" +license="Public Domain" +homepage="http://www.voidlinux.org" case "$XBPS_TARGET_MACHINE" in x86_64*) depends+=" intel-media-driver";; esac From ce5e1df7759679471f9d127dbb2dbe0c7202fd92 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:38:07 -0700 Subject: [PATCH 10/14] iouyap: fix license --- srcpkgs/iouyap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template index 09cd966c6e12..e1dd0c7c9a27 100644 --- a/srcpkgs/iouyap/template +++ b/srcpkgs/iouyap/template @@ -1,12 +1,12 @@ # Template file for 'iouyap' pkgname=iouyap version=0.97 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex" short_desc="Bridge IOU to UDP, TAP and Ethernet" maintainer="Michael Aldridge <maldridge@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/GNS3/iouyap" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf From 1d2088fb9e5ca8e4ca9884c410d24b37d0af5bda Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:47:35 -0700 Subject: [PATCH 11/14] ipmitool: fix license --- srcpkgs/ipmitool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index eab8e525c878..bad8867e910b 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,12 +1,12 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=8 +revision=9 build_style=gnu-configure makedepends="openssl-devel" short_desc="Command-line interface to IPMI-enabled devices" maintainer="Frank Steinborn <steinex@nognu.de>" -license="BSD" +license="BSD-3-Clause" homepage="http://ipmitool.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 From 60e6a7af2cbfeeed05b06c95f2e904a70c09d1ef Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:50:28 -0700 Subject: [PATCH 12/14] iprange: fix license --- srcpkgs/iprange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iprange/template b/srcpkgs/iprange/template index 31c86d224f4a..9369c0d93472 100644 --- a/srcpkgs/iprange/template +++ b/srcpkgs/iprange/template @@ -1,13 +1,13 @@ # Template file for 'iprange' pkgname=iprange version=1.0.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-man" hostmakedepends="automake" short_desc="Manage IP ranges" maintainer="Diogo Leal <diogo@diogoleal.com>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/firehol/iprange/" distfiles="https://github.com/firehol/iprange/archive/v${version}.tar.gz" checksum=17732630a014d233807a20a4abbd7cdf2a930c92fcc1b4e5ca2a55e9c0ea4973 From 96541ecf2091f8bcce70b10026c9b8cf285e735c Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:58:14 -0700 Subject: [PATCH 13/14] irrlicht: fix license --- srcpkgs/irrlicht/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template index b8e852b7be5d..191d8b6dcc1b 100644 --- a/srcpkgs/irrlicht/template +++ b/srcpkgs/irrlicht/template @@ -1,12 +1,12 @@ # Template file for 'irrlicht' pkgname=irrlicht version=1.8.4 -revision=2 +revision=3 hostmakedepends="unzip pkg-config" makedepends="libjpeg-turbo-devel libpng-devel libXcursor-devel libXext-devel MesaLib-devel" short_desc="Lightning fast realtime 3D engine" maintainer="Orphaned <orphan@voidlinux.org>" -license="LGPL-2.1" +license="BSD-3-Clause, bzip2-1.0.5, IJG, Libpng" homepage="http://irrlicht.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.zip" checksum=f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 @@ -46,6 +46,9 @@ do_install() { ln -s libIrrlicht.so.${version} libIrrlicht.so.1 } +post_install() { + vlicense doc/irrlicht-license.txt +} irrlicht-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" From 86cf7b4ff1169e200f7163dea3d60ccdfe5e71fc Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 28 Apr 2021 00:26:32 -0700 Subject: [PATCH 14/14] isl15: fix license, other lint --- srcpkgs/isl15/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template index 25daa4358d8b..fefa40790ed6 100644 --- a/srcpkgs/isl15/template +++ b/srcpkgs/isl15/template @@ -1,21 +1,22 @@ -# Template file for 'isl15'. +# Template file for 'isl15' pkgname=isl15 version=0.19 -revision=1 +revision=3 wrksrc="isl-${version}" bootstrap=yes build_style=gnu-configure makedepends="gmp-devel" short_desc="Integer Set Library" maintainer="Orphaned <orphan@voidlinux.org>" +license="MIT" homepage="http://freecode.com/projects/isl" -license="LGPL-2.1" distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2" checksum=d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8 post_install() { # Remove gdb python files. rm -f ${DESTDIR}/usr/lib/*.py + vlicense LICENSE } isl15-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --] There is an updated pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_i https://github.com/void-linux/void-packages/pull/30573 Omnibus lint pass for SPDX errors, most packages starting with I <!-- 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, (ARCH-LIBC) - [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/30573.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_i-30573.patch --] [-- Type: text/x-diff, Size: 14513 bytes --] From d76f6aa269856250a3fb2fe1287a816e5d5f26dd Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 14 Apr 2021 11:02:42 -0700 Subject: [PATCH 01/14] iat: fix license, short desc --- srcpkgs/iat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template index f7921c53bf14..7d0dd685d250 100644 --- a/srcpkgs/iat/template +++ b/srcpkgs/iat/template @@ -1,11 +1,11 @@ # Template file for 'iat' pkgname=iat version=0.1.7 -revision=3 +revision=4 build_style=gnu-configure -short_desc="A tool for detecting the structure of many types of CD/DVD image" +short_desc="Tool for detecting the structure of many types of CD/DVD image" maintainer="Orphaned <orphan@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://sourceforge.net/projects/iat.berlios/" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz" checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21 From 19aa2f71de47c147d73cd18fbca720dccf19580c Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:14:57 -0700 Subject: [PATCH 02/14] id3: fix license --- srcpkgs/id3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3/template b/srcpkgs/id3/template index 336382beefe4..4c6330ff92ea 100644 --- a/srcpkgs/id3/template +++ b/srcpkgs/id3/template @@ -1,12 +1,12 @@ # Template file for 'id3' pkgname=id3 version=0.80 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="prefix=/usr mandir=/usr/share/man" short_desc="Tool for manipulating id3 and id3v2 tags in multiple files" maintainer="Orphaned <orphan@voidlinux.org>" -license="BSD" +license="BSD-2-Clause" homepage="https://squell.github.io/id3/" distfiles="https://github.com/squell/id3/releases/download/${version}/id3-${version}.tar.gz" checksum=aa61735c5806ed77b71de1408a78371d04add8c8c9b1532a055949081e5a35e2 From df33a402f41b09d4ef72a81aef3c5c2be9def952 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:16:50 -0700 Subject: [PATCH 03/14] id3ted: fix license --- srcpkgs/id3ted/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template index 2b3f0e54c206..b993e5a37137 100644 --- a/srcpkgs/id3ted/template +++ b/srcpkgs/id3ted/template @@ -1,12 +1,12 @@ # Template file for 'id3ted' pkgname=id3ted version=1.0 -revision=1 +revision=2 build_style=gnu-makefile makedepends="file-devel taglib-devel" short_desc="Command line id3 tag editor" maintainer="Piotr Wójcik <chocimier@tlen.pl>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/muennich/id3ted" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1 From 67a552783fc524096ee6482a3819c762f6384f62 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:21:16 -0700 Subject: [PATCH 04/14] idesk: fix license --- srcpkgs/idesk/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/idesk/template b/srcpkgs/idesk/template index 8181d8fa3ed1..19d6d4979b36 100644 --- a/srcpkgs/idesk/template +++ b/srcpkgs/idesk/template @@ -1,15 +1,15 @@ # Template file for 'idesk' pkgname=idesk version=0.7.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel libpng-devel libXft-devel libXpm-devel tiff-devel" short_desc="Gives users of minimal wm's icons on their desktop" maintainer="Orphaned <orphan@voidlinux.org>" +license="BSD-3-Clause" homepage="http://idesk.sourceforge.net" -license="BSD" distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2" checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3 @@ -27,4 +27,3 @@ pre_configure() { post_install() { vlicense COPYING } - From 0dd88dbe345c6767469f28eb03db61716bea6160 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Thu, 22 Apr 2021 23:31:57 -0700 Subject: [PATCH 05/14] idle3-tools: fix license --- srcpkgs/idle3-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/idle3-tools/template b/srcpkgs/idle3-tools/template index 58342b9d7ed8..30c4d084ef4d 100644 --- a/srcpkgs/idle3-tools/template +++ b/srcpkgs/idle3-tools/template @@ -1,12 +1,12 @@ # Template file for 'idle3-tools' pkgname=idle3-tools version=0.9.1 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" short_desc="Read, Set or disable the idle3 timer of Western Digital drives" maintainer="Christopher Brannon <chris@the-brannons.com>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://idle3-tools.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum=9778060c7873ad2c9c40db3a7049d8ca22535427b982ff12f5bd519f703f2a02 From cf6f7917d0dc82071d3726e9b834b3aff3d8db8d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Fri, 23 Apr 2021 12:09:21 -0700 Subject: [PATCH 06/14] ifenslave: fix license --- srcpkgs/ifenslave/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template index 6f3b554bee9d..377f1bf55113 100644 --- a/srcpkgs/ifenslave/template +++ b/srcpkgs/ifenslave/template @@ -1,11 +1,11 @@ # Template file for 'ifenslave' pkgname=ifenslave version=1.1.0 -revision=6 +revision=7 short_desc="Attach and detach slave interfaces to a bonding device" -homepage="http://www.kernel.org" -license="GPL-2" maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-only" +homepage="http://www.kernel.org" do_build() { ${CC} ${CFLAGS} -fPIE ${LDFLAGS} -pie -Wall -Wstrict-prototypes \ From b3fbef10103f58deaf88fe12a16b4426e65cba71 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:16:18 -0700 Subject: [PATCH 07/14] ifstatus: fix license --- srcpkgs/ifstatus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ifstatus/template b/srcpkgs/ifstatus/template index 2515a71d669a..5668de2e67f5 100644 --- a/srcpkgs/ifstatus/template +++ b/srcpkgs/ifstatus/template @@ -1,14 +1,14 @@ # Template file for 'ifstatus' pkgname=ifstatus version=2.0.0 -revision=1 +revision=2 wrksrc=ifstatus-v${version} build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="ncurses-devel" short_desc="Display network traffic on console" maintainer="lemmi <lemmi@nerd2nerd.org>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ifstatus.sourceforge.net/graphic/index.html" distfiles="http://ifstatus.sourceforge.net/download/ifstatus-v${version}.tar.gz" checksum=7b4a6124b02e41b4fe532a634bbc66e5749145d1963455190c20f5518513c258 From c2e4b491787ab0801fea503bf85cd183b49eb79c Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:18:35 -0700 Subject: [PATCH 08/14] input-utils: fix license, other lint --- srcpkgs/input-utils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/input-utils/template b/srcpkgs/input-utils/template index 35b48c548e26..0bb836ca0090 100644 --- a/srcpkgs/input-utils/template +++ b/srcpkgs/input-utils/template @@ -1,15 +1,15 @@ # Template file for 'input-utils' pkgname=input-utils version=1.3 -revision=1 +revision=2 +wrksrc="input-${version}" build_style=gnu-makefile -maintainer="Orphaned <orphan@voidlinux.org>" short_desc="Small collection of input layer utilities" +maintainer="Orphaned <orphan@voidlinux.org>" +license="GPL-2.0-or-later" homepage="https://www.kraxel.org/blog/linux/input/" -license="GPL-2" distfiles="https://www.kraxel.org/releases/input/input-${version}.tar.gz" checksum=9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 -wrksrc="input-${version}" do_install() { vman lsinput.man lsinput.8 From 1fc2ebe49b43168b882c980b506b10fb41263d98 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 26 Apr 2021 23:20:30 -0700 Subject: [PATCH 09/14] intel-video-accel: fix license, lint, orphan --- srcpkgs/intel-video-accel/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/intel-video-accel/template b/srcpkgs/intel-video-accel/template index 23a306d29d0d..0cd0ef25e3af 100644 --- a/srcpkgs/intel-video-accel/template +++ b/srcpkgs/intel-video-accel/template @@ -1,14 +1,14 @@ # Template file for 'intel-video-accel' pkgname=intel-video-accel version=1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=meta -homepage="http://www.voidlinux.org" -short_desc="Intel Video Acceleration meta-pkg" -maintainer="Juan RP <xtraeme@gmail.com>" -license="Public domain" depends="libva-intel-driver linux-firmware-intel" +short_desc="Intel Video Acceleration meta-pkg" +maintainer="Orphaned <orphan@voidlinux.org>" +license="Public Domain" +homepage="http://www.voidlinux.org" case "$XBPS_TARGET_MACHINE" in x86_64*) depends+=" intel-media-driver";; esac From 11c9544e39bdc0e8fad63d25dfe15f743818a107 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:38:07 -0700 Subject: [PATCH 10/14] iouyap: fix license --- srcpkgs/iouyap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template index 09cd966c6e12..e1dd0c7c9a27 100644 --- a/srcpkgs/iouyap/template +++ b/srcpkgs/iouyap/template @@ -1,12 +1,12 @@ # Template file for 'iouyap' pkgname=iouyap version=0.97 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex" short_desc="Bridge IOU to UDP, TAP and Ethernet" maintainer="Michael Aldridge <maldridge@voidlinux.org>" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/GNS3/iouyap" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf From 6cd15551e9e59335bc19653e8a4749a854189d7f Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:47:35 -0700 Subject: [PATCH 11/14] ipmitool: fix license --- srcpkgs/ipmitool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index eab8e525c878..bad8867e910b 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,12 +1,12 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=8 +revision=9 build_style=gnu-configure makedepends="openssl-devel" short_desc="Command-line interface to IPMI-enabled devices" maintainer="Frank Steinborn <steinex@nognu.de>" -license="BSD" +license="BSD-3-Clause" homepage="http://ipmitool.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 From 794e4bf613c927496a0d8ee393f6a1a8e9b529f5 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:50:28 -0700 Subject: [PATCH 12/14] iprange: fix license --- srcpkgs/iprange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iprange/template b/srcpkgs/iprange/template index 31c86d224f4a..9369c0d93472 100644 --- a/srcpkgs/iprange/template +++ b/srcpkgs/iprange/template @@ -1,13 +1,13 @@ # Template file for 'iprange' pkgname=iprange version=1.0.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-man" hostmakedepends="automake" short_desc="Manage IP ranges" maintainer="Diogo Leal <diogo@diogoleal.com>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/firehol/iprange/" distfiles="https://github.com/firehol/iprange/archive/v${version}.tar.gz" checksum=17732630a014d233807a20a4abbd7cdf2a930c92fcc1b4e5ca2a55e9c0ea4973 From 15119db7d3678a9436524a4b460f2a91fd9b8fc2 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Tue, 27 Apr 2021 23:58:14 -0700 Subject: [PATCH 13/14] irrlicht: fix license --- srcpkgs/irrlicht/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template index b8e852b7be5d..191d8b6dcc1b 100644 --- a/srcpkgs/irrlicht/template +++ b/srcpkgs/irrlicht/template @@ -1,12 +1,12 @@ # Template file for 'irrlicht' pkgname=irrlicht version=1.8.4 -revision=2 +revision=3 hostmakedepends="unzip pkg-config" makedepends="libjpeg-turbo-devel libpng-devel libXcursor-devel libXext-devel MesaLib-devel" short_desc="Lightning fast realtime 3D engine" maintainer="Orphaned <orphan@voidlinux.org>" -license="LGPL-2.1" +license="BSD-3-Clause, bzip2-1.0.5, IJG, Libpng" homepage="http://irrlicht.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.zip" checksum=f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 @@ -46,6 +46,9 @@ do_install() { ln -s libIrrlicht.so.${version} libIrrlicht.so.1 } +post_install() { + vlicense doc/irrlicht-license.txt +} irrlicht-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" From 8799b6d77ddadc7b77750e698d6f97d5c61f32b5 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 28 Apr 2021 00:26:32 -0700 Subject: [PATCH 14/14] isl15: fix license, other lint --- srcpkgs/isl15/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template index 25daa4358d8b..fefa40790ed6 100644 --- a/srcpkgs/isl15/template +++ b/srcpkgs/isl15/template @@ -1,21 +1,22 @@ -# Template file for 'isl15'. +# Template file for 'isl15' pkgname=isl15 version=0.19 -revision=1 +revision=3 wrksrc="isl-${version}" bootstrap=yes build_style=gnu-configure makedepends="gmp-devel" short_desc="Integer Set Library" maintainer="Orphaned <orphan@voidlinux.org>" +license="MIT" homepage="http://freecode.com/projects/isl" -license="LGPL-2.1" distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2" checksum=d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8 post_install() { # Remove gdb python files. rm -f ${DESTDIR}/usr/lib/*.py + vlicense LICENSE } isl15-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --] There is an updated pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_i https://github.com/void-linux/void-packages/pull/30573 Omnibus lint pass for SPDX errors, most packages starting with I <!-- 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, (ARCH-LIBC) - [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/30573.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_i-30573.patch --] [-- Type: text/x-diff, Size: 1524 bytes --] From 4ba799e924ea5acdcf7fb0bc5a58dbff82393236 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Wed, 14 Apr 2021 11:02:42 -0700 Subject: [PATCH] iat: fix license, short desc The license is a bit out of the norm for this. The software claims to be GPL 2, the license file that the bundle with it is the GPL 3 license, and it has the BSD-2-Clause license bundling requirements and disclaimer. I'm giving it a custom license to cover all of the angles but there is a chance that one half or the other entirely supersedes the rest. --- srcpkgs/iat/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template index f7921c53bf14..2bd0c6e84cf2 100644 --- a/srcpkgs/iat/template +++ b/srcpkgs/iat/template @@ -1,15 +1,17 @@ # Template file for 'iat' pkgname=iat version=0.1.7 -revision=3 +revision=4 build_style=gnu-configure -short_desc="A tool for detecting the structure of many types of CD/DVD image" +short_desc="Tool for detecting the structure of many types of CD/DVD image" maintainer="Orphaned <orphan@voidlinux.org>" -license="GPL-3" +license="custom:GPL-2.0-or-later-with-BSD-attribution-requirement" homepage="http://sourceforge.net/projects/iat.berlios/" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz" checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21 post_install() { + sed '2,34p;d' src/main.c > LICENSE + vlicense LICENSE rm -rf ${DESTDIR}/usr/include }
[-- Attachment #1: Type: text/plain, Size: 205 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/30573#issuecomment-910229734 Comment: Shouldn't this PR be closed, as the change has already been merged?
[-- Attachment #1: Type: text/plain, Size: 156 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/30573#issuecomment-910296859 Comment: Right, it's merged.
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --] There's a closed pull request on the void-packages repository Omnibus lint pass for SPDX errors, most packages starting with I https://github.com/void-linux/void-packages/pull/30573 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, (ARCH-LIBC) - [x] I built this PR locally for these architectures (if supported. mark crossbuilds): - [x] aarch64-musl - [ ] armv7l - [ ] armv6l-musl