* Re: [PR REVIEW] iat: fix license, description
2021-07-02 19:00 [PR PATCH] iat: fix license, description heliocat
@ 2021-07-03 0:07 ` sgn
2021-07-04 18:10 ` heliocat
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-07-03 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/31753#discussion_r663289315
Comment:
README and all source files is having `either version 2 of the License, or (at your option) any later version.`
Technically, `GPL-3.0-or-later` is a subset of `GPL-2.0-or-later`.
Also
```
* @ Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* @ Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
```
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR REVIEW] iat: fix license, description
2021-07-02 19:00 [PR PATCH] iat: fix license, description heliocat
2021-07-03 0:07 ` [PR REVIEW] " sgn
@ 2021-07-04 18:10 ` heliocat
2021-07-04 18:16 ` heliocat
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: heliocat @ 2021-07-04 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/31753#discussion_r663538550
Comment:
It is, however the license that they ship in COPYING is the GPL 3 so I went with that. You're right though, they made a mistake when picking a license file to include. I'm going to make a custom "GPL-2.0-or-later-with-attribution-requirement" license and then install that. That should put it in compliance with their requirement of reproducing the conditions list.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR REVIEW] iat: fix license, description
2021-07-02 19:00 [PR PATCH] iat: fix license, description heliocat
2021-07-03 0:07 ` [PR REVIEW] " sgn
2021-07-04 18:10 ` heliocat
@ 2021-07-04 18:16 ` heliocat
2021-07-04 18:22 ` [PR PATCH] [Updated] " heliocat
2021-07-24 2:25 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: heliocat @ 2021-07-04 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/31753#discussion_r663539162
Comment:
I looked a second time, that's the BSD-2-Clause license text, just with a "this is licensed under the GPL" header slapped on it.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] iat: fix license, description
2021-07-02 19:00 [PR PATCH] iat: fix license, description heliocat
` (2 preceding siblings ...)
2021-07-04 18:16 ` heliocat
@ 2021-07-04 18:22 ` heliocat
2021-07-24 2:25 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: heliocat @ 2021-07-04 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages iat
https://github.com/void-linux/void-packages/pull/31753
iat: fix license, description
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/31753.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iat-31753.patch --]
[-- Type: text/x-diff, Size: 2410 bytes --]
From a7fdfabf45c048a1f7b299fbd4d8ae5287a5f9dc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 14 Apr 2021 11:02:42 -0700
Subject: [PATCH 1/2] iat: fix license, description
---
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 85d4021a39295d9f8bc47458c995f407efc16d3f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 14 Apr 2021 11:02:42 -0700
Subject: [PATCH 2/2] 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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template
index 7d0dd685d250..2bd0c6e84cf2 100644
--- a/srcpkgs/iat/template
+++ b/srcpkgs/iat/template
@@ -5,11 +5,13 @@ revision=4
build_style=gnu-configure
short_desc="Tool for detecting the structure of many types of CD/DVD image"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+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
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Merged]: iat: fix license, description
2021-07-02 19:00 [PR PATCH] iat: fix license, description heliocat
` (3 preceding siblings ...)
2021-07-04 18:22 ` [PR PATCH] [Updated] " heliocat
@ 2021-07-24 2:25 ` sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-07-24 2:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]
There's a merged pull request on the void-packages repository
iat: fix license, description
https://github.com/void-linux/void-packages/pull/31753
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
^ permalink raw reply [flat|nested] 6+ messages in thread