[PR PATCH] New package: zlib-ng-2.0.1

[PR PATCH] New package: zlib-ng-2.0.1

[Logarithmus]

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

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

https://github.com/Logarithmus/void-packages zlib-ng
https://github.com/void-linux/void-packages/pull/29544

New package: zlib-ng-2.0.1
- New package: zlib-ng-2.0.1

<!-- Mark items with [x] where applicable -->

#### General
- [x] 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

Maybe I should use `virtualpkg` instead of `alternatives`?


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

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

From 85786abe77be7c3a5e96c99436925d9a8b698de5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:47:46 +0300
Subject: [PATCH 1/2] zlib: add alternatives for zlib-ng compatibility

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

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a02a77828202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,21 +1,27 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 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
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.${version}"
 
 do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
 zlib-devel_package() {
+	conflicts="zlib-ng-devel"
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From 37669e5fce4f102f9f52fa37e7af61c43d0904d0 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH 2/2] New package: zlib-ng-2.0.1

---
 common/shlibs            |  1 +
 srcpkgs/zlib-ng-devel    |  1 +
 srcpkgs/zlib-ng/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/common/shlibs b/common/shlibs
index bba9a0eb1939..ddd93b6bf829 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
+libz.so.1 zlib-ng-2.0.1_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..a9cc005b8db5
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,29 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.1
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for \"next generation\" systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=8599893f9b78bf979c1a1d6549b730367c9186560c6879590354998cc55428cf
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.1.2.11.zlib-ng"
+
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
+zlib-ng-devel_package() {
+	conflicts="zlib-devel"
+	depends="${pkgname}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596249567

Comment:
I don't like making `zlib` an alternative, especially because XBPS depends on it, so if it breaks (and it *can* break), you won't even be able to run the tool to "easily" fix it.

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596248050

Comment:
reading `common/shlibs` stops at the first match, so this entry shouldn't exist.

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596248232

Comment:
```suggestion
short_desc="Zlib replacement with optimizations for 'next generation' systems"
```

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596249852

Comment:
sourcepkg, not pkgname

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[Logarithmus]

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

New review comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596270499

Comment:
@ericonr OK, but if I remove this line, then `xbps-src` will emit warning about SONAME or something.

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[Logarithmus]

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

New review comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596280473

Comment:
@ericonr speaking about possible breakage of `zlib-ng`, if you haven't removed `zlib` after installing `zlib-ng`, you can just run `xbps-alternatives -s zlib`. Even if you've removed `zlib` there's `xbps-static`. As the last resort there's an option to `chroot` into your system via Void installation media and then copy `libz.so` from it.

Re: New package: zlib-ng-2.0.1

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-801313002

Comment:
> I'm not sure I like this in this shape. Maybe it could be put in a `/usr/lib/zlib-ng` directory and configured by the user in `/etc/ld...`? Or they could use `LD_LIBRARY_PATH`.

Creating separate subdirectory in `/usr/lib` for a single librarty looks hacky to me

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[Logarithmus]

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

New review comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596270499

Comment:
@ericonr OK, but if I remove this line, then `xbps-src` will emit warning:
`=> WARNING: zlib-ng-2.0.1_1: libz.so.1 not found in common/shlibs!`

Re: [PR PATCH] [Updated] New package: zlib-ng-2.0.1

[Logarithmus]

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

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

https://github.com/Logarithmus/void-packages zlib-ng
https://github.com/void-linux/void-packages/pull/29544

New package: zlib-ng-2.0.1
- New package: zlib-ng-2.0.1

<!-- Mark items with [x] where applicable -->

#### General
- [x] 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

Maybe I should use `virtualpkg` instead of `alternatives`?


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

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

From 85786abe77be7c3a5e96c99436925d9a8b698de5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:47:46 +0300
Subject: [PATCH 1/2] zlib: add alternatives for zlib-ng compatibility

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

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a02a77828202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,21 +1,27 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 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
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.${version}"
 
 do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
 zlib-devel_package() {
+	conflicts="zlib-ng-devel"
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From dc7fdf575400b9c59c4705e89964ed22c42c0d16 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH 2/2] New package: zlib-ng-2.0.1

---
 common/shlibs            |  1 +
 srcpkgs/zlib-ng-devel    |  1 +
 srcpkgs/zlib-ng/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/common/shlibs b/common/shlibs
index bba9a0eb1939..0b2ce3e9b3d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
+# libz.so.1 zlib-ng-2.0.1_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..881aebc1109f
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,29 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.1
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for 'next generation' systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=8599893f9b78bf979c1a1d6549b730367c9186560c6879590354998cc55428cf
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.1.2.11.zlib-ng"
+
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
+zlib-ng-devel_package() {
+	conflicts="zlib-devel"
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[Logarithmus]

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

New review comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596270499

Comment:
@ericonr OK, but when I remove this line, then `xbps-src` emits warning:
`=> WARNING: zlib-ng-2.0.1_1: libz.so.1 not found in common/shlibs!`

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[Logarithmus]

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

New review comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596270499

Comment:
@ericonr OK, but when I remove this line, then `xbps-src` emits this warning:
`=> WARNING: zlib-ng-2.0.1_1: libz.so.1 not found in common/shlibs!`

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596289445

Comment:
It's just a warning.

Re: [PR REVIEW] New package: zlib-ng-2.0.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r596289968

Comment:
`xbps-alternatives` can't run if the symlink is broken. It would require either static XBPS or manual symlinking.

Re: New package: zlib-ng-2.0.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-801322026

Comment:
> Creating separate subdirectory in /usr/lib for a single librarty looks hacky to me

It's the only way for it to not conflict, which avoids requiring alternatives.

Re: [PR PATCH] [Updated] New package: zlib-ng-2.0.1

[Logarithmus]

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

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

https://github.com/Logarithmus/void-packages zlib-ng
https://github.com/void-linux/void-packages/pull/29544

New package: zlib-ng-2.0.1
- New package: zlib-ng-2.0.1

<!-- Mark items with [x] where applicable -->

#### General
- [x] 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

Maybe I should use `virtualpkg` instead of `alternatives`?


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

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

From 85786abe77be7c3a5e96c99436925d9a8b698de5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:47:46 +0300
Subject: [PATCH 1/2] zlib: add alternatives for zlib-ng compatibility

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

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a02a77828202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,21 +1,27 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 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
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.${version}"
 
 do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
 zlib-devel_package() {
+	conflicts="zlib-ng-devel"
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From e9550867949c97c4c0011966d0365011d5249565 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH 2/2] New package: zlib-ng-2.0.1

---
 srcpkgs/zlib-ng-devel    |  1 +
 srcpkgs/zlib-ng/template | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..881aebc1109f
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,29 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.1
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for 'next generation' systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=8599893f9b78bf979c1a1d6549b730367c9186560c6879590354998cc55428cf
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.1.2.11.zlib-ng"
+
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
+zlib-ng-devel_package() {
+	conflicts="zlib-devel"
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

Re: [PR PATCH] [Updated] New package: zlib-ng-2.0.2

[Logarithmus]

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

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

https://github.com/Logarithmus/void-packages zlib-ng
https://github.com/void-linux/void-packages/pull/29544

New package: zlib-ng-2.0.2
- New package: zlib-ng-2.0.1

<!-- Mark items with [x] where applicable -->

#### General
- [x] 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

Maybe I should use `virtualpkg` instead of `alternatives`?


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

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

From bc2bc19f4911225f6724d5372fb2c1d42e962e5a Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH] New package: zlib-ng-2.0.2

---
 srcpkgs/zlib-ng-devel       |  1 +
 srcpkgs/zlib-ng/INSTALL.msg |  3 +++
 srcpkgs/zlib-ng/REMOVE.msg  |  3 +++
 srcpkgs/zlib-ng/template    | 30 ++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/INSTALL.msg
 create mode 100644 srcpkgs/zlib-ng/REMOVE.msg
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/INSTALL.msg b/srcpkgs/zlib-ng/INSTALL.msg
new file mode 100644
index 000000000000..2b50efdb4f7b
--- /dev/null
+++ b/srcpkgs/zlib-ng/INSTALL.msg
@@ -0,0 +1,3 @@
+In order to use `zlib-ng` instead of `zlib`, add this line to /etc/ld.so.preload:
+/usr/lib/zlib-ng/libz.so.1
+
diff --git a/srcpkgs/zlib-ng/REMOVE.msg b/srcpkgs/zlib-ng/REMOVE.msg
new file mode 100644
index 000000000000..ea2cad37daf8
--- /dev/null
+++ b/srcpkgs/zlib-ng/REMOVE.msg
@@ -0,0 +1,3 @@
+Since `zlib-ng` package is uninstalled now, you can remove this line from /etc/ld.so.preload:
+/usr/lib/zlib-ng/libz.so.1
+
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..20b15edf102b
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,30 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.2
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for 'next generation' systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=dd37886f22ca6890e403ea6c1d60f36eab1d08d2f232a35f5b02126621149d28
+
+post_install() {
+	mkdir "${DESTDIR}/usr/lib/zlib-ng" "${DESTDIR}/usr/include/zlib-ng"
+	mv "${DESTDIR}/usr/lib/pkgconfig/zlib.pc" "${DESTDIR}/usr/lib/pkgconfig/zlib-ng.pc"
+	mv ${DESTDIR}/usr/lib/libz.* ${DESTDIR}/usr/lib/zlib-ng/
+	mv ${DESTDIR}/usr/include/*.h ${DESTDIR}/usr/include/zlib-ng/
+}
+
+zlib-ng-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/zlib-ng/*.a"
+		vmove "usr/lib/zlib-ng/*.so"
+	}
+}

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808496327

Comment:
> > Creating separate subdirectory in /usr/lib for a single librarty looks hacky to me
> 
> It's the only way for it to not conflict, which avoids requiring alternatives.

I made the changes you've asked for

Re: New package: zlib-ng-2.0.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808509288

Comment:
Please make the documentation a `README.voidlinux` file. And the current guidance only works on glibc.

You don't want to preload the library, though. You want the dynamic linker to use it when something is linked against zlib, and for that it's more correct to use `ld_library_path` (idk what it looks like in glibc config).

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808514983

Comment:
> Please make the documentation a `README.voidlinux` file. And the current guidance only works on glibc.
> 
> You don't want to preload the library, though. You want the dynamic linker to use it when something is linked against zlib, and for that it's more correct to use `ld_library_path` (idk what it looks like in glibc config).

Is there any alternative to `/etc/ld.so.preload` on `musl`? I'm on musl and as you said, it seems to be glibc-specific thing.
Adding `LD_LIBRARY_PATH=/usr/lib/zlib-ng:/usr/lib` to `/etc/environment` seems OK, what do you think?

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808514983

Comment:
> Please make the documentation a `README.voidlinux` file. And the current guidance only works on glibc.
> 
> You don't want to preload the library, though. You want the dynamic linker to use it when something is linked against zlib, and for that it's more correct to use `ld_library_path` (idk what it looks like in glibc config).

Is there any alternative to `/etc/ld.so.preload` on `musl`? I'm on musl and as you said, it seems to be glibc-specific thing.
Adding `LD_LIBRARY_PATH=/usr/lib/zlib-ng:/usr/lib` to `/etc/environment` seems OK, what do you think? And it should work both on `glibc` & `musl`.

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808514983

Comment:
> Please make the documentation a `README.voidlinux` file. And the current guidance only works on glibc.
> 
> You don't want to preload the library, though. You want the dynamic linker to use it when something is linked against zlib, and for that it's more correct to use `ld_library_path` (idk what it looks like in glibc config).

Is there any alternative to `/etc/ld.so.preload` on `musl`? I'm on musl and as you said, it seems to be glibc-specific thing.
Adding `LD_LIBRARY_PATH="/usr/lib/zlib-ng:/usr/lib"` to `/etc/environment` seems OK, what do you think? And it should work both on `glibc` & `musl`.

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808514983

Comment:
> Please make the documentation a `README.voidlinux` file. And the current guidance only works on glibc.

Should I remove `INSTALL.msg` & `REMOVE.msg` files after that? I don't think so, because this way should see the guidance immediately after installing/removing the package.

> You don't want to preload the library, though. You want the dynamic linker to use it when something is linked against zlib, and for that it's more correct to use `ld_library_path` (idk what it looks like in glibc config).

Is there any alternative to `/etc/ld.so.preload` on `musl`? I'm on musl and as you said, it seems to be glibc-specific thing.
Adding `LD_LIBRARY_PATH="/usr/lib/zlib-ng:/usr/lib"` to `/etc/environment` seems OK, what do you think? And it should work both on `glibc` & `musl`.

Re: New package: zlib-ng-2.0.2

[jnbr]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808517563

Comment:
Is there a reason not to replace zlib with zlib-ng?
This way the workarounds can be avoided and everyone would benefit from the perf improvements.
If there are concerns around zlib-ng, should we provide it at all?

Re: New package: zlib-ng-2.0.2

[jnbr]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808517563

Comment:
Is there a reason not to replace zlib with zlib-ng?
This way the workarounds can be avoided and everyone would benefit from potential improvements.
If there are concerns around zlib-ng, should we provide it at all?

Re: New package: zlib-ng-2.0.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808521027

Comment:
> Should I remove INSTALL.msg & REMOVE.msg files after that? I don't think so, because this way should see the guidance immediately after installing/removing the package.

INSTALL messages are for urgent warnings, like immediate action that needs to be taken or manual fixes due to updates.

Re: New package: zlib-ng-2.0.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808521437

Comment:
> Adding LD_LIBRARY_PATH="/usr/lib/zlib-ng:/usr/lib" to /etc/environment seems OK, what do you think? And it should work both on glibc & musl.

I'm very much against this.

Doing as @jnbr suggests sounds the most reasonable to me, now.

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808732267

Comment:
> > Adding LD_LIBRARY_PATH="/usr/lib/zlib-ng:/usr/lib" to /etc/environment seems OK, what do you think? And it should work both on glibc & musl.
> 
> I'm very much against this.
> 
> Doing as @jnbr suggests sounds the most reasonable to me, now.

OK, so what about considering switching to `zlib-ng` then? I've been using it for more than a week on daily basis as `/usr/lib/libz.so.1`, no issues so far.
`zlib-ng` devs have put a lot of work into testing, and current release is stable, read the release note for 2.0.0: https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0
Switching to `zlib-ng` will benefit the performance of many programs. Personally I see no downsides.

Re: New package: zlib-ng-2.0.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-808757077

Comment:
Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809111903

Comment:
> Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.

I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?
 About the test suite: are there some emulators for armv6 & powerpc?

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809111903

Comment:
> Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.

I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?
 About the test suite: are there some emulators for armv6 & powerpc? Also it's not clear if you mean `zlib-ng`'s tests or some Void-specific ones.

Re: New package: zlib-ng-2.0.2

[Logarithmus]

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809111903

Comment:
> Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.

I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?
 About the test suite: are there any emulators for armv6 & powerpc? Also it's not clear if you mean `zlib-ng`'s tests or some Void-specific ones.

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809395115

Comment:
> > Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.
> 
> I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?

Basicly, everything is wrong with CMake.

> About the test suite: are there any emulators for armv6 & powerpc?

qemu?

> Also it's not clear if you mean `zlib-ng`'s tests or some Void-specific ones.

Test for multiple architecture, with or without neon, sse, sse2, avx2, ssse.

Re: [PR REVIEW] New package: zlib-ng-2.0.2

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#discussion_r603314541

Comment:
This is just plain wrong! `pkg-config --cflags zlib-ng` and `pkg-config --libs zlib-ng` ;)

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809397657

Comment:
Anyway, I'm not sure if below approach works:
- Package `zlib-ng` as separated package, `conflicts=zlib>=0; replace=zlib>=0; provides=zlib-0.1`
- Whoever want `zlib-ng`, install `zlib-ng` themselves.

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809395115

Comment:
> > Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.
> 
> I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?

Basicly, everything is wrong with CMake. IOW, nothing is right.

> About the test suite: are there any emulators for armv6 & powerpc?

qemu?

> Also it's not clear if you mean `zlib-ng`'s tests or some Void-specific ones.

Test for multiple architecture, with or without neon, sse, sse2, avx2, ssse.

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-810293238

Comment:
Based on https://github.com/zlib-ng/zlib-ng/issues/481, you are having my vote as disagree to replace zlib by zlib-ng

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-809395115

Comment:
> > Switching to it means using the configure build style instead of cmake. And I'd like to run the test suite on all our supported platforms before making the switch.
> 
> I'm sorry, but I don't get what's wrong with CMake. Can you elaborate on it?

Basicly, everything is wrong with CMake. IOW, nothing is right.

> About the test suite: are there any emulators for armv6 & powerpc?

qemu?

> Also it's not clear if you mean `zlib-ng`'s tests or some Void-specific ones.

Test for multiple architecture, with or without neon, sse, sse2, avx2, ssse, et cetera.

Re: New package: zlib-ng-2.0.2

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-810293238

Comment:
Based on https://github.com/zlib-ng/zlib-ng/issues/481, you are having my vote as disagree to replace zlib by zlib-ng

> I'm just reiterating the reasons why there is some differences that we are unlikely to "unfix" even if that means our API is not 100% drop-in replacement

Re: New package: zlib-ng-2.0.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29544#issuecomment-855952360

Comment:
Closing this as the underlying proposal hasn't been accepted.

Re: [PR PATCH] [Closed]: New package: zlib-ng-2.0.2

[ericonr]

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

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

New package: zlib-ng-2.0.2
https://github.com/void-linux/void-packages/pull/29544

Description:
- New package: zlib-ng-2.0.2

<!-- Mark items with [x] where applicable -->

#### General
- [x] 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

Maybe I should use `virtualpkg` instead of `alternatives`?