diff --git a/build/curl/build.sh b/build/curl/build.sh index 1a89f0288e..1a39623e64 100755 --- a/build/curl/build.sh +++ b/build/curl/build.sh @@ -33,7 +33,6 @@ CONFIGURE_OPTS=" --with-ca-path=/etc/ssl/certs --with-openssl --disable-manual - --without-libpsl " # Build backwards so that the 32-bit version is available for the test-suite. diff --git a/build/curl/testsuite.log b/build/curl/testsuite.log index fe9c7775d5..5ff909c95e 100644 --- a/build/curl/testsuite.log +++ b/build/curl/testsuite.log @@ -1,3 +1,3 @@ -TESTDONE: 1673 tests were considered during 484 seconds. -TESTDONE: 1342 tests out of 1343 reported OK: 99% +TESTDONE: 1673 tests were considered during 495 seconds. +TESTDONE: 1344 tests out of 1345 reported OK: 99% TESTFAIL: These test cases failed: 1004 diff --git a/build/libpsl/build.sh b/build/libpsl/build.sh new file mode 100755 index 0000000000..9554a6e5b8 --- /dev/null +++ b/build/libpsl/build.sh @@ -0,0 +1,49 @@ +#!/usr/bin/bash +# +# {{{ CDDL HEADER +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# }}} +# +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. + +. ../../lib/build.sh + +PROG=libpsl +VER=0.21.5 +PKG=library/libpsl +SUMMARY="C library for the Public Suffix List" +DESC="Library for access to the collection of TLD suffixes" + +CONFIGURE_OPTS+=" + --disable-static + --disable-runtime + --enable-builtin +" + +forgo_isaexec + +export MAKE + +TESTSUITE_SED=" + /^libtool:/d +" + +init +download_source $PROG $PROG $VER +patch_source +prep_build +build +run_testsuite check +make_package +clean_up + +# Vim hints +# vim:ts=4:sw=4:et:fdm=marker diff --git a/build/libpsl/local.mog b/build/libpsl/local.mog new file mode 100644 index 0000000000..ac96981650 --- /dev/null +++ b/build/libpsl/local.mog @@ -0,0 +1,13 @@ +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. + +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. + +license LICENSE license=MIT + diff --git a/build/libpsl/testsuite.log b/build/libpsl/testsuite.log new file mode 100644 index 0000000000..b4df923578 --- /dev/null +++ b/build/libpsl/testsuite.log @@ -0,0 +1,37 @@ +Making check in po +Making check in include +Making check in src +Making check in tools +Making check in fuzz +PASS: libpsl_fuzzer +PASS: libpsl_load_fuzzer +PASS: libpsl_load_dafsa_fuzzer +============================================================================ +Testsuite summary for libpsl 0.21.5 +============================================================================ +# TOTAL: 3 +# PASS: 3 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +============================================================================ +Making check in tests +PASS: test-is-public +PASS: test-is-public-all +PASS: test-is-cookie-domain-acceptable +PASS: test-is-public-builtin +PASS: test-registrable-domain +============================================================================ +Testsuite summary for libpsl 0.21.5 +============================================================================ +# TOTAL: 5 +# PASS: 5 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +============================================================================ +Making check in msvc diff --git a/build/wget2/build.sh b/build/wget2/build.sh index 0e144df96f..fea814c60d 100755 --- a/build/wget2/build.sh +++ b/build/wget2/build.sh @@ -28,7 +28,6 @@ LMHTTPD_VER=0.9.73 RUN_DEPENDS_IPS="web/ca-bundle" -# - could bundle libpsl # - could bundle libhsts (and add hsts.dafsa to web/ca-bundle?) init diff --git a/doc/baseline b/doc/baseline index ddd8f567d0..3064f86146 100644 --- a/doc/baseline +++ b/doc/baseline @@ -271,6 +271,7 @@ omnios library/libadt_jni omnios library/libedit omnios library/libffi omnios library/libidn +omnios library/libpsl omnios library/libtecla omnios library/libtool/libltdl omnios library/libxml2 diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index d38b00b2b0..fd6fd77380 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -197,6 +197,7 @@ omnios library/idnkit omnios library/libedit omnios library/libffi omnios library/libidn +omnios library/libpsl omnios library/libtecla omnios library/libtool/libltdl omnios library/libxml2 diff --git a/doc/packages.md b/doc/packages.md index 268f323ab3..4ce302a345 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -46,6 +46,7 @@ | library/libevent | 2.1.12 | https://github.com/libevent/libevent/tags | Currently used solely by tmux | library/libidn | 1.42 | http://git.savannah.gnu.org/cgit/libidn.git/refs/tags https://ftp.gnu.org/gnu/libidn/ | library/libffi | 3.4.4 | https://sourceware.org/libffi/ +| library/libpsl | 0.21.5 | https://github.com/rockdaboot/libpsl/releases | library/libuv | 1.47.0 | https://github.com/libuv/libuv/releases | Currently used solely by bind | library/libxml2 | 2.12.5 | https://github.com/GNOME/libxml2/tags http://xmlsoft.org/news.html | library/libxslt | 1.1.30 | http://xmlsoft.org/libxslt/news.html diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index 875391e788..23be51194f 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -34,6 +34,7 @@ library/gmp library/idnkit -f libsandheaders library/libffi library/libidn +library/libpsl library/lzlib library/ncurses library/nspr