From 5656193f17d6a9210d4b2d7eb1b776d911ca6094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 6 Dec 2023 17:19:34 +0700 Subject: [PATCH 1/3] New package: public-suffix-2023.11.21 --- srcpkgs/public-suffix/template | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 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..14e56eee0c68e --- /dev/null +++ b/srcpkgs/public-suffix/template @@ -0,0 +1,33 @@ +# Template file for 'public-suffix' +pkgname=public-suffix +version=2023.11.21 +revision=1 +_rev=ae46e510d5e3a13841a188e0506449c311d28716 +hostmakedepends="python3" +short_desc="Public Suffix List" +maintainer="Đoàn Trần Công Danh " +license="MPL-2.0" +homepage="https://publicsuffix.org/" +distfiles="https://github.com/publicsuffix/list/archive/${_rev}.tar.gz + https://raw.githubusercontent.com/rockdaboot/libpsl/0.21.2/src/psl-make-dafsa" +checksum="c14450569530f999a021a69be485a4ae3a0f103cccd249dbd43b1e6af85c7f10 + 252e22a3ad8e48542a71ae5625b3c2ca7e9b90ce5edbab68ecf4d0ccec82c604" + +skip_extraction="psl-make-dafsa" + +post_extract() { + vsrccopy psl-make-dafsa . +} + +do_build() { + python3 psl-make-dafsa --output-format=binary \ + public_suffix_list.dat public_suffix_list.dafsa +} + +do_install() { + # Tools expect to find them here: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1155581 + vmkdir usr/share/publicsuffix + vinstall public_suffix_list.dat 644 usr/share/publicsuffix + vinstall public_suffix_list.dafsa 644 usr/share/publicsuffix +} From 037897940374e47630eea1338ffa1ebaed258070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 6 Dec 2023 17:45:58 +0700 Subject: [PATCH 2/3] libpsl: switch from icu to libidn2 While we're at it, also support runtime public-suffix-list. --- srcpkgs/libpsl/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template index bfdbb13a54044..a98b1f85aa340 100644 --- a/srcpkgs/libpsl/template +++ b/srcpkgs/libpsl/template @@ -1,20 +1,27 @@ # 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/publicsuffix/public_suffix_list.dafsa + --with-psl-file=/usr/share/publicsuffix/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 " -license="MIT" +license="MIT, BSD-3-Clause" homepage="https://rockdaboot.github.io/libpsl/" changelog="https://raw.githubusercontent.com/rockdaboot/libpsl/master/NEWS" distfiles="https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.gz" checksum=e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f +python_version=3 post_install() { + vbin src/psl-make-dafsa vlicense COPYING + vlicense src/LICENSE.chromium } libpsl-devel_package() { From d130cd7ae2a031beedf3b85190a87e217cd35851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 6 Dec 2023 20:20:08 +0700 Subject: [PATCH 3/3] 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