[PR PATCH] zlib: fix license

[PR PATCH] zlib: fix license

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages zliblicense
https://github.com/void-linux/void-packages/pull/29805

zlib: fix license
<!-- 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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29805.patch is attached

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

From bf639dd63aafd63dff69ed32e8ded5890b511fcd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH] zlib: fix license

---
 srcpkgs/zlib/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..72d0d6677e7f 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="custom:zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
@@ -15,6 +15,11 @@ do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	sed -n '4,23p' zlib.h > LICENSE
+	vlicense LICENSE
+}
+
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808882475

Comment:
Wrong. The license for `zlib` is `Zlib`. It's perfectly valid SPDX license. https://spdx.org/licenses/Zlib.html

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808882475

Comment:
Wrong change. The license for `zlib` is `Zlib`. It's perfectly valid SPDX license. https://spdx.org/licenses/Zlib.html

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808882475

Comment:
Incorrect change. The license for `zlib` is `Zlib`. It's perfectly valid SPDX license. https://spdx.org/licenses/Zlib.html

You may want to uppercase `z` in `zlib` instead.

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808882475

Comment:
`Zlib` is a perfectly valid SPDX license. https://spdx.org/licenses/Zlib.html

You may want to uppercase `z` in `zlib` instead.

Re: [PR PATCH] [Updated] zlib: fix license

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages zliblicense
https://github.com/void-linux/void-packages/pull/29805

zlib: fix license
<!-- 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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29805.patch is attached

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

From ad3f723975bce7bcde38836d0a026651ff590337 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH] zlib: fix license

---
 srcpkgs/zlib/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..672b9e1354be 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
@@ -15,6 +15,11 @@ do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	sed -n '4,23p' zlib.h > LICENSE
+	vlicense LICENSE
+}
+
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"

Re: zlib: fix license

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808885000

Comment:
I just noticed that license gets installed only with zlib-devel, not sure why.

Re: zlib: fix license

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808885000

Comment:
I just noticed that license gets installed only with zlib-devel, shouldn't the `vmove /usr/share` line be deleted?

Re: zlib: fix license

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808885000

Comment:
I just noticed that license gets installed only with zlib-devel, shouldn't the `vmove usr/share` line be deleted?

Re: zlib: fix license

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808885000

Comment:
I just noticed that license gets installed only with zlib-devel, shouldn't the `vmove usr/share` line be deleted?

Re: [PR PATCH] [Updated] zlib: fix license

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages zliblicense
https://github.com/void-linux/void-packages/pull/29805

zlib: fix license
<!-- 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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29805.patch is attached

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

From 129e6f90aa1917f6112c5b559428fd5ef7e55dbd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH] zlib: fix license

---
 srcpkgs/zlib/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..64b8b101407d 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
@@ -15,6 +15,11 @@ do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	sed -n '4,23p' $DESTDIR/usr/include/zlib.h >LICENSE
+	vlicense LICENSE
+}
+
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -23,6 +28,7 @@ zlib-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/man
 	}
 }
+

Re: [PR PATCH] [Updated] zlib: fix license

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages zliblicense
https://github.com/void-linux/void-packages/pull/29805

zlib: fix license
<!-- 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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29805.patch is attached

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

From 78968d46f6781ec3f222fd60a1759f6c5af95590 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH] zlib: fix license

---
 srcpkgs/zlib/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..1faa56d5ec8b 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
@@ -15,6 +15,11 @@ do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	sed -n '4,23p' $DESTDIR/usr/include/zlib.h >LICENSE
+	vlicense LICENSE
+}
+
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -23,6 +28,6 @@ zlib-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/man
 	}
 }

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808899813

Comment:
`Zlib` doesn't require attribution on _binary_ redistribution.

Re: zlib: fix license

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29805#issuecomment-808899813

Comment:
`Zlib` doesn't require attribution on _binary_ redistribution. IOW, no `vlicense` required.

Re: [PR PATCH] [Updated] zlib: fix license

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages zliblicense
https://github.com/void-linux/void-packages/pull/29805

zlib: fix license
<!-- 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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29805.patch is attached

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

From 78968d46f6781ec3f222fd60a1759f6c5af95590 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH] zlib: fix license

---
 srcpkgs/zlib/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..1faa56d5ec8b 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
@@ -15,6 +15,11 @@ do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	sed -n '4,23p' $DESTDIR/usr/include/zlib.h >LICENSE
+	vlicense LICENSE
+}
+
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -23,6 +28,6 @@ zlib-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/man
 	}
 }

Re: [PR PATCH] [Closed]: zlib: fix license

[ericonr]

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

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

zlib: fix license
https://github.com/void-linux/void-packages/pull/29805

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
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->