Re: [PR PATCH] [Updated] curl: enable libpsl+libidn2; libpsl: switch from icu to libidn2, allow external public-suffix-list

[sgn <sgn@users.noreply.github.com>]

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

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

https://github.com/sgn/void-packages curl-libpsl-libidn2
https://github.com/void-linux/void-packages/pull/47618

curl: enable libpsl+libidn2; libpsl: switch from icu to libidn2, allow external public-suffix-list
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47618.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-libpsl-libidn2-47618.patch --]
[-- Type: text/x-diff, Size: 6295 bytes --]

From e88af0dac9c809b75d1d7a76e775c31b745d7b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 6 Dec 2023 17:19:28 +0700
Subject: [PATCH 1/4] New package: psl-make-dafsa-0.21.2

---
 srcpkgs/psl-make-dafsa/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/psl-make-dafsa/template

diff --git a/srcpkgs/psl-make-dafsa/template b/srcpkgs/psl-make-dafsa/template
new file mode 100644
index 0000000000000..b2e5955d3cf22
--- /dev/null
+++ b/srcpkgs/psl-make-dafsa/template
@@ -0,0 +1,18 @@
+# Template file for 'psl-make-dafsa'
+pkgname=psl-make-dafsa
+version=0.21.2
+revision=1
+depends="python3"
+short_desc="Tool to create a binary DAFSA from a Public Suffix List"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://rockdaboot.github.io/libpsl/"
+distfiles="https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.gz"
+checksum=e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f
+python_version=3
+
+do_install() {
+	vbin src/psl-make-dafsa
+	vman src/psl-make-dafsa.1
+	vlicense src/LICENSE.chromium
+}

From 2fddb19b3ca8c1541fdde6721da7c54a1a7f314e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 6 Dec 2023 17:19:34 +0700
Subject: [PATCH 2/4] New package: public-suffix-2023.11.21

---
 srcpkgs/public-suffix/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/public-suffix/template

diff --git a/srcpkgs/public-suffix/template b/srcpkgs/public-suffix/template
new file mode 100644
index 0000000000000..a5e5cbe434875
--- /dev/null
+++ b/srcpkgs/public-suffix/template
@@ -0,0 +1,23 @@
+# Template file for 'public-suffix'
+pkgname=public-suffix
+version=2023.11.21
+revision=1
+_rev=ae46e510d5e3a13841a188e0506449c311d28716
+hostmakedepends="psl-make-dafsa"
+short_desc="Public Suffix List"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MPL-2.0"
+homepage="https://publicsuffix.org/"
+distfiles="https://github.com/publicsuffix/list/archive/${_rev}.tar.gz"
+checksum=c14450569530f999a021a69be485a4ae3a0f103cccd249dbd43b1e6af85c7f10
+
+do_build() {
+	psl-make-dafsa --output-format=binary \
+		public_suffix_list.dat list.dafsa
+}
+
+do_install() {
+	vmkdir usr/share/public-suffix
+	vinstall public_suffix_list.dat 644 usr/share/public-suffix list.dat
+	vinstall list.dafsa 644 usr/share/public-suffix
+}

From 5c3fcd6c7bd099adc4479990a30eb80542523076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 6 Dec 2023 17:45:58 +0700
Subject: [PATCH 3/4] libpsl: switch from icu to libidn2

While we're at it, also support runtime public-suffix-list.
---
 srcpkgs/libpsl/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index bfdbb13a54044..728633e94f3c4 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,10 +1,14 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.2
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config python3"
-makedepends="icu-devel"
+configure_args="--enable-runtime=libidn2
+ --with-psl-distfile=/usr/share/public-suffix/list.dafsa
+ --with-psl-file=/usr/share/public-suffix/list.dat"
+hostmakedepends="pkg-config python3 public-suffix"
+makedepends="libidn2-devel libunistring-devel"
+depends="public-suffix"
 short_desc="Public Suffix List library functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -14,6 +18,8 @@ distfiles="https://github.com/rockdaboot/libpsl/releases/download/${version}/lib
 checksum=e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f
 
 post_install() {
+	rm -f "${DESTDIR}/usr/bin/psl-make-dafsa"
+	rm -f "${DESTDIR}/usr/share/man/man1/psl-make-dafsa.1"
 	vlicense COPYING
 }
 

From f009f7957cbc8bf5e71ce4c5404693e47c974791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 6 Dec 2023 20:20:08 +0700
Subject: [PATCH 4/4] curl: enable libpsl and libidn2

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

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 3e061e00c800e..fd0f57d43ede2 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,13 +1,14 @@
 # Template file for 'curl'
 pkgname=curl
 version=8.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --enable-websockets --with-random=/dev/urandom
  $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2
+ $(vopt_with psl libpsl) $(vopt_with idn libidn2)
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  ac_cv_path_NROFF=/usr/bin/mandoc"
 # 1477 verifies if headers and manpages are in sync which belongs in upstream processes
 make_check_args="TFLAGS=!1477"
@@ -17,6 +18,7 @@ hostmakedepends="perl pkg-config mdocml"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
+ $(vopt_if psl 'libpsl-devel') $(vopt_if idn 'libidn2-devel')
  $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
@@ -28,8 +30,8 @@ homepage="https://curl.se"
 changelog="https://curl.se/changes.html"
 distfiles="https://curl.se/download/curl-${version}.tar.gz"
 checksum=05fc17ff25b793a437a0906e0484b82172a9f4de02be5ed447e0cab8c3475add
-build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
-build_options_default="ssh ssl zstd"
+build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd"
+build_options_default="idn psl ssh ssl zstd"
 vopt_conflict ssl gnutls
 
 if [ "$CROSS_BUILD" ]; then