[PR PATCH] Flac - fix license, take maintainership

[PR PATCH] Flac - fix license, take maintainership

[heliocat]

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

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

https://github.com/heliocat/void-packages flac
https://github.com/void-linux/void-packages/pull/29917

Flac - fix license, take maintainership
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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)
- [ ] 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/29917.patch is attached

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

From 6d1fd2d1883d7190c5c4b9914595ae2728b66931 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:26:44 -0700
Subject: [PATCH 1/4] fastjar: fix license

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

diff --git a/srcpkgs/fastjar/template b/srcpkgs/fastjar/template
index 8cf752699d20..6eab069f60ef 100644
--- a/srcpkgs/fastjar/template
+++ b/srcpkgs/fastjar/template
@@ -1,12 +1,12 @@
 # Template file for 'fastjar'
 pkgname=fastjar
 version=0.98
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="C implementation of Oracle's jar utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://savannah.nongnu.org/projects/fastjar"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145

From d7e18b4e72e8f94fa591e6ccc60125d211c3b1ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:30:41 -0700
Subject: [PATCH 2/4] fbset: fix license

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

diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template
index 05b2c28c27dc..22c51fae0eb7 100644
--- a/srcpkgs/fbset/template
+++ b/srcpkgs/fbset/template
@@ -1,13 +1,13 @@
 # Template file for 'fbset'
 pkgname=fbset
 version=2.1
-revision=5
+revision=6
 conf_files="/etc/fb.modes"
 hostmakedepends="flex"
 makedepends="libfl-devel"
 short_desc="Framebuffer device maintenance program"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://users.telenet.be/geertu/Linux/fbdev/"
 distfiles="${DEBIAN_SITE}/main/f/fbset/fbset_${version}.orig.tar.gz"
 checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338

From 3291028ef82275fc8097530481472a4bf02a9e3a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:53:10 -0700
Subject: [PATCH 3/4] fcron: fix license

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

diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index 231dd79c02b9..11efd44b0bbd 100644
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@@ -1,7 +1,7 @@
 # Template file for 'fcron'
 pkgname=fcron
 version=3.3.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="
 	--sysconfdir=/etc/fcron
@@ -27,7 +27,7 @@ makedepends="pam-devel readline-devel"
 depends="run-parts"
 short_desc="Feature-rich cron implementation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fcron.free.fr"
 distfiles="$homepage/archives/$pkgname-$version.src.tar.gz"
 checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60

From 81a3004729e25fa863c198ac00802f49acf9b064 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 19:52:34 -0700
Subject: [PATCH 4/4] flac: fix license, take maintainership

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

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 1644c37e086e..bf46f559a656 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,19 +1,19 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=2
-patch_args="-Np1"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
+ --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
 hostmakedepends="pkg-config nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Colin Booth <colin-void@heliocat.net>"
+license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://flac.sourceforge.net/"
-license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
+patch_args="-Np1"
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

Re: [PR PATCH] [Updated] Flac - fix license, take maintainership

[heliocat]

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

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

https://github.com/heliocat/void-packages flac
https://github.com/void-linux/void-packages/pull/29917

Flac - fix license, take maintainership
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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)
- [ ] 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/29917.patch is attached

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

From 61d99564ea88e2c5ebcd8ca566118a9fa3977817 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 19:52:34 -0700
Subject: [PATCH] flac: fix license, take maintainership

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

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 1644c37e086e..bf46f559a656 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,19 +1,19 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=2
-patch_args="-Np1"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
+ --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
 hostmakedepends="pkg-config nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Colin Booth <colin-void@heliocat.net>"
+license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://flac.sourceforge.net/"
-license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
+patch_args="-Np1"
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

Re: Flac - fix license, take maintainership

[heliocat]

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

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/29917#issuecomment-811702851

Comment:
The CI failures are because of a test that can't run as root. I'll see about eliding that particular one but it should be safe to merge since I've run tests locally on both glibc and musl for x86_64 and it passes both.

Re: [PR PATCH] [Updated] Flac - fix license, take maintainership

[heliocat]

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

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

https://github.com/heliocat/void-packages flac
https://github.com/void-linux/void-packages/pull/29917

Flac - fix license, take maintainership
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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)
- [ ] 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/29917.patch is attached

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

From 9ef3c5c973bee18828c97eebe189f0e90c6fba40 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 19:52:34 -0700
Subject: [PATCH] flac: fix license, take maintainership

---
 srcpkgs/flac/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 1644c37e086e..bc126d52029c 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,19 +1,21 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=2
-patch_args="-Np1"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
+ --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
 hostmakedepends="pkg-config nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Colin Booth <colin-void@heliocat.net>"
+license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://flac.sourceforge.net/"
-license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
+patch_args="-Np1"
+# the tests fail when run as root and as such break in the CI containers
+make_check=extended
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

Re: [PR PATCH] [Merged]: Flac - fix license, take maintainership

[ericonr]

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

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

Flac - fix license, take maintainership
https://github.com/void-linux/void-packages/pull/29917

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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl