Skip to content

Commit

Permalink
Merge pull request #3486 from citrus-it/libpsl
Browse files Browse the repository at this point in the history
Add libpsl TLD suffix library
  • Loading branch information
hadfl authored Feb 16, 2024
2 parents 1c4b2eb + 58ab17b commit e87d42d
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 4 deletions.
1 change: 0 additions & 1 deletion build/curl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions build/curl/testsuite.log
Original file line number Diff line number Diff line change
@@ -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
49 changes: 49 additions & 0 deletions build/libpsl/build.sh
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions build/libpsl/local.mog
Original file line number Diff line number Diff line change
@@ -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

37 changes: 37 additions & 0 deletions build/libpsl/testsuite.log
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion build/wget2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/baseline
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/baseline.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/pkglist.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ library/gmp
library/idnkit -f libsandheaders
library/libffi
library/libidn
library/libpsl
library/lzlib
library/ncurses
library/nspr
Expand Down

0 comments on commit e87d42d

Please sign in to comment.