On Mon, Jul 10, 2017 at 11:25:27PM +0100, Edd Barrett wrote: > * I've disabled the SSL module because upstream uses the CRYPTO_ONCE > API, which LibreSSL doesn't seem to have. > > * A few tests fail. I'm working with upstream to fix these.
Here is an updated diff with the SSL module back. I'd be happy to commit this if there is an OK. Index: Makefile =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/Makefile,v retrieving revision 1.70 diff -u -p -r1.70 Makefile --- Makefile 14 Mar 2017 12:23:21 -0000 1.70 +++ Makefile 16 Jul 2017 21:02:21 -0000 @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.70 2017/03/14 12:23:21 jca Exp $ +# $OpenBSD: Makefile,v 1.66 2016/05/12 01:17:13 naddy Exp $ +BROKEN-arm = undefined reference to `__sync_fetch_and_add_4' BROKEN-hppa = undefined reference to __sync_fetch_and_add_4 BROKEN-sparc64 = infinite loop or aborts during build COMMENT = Prolog for the real world -V = 6.6.4 -REVISION = 10 -DISTNAME = pl-$V +V = 7.4.2 +DISTNAME = swipl-$V PKGNAME = swi-prolog-$V CATEGORIES = lang -SHARED_LIBS = pl 5.0 +SHARED_LIBS = pl 6.0 HOMEPAGE = http://www.swi-prolog.org/ @@ -20,17 +20,24 @@ MAINTAINER = Edd Barrett <edd@openbsd.o # LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt c crypto execinfo -WANTLIB += fontconfig freetype gmp jpeg m ncursesw pthread readline ssl -WANTLIB += z +WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt archive c db execinfo +WANTLIB += fontconfig freetype gmp iodbc jpeg m ncursesw ossp-uuid +WANTLIB += pthread readline z MASTER_SITES = ${HOMEPAGE}download/stable/src/ \ https://distfiles.nl/ CONFIGURE_STYLE = gnu -MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/src \ +MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/packages/clib \ ${WRKSRC}/packages/jpl \ - ${WRKSRC}/packages/xpce/src + ${WRKSRC}/packages/xpce/ \ + ${WRKSRC}/packages/xpce/src \ + ${WRKSRC}/src + +# error: trampoline code generation is not allowed without -ftrampolines +CFLAGS += -ftrampolines + +USE_WXNEEDED = Yes CONFIGURE_ENV += CIFLAGS=' -I${LOCALBASE}/include' \ LDFLAGS=' -L${LOCALBASE}/lib' \ @@ -39,7 +46,6 @@ CONFIGURE_ENV += CIFLAGS=' -I${LOCALBASE CONFIGURE_ARGS = --enable-mt \ --disable-custom-flags \ --with-world \ - --with-jpeg=${LOCALBASE} \ --enable-shared USE_GMAKE = Yes @@ -47,6 +53,8 @@ USE_GMAKE = Yes # Don't pick up bash MAKE_ENV = MAKESHELL=/bin/sh +MAKE_ENV += LDFLAGS=-L${LOCALBASE}/lib + MAKE_FLAGS = SONAMEOPT= \ SHAREDV=libpl.so.${LIBpl_VERSION} @@ -57,7 +65,11 @@ MODGCC4_ARCHS = arm BUILD_DEPENDS = ${RUN_DEPENDS} LIB_DEPENDS = devel/gmp \ devel/libexecinfo \ - graphics/jpeg + graphics/jpeg \ + devel/uuid \ + databases/db/v4 \ + archivers/libarchive \ + databases/iodbc FULLARCH = ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd${OSREV} SUBST_VARS += V BOOT FULLARCH @@ -67,13 +79,12 @@ post-install: ln -sf swipl-$V/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION} mv ${PREFIX}/lib/swipl-${V}/doc ${PREFIX}/share/doc/swipl -# Swipl multithreading flaky at best on OpenBSD. -# We are not sure if this is our threading implementation or their code. -# The following tests fail (hang). We remove them to allow the rest -# of the tests to execute atleast. -# When updating, uncomment these to see if they still fail. +# The following test files hang. We remove them to allow the rest of the tests +# to execute atleast. When updating, uncomment these to see if they still fail. +# One test fails after removing all hanging tests. pre-test: - rm -f ${WRKBUILD}/src/Tests/core/test_resource_error.pl + rm -f ${WRKBUILD}/src/Tests/core/test_resource_error.pl \ + ${WRKBUILD}/src/Tests/core/test_cgc.pl .include <bsd.port.arch.mk> Index: distinfo =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 4 Apr 2014 17:17:03 -0000 1.10 +++ distinfo 16 Jul 2017 19:57:43 -0000 @@ -1,2 +1,2 @@ -SHA256 (pl-6.6.4.tar.gz) = Zjl3lZl544nfD4fC60JqtxEFwSIGYF7ECSWJO5FzPO8= -SIZE (pl-6.6.4.tar.gz) = 14830255 +SHA256 (swipl-7.4.2.tar.gz) = fxclfaM0vB56NenPXLj8oB2C8epAbHrOdukGKvjw34s= +SIZE (swipl-7.4.2.tar.gz) = 16496738 Index: patches/patch-packages_bdb_bdb4pl_c =================================================================== RCS file: patches/patch-packages_bdb_bdb4pl_c diff -N patches/patch-packages_bdb_bdb4pl_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_bdb_bdb4pl_c 16 Jul 2017 19:57:43 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +DB_FAILCHK not defined in our bdb packages. + +Index: packages/bdb/bdb4pl.c +--- packages/bdb/bdb4pl.c.orig ++++ packages/bdb/bdb4pl.c +@@ -1497,7 +1497,6 @@ static db_flag dbenv_flags[] = + { "use_environ_root", DB_USE_ENVIRON_ROOT, 0 }, + { "create", DB_CREATE, 0 }, + { "lockdown", DB_LOCKDOWN, 0 }, +- { "failchk", DB_FAILCHK, 0 }, + { "private", DB_PRIVATE, 0 }, + { "register", DB_REGISTER, 0 }, + { "system_mem", DB_SYSTEM_MEM, 0 }, Index: patches/patch-packages_bdb_bdb4pl_h =================================================================== RCS file: patches/patch-packages_bdb_bdb4pl_h diff -N patches/patch-packages_bdb_bdb4pl_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_bdb_bdb4pl_h 16 Jul 2017 19:57:43 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Use the right version of bdb. + +Index: packages/bdb/bdb4pl.h +--- packages/bdb/bdb4pl.h.orig ++++ packages/bdb/bdb4pl.h +@@ -37,7 +37,7 @@ + #define DB4PL_H_INCLUDED + + #include <SWI-Prolog.h> +-#include <db.h> ++#include <db4/db.h> + + /* Consider anything >= DB4.3 as DB43 */ + #if DB_VERSION_MAJOR >= 4 Index: patches/patch-packages_clib_Makefile_in =================================================================== RCS file: patches/patch-packages_clib_Makefile_in diff -N patches/patch-packages_clib_Makefile_in --- patches/patch-packages_clib_Makefile_in 4 Apr 2014 17:53:49 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-packages_clib_Makefile_in,v 1.3 2014/04/04 17:53:49 edd Exp $ - -More hanging tests. - ---- packages/clib/Makefile.in.orig Thu Dec 5 11:26:17 2013 -+++ packages/clib/Makefile.in Thu Dec 5 11:26:22 2013 -@@ -127,7 +127,7 @@ uninstall:: - # Testing - ################################################################ - --check: check-socket check-memfile check-unit check-process \ -+check: check-socket check-memfile check-unit \ - check-read check-uri check-cgi - - torture: torture-socket Index: patches/patch-packages_clib_nonblockio_h =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/patches/patch-packages_clib_nonblockio_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-packages_clib_nonblockio_h --- patches/patch-packages_clib_nonblockio_h 10 Sep 2016 13:03:42 -0000 1.1 +++ patches/patch-packages_clib_nonblockio_h 16 Jul 2017 19:57:43 -0000 @@ -1,7 +1,9 @@ -$OpenBSD: patch-packages_clib_nonblockio_h,v 1.1 2016/09/10 13:03:42 ajacoutot Exp $ ---- packages/clib/nonblockio.h.orig Sat Sep 10 11:42:58 2016 -+++ packages/clib/nonblockio.h Sat Sep 10 11:43:31 2016 -@@ -52,6 +52,7 @@ +$OpenBSD$ + +Index: packages/clib/nonblockio.h +--- packages/clib/nonblockio.h.orig ++++ packages/clib/nonblockio.h +@@ -55,6 +55,7 @@ #else /*__WINDOWS__*/ Index: patches/patch-packages_readline_configure =================================================================== RCS file: patches/patch-packages_readline_configure diff -N patches/patch-packages_readline_configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_readline_configure 16 Jul 2017 19:57:43 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +readline needs termcap linked. + +Index: packages/readline/configure +--- packages/readline/configure.orig ++++ packages/readline/configure +@@ -4581,7 +4581,7 @@ if ${ac_cv_lib_readline_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $LIBS" ++LIBS="-lreadline -ltermcap $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + Index: patches/patch-packages_ssl_crypto4pl_c =================================================================== RCS file: patches/patch-packages_ssl_crypto4pl_c diff -N patches/patch-packages_ssl_crypto4pl_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_ssl_crypto4pl_c 16 Jul 2017 20:10:40 -0000 @@ -0,0 +1,43 @@ +$OpenBSD$ + +Make it work with LibreSSL. + +Index: packages/ssl/crypto4pl.c +--- packages/ssl/crypto4pl.c.orig ++++ packages/ssl/crypto4pl.c +@@ -617,7 +617,7 @@ static int + recover_rsa(term_t t, RSA** rsap) + { RSA *rsa = RSA_new(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if ( get_bn_arg(1, t, &rsa->n) && + get_bn_arg(2, t, &rsa->e) && + get_bn_arg(3, t, &rsa->d) && +@@ -1248,7 +1248,7 @@ based on mttest.c distributed with the OpenSSL library + + #include <pthread.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static pthread_mutex_t *lock_cs; + static long *lock_count; + static void (*old_locking_callback)(int, int, const char*, int) = NULL; +@@ -1321,7 +1321,7 @@ pthreads_thread_id(void) + static int + crypto_lib_init(void) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if ( (old_id_callback=CRYPTO_THREADID_get_callback()) == 0 ) + { int i; + +@@ -1366,7 +1366,7 @@ crypto_lib_exit(void) + * If the module is being unloaded, we should remove callbacks pointing to + * our address space + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #ifdef _REENTRANT + #ifndef __WINDOWS__ + CRYPTO_THREADID_set_callback(old_id_callback); Index: patches/patch-packages_ssl_cryptolib_c =================================================================== RCS file: patches/patch-packages_ssl_cryptolib_c diff -N patches/patch-packages_ssl_cryptolib_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_ssl_cryptolib_c 16 Jul 2017 20:10:44 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +Make it work with LibreSSL. + +Index: packages/ssl/cryptolib.c +--- packages/ssl/cryptolib.c.orig ++++ packages/ssl/cryptolib.c +@@ -284,7 +284,7 @@ bio_control(BIO* bio, int cmd, long num, void* ptr) + static int + bio_create(BIO* bio) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + bio->shutdown = 1; + bio->init = 1; + bio->num = -1; +@@ -312,7 +312,7 @@ bio_destroy(BIO* bio) + return 1; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* + * Specify the BIO read and write function structures + */ Index: patches/patch-packages_ssl_ssl4pl_c =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/patches/patch-packages_ssl_ssl4pl_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-packages_ssl_ssl4pl_c --- patches/patch-packages_ssl_ssl4pl_c 24 Apr 2014 21:52:20 -0000 1.3 +++ patches/patch-packages_ssl_ssl4pl_c 16 Jul 2017 20:10:49 -0000 @@ -1,39 +1,133 @@ -$OpenBSD: patch-packages_ssl_ssl4pl_c,v 1.3 2014/04/24 21:52:20 edd Exp $ +$OpenBSD$ -Fallout from OpenSSL rampage. +Make it work with LibreSSL. ---- packages/ssl/ssl4pl.c.orig Tue Jan 21 14:47:42 2014 -+++ packages/ssl/ssl4pl.c Thu Apr 24 11:16:54 2014 -@@ -67,7 +67,9 @@ static functor_t FUNCTOR_equals2; - static functor_t FUNCTOR_crl1; - static functor_t FUNCTOR_revocations1; - static functor_t FUNCTOR_revoked2; -+#ifndef __OpenBSD__ - static functor_t FUNCTOR_session_key1; -+#endif - static functor_t FUNCTOR_master_key1; - static functor_t FUNCTOR_session_id1; - static functor_t FUNCTOR_client_random1; -@@ -1529,10 +1531,12 @@ pl_ssl_session(term_t stream_t, term_t session_t) - - if ( !PL_unify_list_ex(list_t, node_t, list_t) ) - return FALSE; -+#ifndef __OpenBSD__ - if ( !PL_unify_term(node_t, - PL_FUNCTOR, FUNCTOR_session_key1, - PL_NCHARS, session->key_arg_length, session->key_arg)) - return FALSE; -+#endif - - if ( !PL_unify_list_ex(list_t, node_t, list_t)) - return FALSE; -@@ -1614,7 +1618,9 @@ install_ssl4pl() - FUNCTOR_crl1 = PL_new_functor(PL_new_atom("crl"), 1); - FUNCTOR_revoked2 = PL_new_functor(PL_new_atom("revoked"), 2); - FUNCTOR_revocations1 = PL_new_functor(PL_new_atom("revocations"), 1); -+#ifndef __OpenBSD__ - FUNCTOR_session_key1 = PL_new_functor(PL_new_atom("session_key"), 1); -+#endif - FUNCTOR_master_key1 = PL_new_functor(PL_new_atom("master_key"), 1); - FUNCTOR_session_id1 = PL_new_functor(PL_new_atom("session_id"), 1); - FUNCTOR_client_random1 = PL_new_functor(PL_new_atom("client_random"), 1); +Index: packages/ssl/ssl4pl.c +--- packages/ssl/ssl4pl.c.orig ++++ packages/ssl/ssl4pl.c +@@ -568,7 +568,7 @@ unify_name(term_t term, X509_NAME* name) + return PL_unify_nil(list); + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define X509_REVOKED_get0_serialNumber(R) ((R)->serialNumber) + #define X509_REVOKED_get0_revocationDate(R) ((R)->revocationDate) + #define EVP_PKEY_base_id(key) ((key)->type) +@@ -669,7 +669,7 @@ unify_crl(term_t term, X509_CRL* crl) + static int + unify_rsa(term_t item, RSA* rsa) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return ( PL_unify_functor(item, FUNCTOR_rsa8) && + unify_bignum_arg(1, item, rsa->n) && + unify_bignum_arg(2, item, rsa->e) && +@@ -1647,7 +1647,7 @@ ssl_free(PL_SSL *config) + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static int + #else + static void +@@ -1675,7 +1675,7 @@ ssl_config_new ( void * ctx + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* + * 1 = success + * 0 = failure +@@ -1687,7 +1687,7 @@ ssl_config_new ( void * ctx + static int + ssl_config_dup ( CRYPTO_EX_DATA * to + , +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_EX_DATA * from + #else + const CRYPTO_EX_DATA * from +@@ -1863,7 +1863,7 @@ ssl_cb_cert_verify(int preverify_ok, X509_STORE_CTX *c + 4) Otherwise, FAIL. + */ + int i; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define ASN1_STRING_get0_data(D) ASN1_STRING_data(D) + #define X509_STORE_CTX_get0_cert(C) ((C)->cert) + #endif +@@ -2147,7 +2147,7 @@ ssl_close(PL_SSL_INSTANCE *instance) + + free(instance); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_free_strings(); + #endif + +@@ -2467,7 +2467,7 @@ get_dh2048(void) + DH *dh = DH_new(); + if (dh == NULL) return NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + dh->p=BN_bin2bn(dhp_2048,sizeof(dhp_2048),NULL); + dh->g=BN_bin2bn(dhg_2048,sizeof(dhg_2048),NULL); + if ((dh->p == NULL) || (dh->g == NULL)) +@@ -2626,7 +2626,7 @@ ssl_config(PL_SSL *config) + #ifndef OPENSSL_NO_EC + EC_KEY *ecdh; + int nid; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + char *curve = "prime256v1"; + #else + /* In OpenSSL >= 1.1.0, ECDH support is always enabled. Therefore, +@@ -2714,7 +2714,7 @@ ssl_lib_init(void) + /* This call will ensure we only end up calling RAND_poll() once + - preventing an ugly synchronization issue in OpenSSL */ + RAND_status(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (void) SSL_library_init(); + SSL_load_error_strings(); + #else +@@ -2937,7 +2937,7 @@ pl_ssl_context(term_t role, term_t config, term_t opti + term_t tail; + term_t head = PL_new_term_ref(); + module_t module = NULL; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + atom_t method_name; + #endif + const SSL_METHOD *ssl_method = NULL; +@@ -2955,7 +2955,7 @@ pl_ssl_context(term_t role, term_t config, term_t opti + else + return PL_domain_error("ssl_role", role); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (!PL_get_atom(method, &method_name)) + return PL_domain_error("ssl_method", method); + if (method_name == ATOM_sslv23) +@@ -3508,7 +3508,7 @@ pl_ssl_session(term_t stream_t, term_t session_t) + !(session = SSL_get1_session(ssl)) ) + return PL_existence_error("ssl_session", stream_t); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + version = session->ssl_version; + master_key = session->master_key; + master_key_length = session->master_key_length; +@@ -3544,7 +3544,7 @@ pl_ssl_session(term_t stream_t, term_t session_t) + master_key_length, master_key) ) + goto err; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if ( !add_key_string(list_t, FUNCTOR_session_id1, + session->session_id_length, session->session_id) ) + goto err; Index: patches/patch-packages_xpce_src_ker_goodies_c =================================================================== RCS file: patches/patch-packages_xpce_src_ker_goodies_c diff -N patches/patch-packages_xpce_src_ker_goodies_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-packages_xpce_src_ker_goodies_c 16 Jul 2017 19:57:43 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Kill pragmas that upset our GCC. + +Index: packages/xpce/src/ker/goodies.c +--- packages/xpce/src/ker/goodies.c.orig ++++ packages/xpce/src/ker/goodies.c +@@ -998,8 +998,6 @@ scanstr(char *str, char *fmt, Any *r) + #if defined(HAVE_VSSCANF) && defined(HAVE_CAST_VA_LIST) + ar = vsscanf(str, fmt, (va_list) ptrs); + #else +-#pragma GCC diagnostic push +-#pragma GCC diagnostic warning "-Wformat-security" + switch(argn) + { case 0: ar = sscanf(str, fmt); break; + case 1: ar = sscanf(str, fmt, ptrs[0]); break; +@@ -1096,7 +1094,6 @@ scanstr(char *str, char *fmt, Any *r) + default: errorPce(NIL, NAME_tooManyArguments); + fail; + } +-#pragma GCC diagnostic pop + #endif /*HAVE_VSSCANF*/ + + DEBUG(NAME_scan, Cprintf("ar = %d\n", argn)); Index: patches/patch-src_pl-funcs_h =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/patches/patch-src_pl-funcs_h,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_pl-funcs_h --- patches/patch-src_pl-funcs_h 4 Apr 2014 17:53:49 -0000 1.2 +++ patches/patch-src_pl-funcs_h 16 Jul 2017 19:57:43 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-src_pl-funcs_h,v 1.2 201 Silence annoying redefinition of getwd() warnings ---- src/pl-funcs.h.orig Fri Nov 22 12:00:08 2013 -+++ src/pl-funcs.h Thu Dec 5 10:37:00 2013 -@@ -347,7 +347,7 @@ COMMON(void) setOSPrologFlags(void); +Index: src/pl-funcs.h +--- src/pl-funcs.h.orig ++++ src/pl-funcs.h +@@ -378,7 +378,7 @@ COMMON(void) setOSPrologFlags(void); COMMON(void) RemoveTemporaryFiles(void); COMMON(bool) OpenStream(int fd); COMMON(char *) expandVars(const char *pattern, char *expanded, int len); Index: patches/patch-src_test_pl =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/patches/patch-src_test_pl,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_test_pl --- patches/patch-src_test_pl 4 Apr 2014 17:53:49 -0000 1.3 +++ patches/patch-src_test_pl 16 Jul 2017 19:57:43 -0000 @@ -2,19 +2,23 @@ $OpenBSD: patch-src_test_pl,v 1.3 2014/0 Turn on verbose reporting. -GMP test appears to use >64MB of stack!? +One of the GMP tests deliberatley maxes out the stack to test the backtrace +support, but it seems to be broken. ---- src/test.pl.orig Tue Mar 4 10:37:29 2014 -+++ src/test.pl Sat Mar 15 11:37:08 2014 -@@ -23,6 +23,7 @@ - +https://github.com/SWI-Prolog/issues/issues/43 + +Index: src/test.pl +--- src/test.pl.orig ++++ src/test.pl +@@ -36,6 +36,7 @@ %:- set_prolog_flag(optimise, true). + :- set_prolog_flag(optimise_debug, false). %:- set_prolog_flag(trace_gc, true). +:- set_prolog_flag(verbose, normal). :- asserta(user:file_search_path(library, '../packages/plunit')). :- [library(plunit)]. :- set_test_options([load(always), silent(true), sto(true), cleanup(true)]). -@@ -588,10 +589,10 @@ gmp(shift-1) :- +@@ -606,10 +607,10 @@ gmp(shift-1) :- gmp(shift-2) :- A is 1<<55, B is A<<8, B =:= 9223372036854775808. Index: pkg/PLIST =================================================================== RCS file: /home/edd/cvsync/ports/lang/swi-prolog/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 15 Mar 2016 21:12:07 -0000 1.15 +++ pkg/PLIST 16 Jul 2017 20:46:56 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.15 2016/03/15 21:12:07 naddy Exp $ +@comment $OpenBSD$ bin/swipl bin/swipl-ld bin/swipl-rc @@ -19,7 +19,9 @@ lib/swipl-${V}/boot/attvar.pl lib/swipl-${V}/boot/autoload.pl lib/swipl-${V}/boot/bags.pl lib/swipl-${V}/boot/dcg.pl +lib/swipl-${V}/boot/dicts.pl lib/swipl-${V}/boot/dwim.pl +lib/swipl-${V}/boot/engines.pl lib/swipl-${V}/boot/expand.pl lib/swipl-${V}/boot/history.pl lib/swipl-${V}/boot/init.pl @@ -37,7 +39,7 @@ lib/swipl-${V}/boot/topvars.pl lib/swipl-${V}/${BOOT}.prc lib/swipl-${V}/customize/ lib/swipl-${V}/customize/README -lib/swipl-${V}/customize/dotplrc +lib/swipl-${V}/customize/dotswiplrc lib/swipl-${V}/customize/dotxpcerc lib/swipl-${V}/customize/edit lib/swipl-${V}/demo/ @@ -53,25 +55,33 @@ lib/swipl-${V}/include/sicstus/ lib/swipl-${V}/include/sicstus/sicstus.h lib/swipl-${V}/lib/ lib/swipl-${V}/lib/${FULLARCH}/ +lib/swipl-${V}/lib/${FULLARCH}/archive4pl.so +lib/swipl-${V}/lib/${FULLARCH}/bdb4pl.so lib/swipl-${V}/lib/${FULLARCH}/cgi.so lib/swipl-${V}/lib/${FULLARCH}/crypt.so +lib/swipl-${V}/lib/${FULLARCH}/crypto4pl.so lib/swipl-${V}/lib/${FULLARCH}/double_metaphone.so lib/swipl-${V}/lib/${FULLARCH}/files.so +lib/swipl-${V}/lib/${FULLARCH}/hashstream.so lib/swipl-${V}/lib/${FULLARCH}/http_stream.so lib/swipl-${V}/lib/${FULLARCH}/isub.so lib/swipl-${V}/lib/${FULLARCH}/json.so +@lib lib/swipl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION} lib/swipl-${V}/lib/${FULLARCH}/libswipl.a lib/swipl-${V}/lib/${FULLARCH}/libswipl.so -@lib lib/swipl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION} +lib/swipl-${V}/lib/${FULLARCH}/libswipl.so.${V} +lib/swipl-${V}/lib/${FULLARCH}/md54pl.so lib/swipl-${V}/lib/${FULLARCH}/memfile.so -lib/swipl-${V}/lib/${FULLARCH}/mime.so lib/swipl-${V}/lib/${FULLARCH}/ntriples.so +lib/swipl-${V}/lib/${FULLARCH}/odbc4pl.so lib/swipl-${V}/lib/${FULLARCH}/pdt_console.so lib/swipl-${V}/lib/${FULLARCH}/pl2xpce.so lib/swipl-${V}/lib/${FULLARCH}/porter_stem.so lib/swipl-${V}/lib/${FULLARCH}/process.so +lib/swipl-${V}/lib/${FULLARCH}/prolog_stream.so lib/swipl-${V}/lib/${FULLARCH}/protobufs.so lib/swipl-${V}/lib/${FULLARCH}/rdf_db.so +lib/swipl-${V}/lib/${FULLARCH}/readline4pl.so lib/swipl-${V}/lib/${FULLARCH}/readutil.so lib/swipl-${V}/lib/${FULLARCH}/rlimit.so lib/swipl-${V}/lib/${FULLARCH}/sgml2pl.so @@ -88,6 +98,8 @@ lib/swipl-${V}/lib/${FULLARCH}/uid.so lib/swipl-${V}/lib/${FULLARCH}/unicode4pl.so lib/swipl-${V}/lib/${FULLARCH}/unix.so lib/swipl-${V}/lib/${FULLARCH}/uri.so +lib/swipl-${V}/lib/${FULLARCH}/uuid.so +lib/swipl-${V}/lib/${FULLARCH}/websocket.so lib/swipl-${V}/lib/${FULLARCH}/zlib4pl.so lib/swipl-${V}/library/ lib/swipl-${V}/library/DTD/ @@ -100,21 +112,23 @@ lib/swipl-${V}/library/DTD/HTMLspec.ent lib/swipl-${V}/library/DTD/HTMLsym.ent lib/swipl-${V}/library/INDEX.pl lib/swipl-${V}/library/MANUAL -lib/swipl-${V}/library/R.pl lib/swipl-${V}/library/aggregate.pl -lib/swipl-${V}/library/am_match.pl lib/swipl-${V}/library/ansi_term.pl lib/swipl-${V}/library/apply.pl lib/swipl-${V}/library/apply_macros.pl +lib/swipl-${V}/library/archive.pl lib/swipl-${V}/library/arithmetic.pl lib/swipl-${V}/library/assoc.pl lib/swipl-${V}/library/backcomp.pl lib/swipl-${V}/library/base32.pl lib/swipl-${V}/library/base64.pl +lib/swipl-${V}/library/bdb.pl lib/swipl-${V}/library/broadcast.pl +lib/swipl-${V}/library/c14n2.pl lib/swipl-${V}/library/cgi.pl lib/swipl-${V}/library/charsio.pl lib/swipl-${V}/library/check.pl +lib/swipl-${V}/library/check_installation.pl lib/swipl-${V}/library/checklast.pl lib/swipl-${V}/library/checkselect.pl lib/swipl-${V}/library/chr/ @@ -142,6 +156,7 @@ lib/swipl-${V}/library/clp/ lib/swipl-${V}/library/clp/bounds.pl lib/swipl-${V}/library/clp/clp_distinct.pl lib/swipl-${V}/library/clp/clp_events.pl +lib/swipl-${V}/library/clp/clpb.pl lib/swipl-${V}/library/clp/clpfd.pl lib/swipl-${V}/library/clp/clpq/ lib/swipl-${V}/library/clp/clpq.pl @@ -174,7 +189,17 @@ lib/swipl-${V}/library/clp/simplex.pl lib/swipl-${V}/library/codesio.pl lib/swipl-${V}/library/coinduction.pl lib/swipl-${V}/library/console_input.pl +lib/swipl-${V}/library/cql/ +lib/swipl-${V}/library/cql/cql.pl +lib/swipl-${V}/library/cql/cql_autoschema.pl +lib/swipl-${V}/library/cql/cql_database.pl +lib/swipl-${V}/library/cql/cql_hooks.pl +lib/swipl-${V}/library/cql/sql_keywords.pl +lib/swipl-${V}/library/cql/sql_parser.pl +lib/swipl-${V}/library/cql/sql_tokenizer.pl +lib/swipl-${V}/library/cql/sql_write.pl lib/swipl-${V}/library/crypt.pl +lib/swipl-${V}/library/crypto.pl lib/swipl-${V}/library/csv.pl lib/swipl-${V}/library/ctypes.pl lib/swipl-${V}/library/date.pl @@ -184,51 +209,9 @@ lib/swipl-${V}/library/debug.pl lib/swipl-${V}/library/dialect/ lib/swipl-${V}/library/dialect.pl lib/swipl-${V}/library/dialect/bim.pl -lib/swipl-${V}/library/dialect/ciao/ -lib/swipl-${V}/library/dialect/ciao.pl -lib/swipl-${V}/library/dialect/ciao/aggregates.pl -lib/swipl-${V}/library/dialect/ciao/assertions.pl -lib/swipl-${V}/library/dialect/ciao/basicmodes.pl -lib/swipl-${V}/library/dialect/ciao/classic.pl -lib/swipl-${V}/library/dialect/ciao/dcg.pl -lib/swipl-${V}/library/dialect/ciao/engine/ -lib/swipl-${V}/library/dialect/ciao/engine/attributes.pl -lib/swipl-${V}/library/dialect/ciao/engine/basic_props.pl -lib/swipl-${V}/library/dialect/ciao/engine/basiccontrol.pl -lib/swipl-${V}/library/dialect/ciao/engine/exceptions.pl -lib/swipl-${V}/library/dialect/ciao/engine/exceptions_db.pl -lib/swipl-${V}/library/dialect/ciao/engine/hiord_rt.pl -lib/swipl-${V}/library/dialect/ciao/engine/internals.pl -lib/swipl-${V}/library/dialect/ciao/engine/io_aux.pl -lib/swipl-${V}/library/dialect/ciao/file_utils.pl -lib/swipl-${V}/library/dialect/ciao/format.pl -lib/swipl-${V}/library/dialect/ciao/freeze.pl -lib/swipl-${V}/library/dialect/ciao/hiord.pl -lib/swipl-${V}/library/dialect/ciao/hiordlib.pl -lib/swipl-${V}/library/dialect/ciao/iso_misc.pl -lib/swipl-${V}/library/dialect/ciao/isomodes.pl -lib/swipl-${V}/library/dialect/ciao/lists.pl -lib/swipl-${V}/library/dialect/ciao/llists.pl -lib/swipl-${V}/library/dialect/ciao/nativeprops.pl -lib/swipl-${V}/library/dialect/ciao/nortchecks.pl -lib/swipl-${V}/library/dialect/ciao/odd.pl -lib/swipl-${V}/library/dialect/ciao/prolog_flags.pl -lib/swipl-${V}/library/dialect/ciao/read.pl -lib/swipl-${V}/library/dialect/ciao/regtypes/ -lib/swipl-${V}/library/dialect/ciao/regtypes.pl -lib/swipl-${V}/library/dialect/ciao/regtypes/regtypes_tr.pl -lib/swipl-${V}/library/dialect/ciao/sockets.pl -lib/swipl-${V}/library/dialect/ciao/sort.pl -lib/swipl-${V}/library/dialect/ciao/streams.pl -lib/swipl-${V}/library/dialect/ciao/strings.pl -lib/swipl-${V}/library/dialect/ciao/system.pl -lib/swipl-${V}/library/dialect/ciao/terms.pl -lib/swipl-${V}/library/dialect/ciao/terms_check.pl -lib/swipl-${V}/library/dialect/ciao/terms_vars.pl -lib/swipl-${V}/library/dialect/ciao/unittestdecls.pl -lib/swipl-${V}/library/dialect/ciao/unittestprops.pl -lib/swipl-${V}/library/dialect/ciao/write.pl lib/swipl-${V}/library/dialect/commons.pl +lib/swipl-${V}/library/dialect/eclipse/ +lib/swipl-${V}/library/dialect/eclipse/test_util_iso.pl lib/swipl-${V}/library/dialect/hprolog/ lib/swipl-${V}/library/dialect/hprolog.pl lib/swipl-${V}/library/dialect/hprolog/format.pl @@ -251,6 +234,7 @@ lib/swipl-${V}/library/dialect/swi/syspr lib/swipl-${V}/library/dialect/yap/ lib/swipl-${V}/library/dialect/yap.pl lib/swipl-${V}/library/dialect/yap/README.TXT +lib/swipl-${V}/library/dicts.pl lib/swipl-${V}/library/dif.pl lib/swipl-${V}/library/doc_files.pl lib/swipl-${V}/library/doc_http.pl @@ -265,6 +249,7 @@ lib/swipl-${V}/library/files.pl lib/swipl-${V}/library/filesex.pl lib/swipl-${V}/library/gensym.pl lib/swipl-${V}/library/git.pl +lib/swipl-${V}/library/hash_stream.pl lib/swipl-${V}/library/heaps.pl lib/swipl-${V}/library/help.pl lib/swipl-${V}/library/helpidx.pl @@ -281,6 +266,7 @@ lib/swipl-${V}/library/http/http_authent lib/swipl-${V}/library/http/http_client.pl lib/swipl-${V}/library/http/http_cookie.pl lib/swipl-${V}/library/http/http_cors.pl +lib/swipl-${V}/library/http/http_digest.pl lib/swipl-${V}/library/http/http_dirindex.pl lib/swipl-${V}/library/http/http_dispatch.pl lib/swipl-${V}/library/http/http_error.pl @@ -292,11 +278,12 @@ lib/swipl-${V}/library/http/http_host.pl lib/swipl-${V}/library/http/http_json.pl lib/swipl-${V}/library/http/http_load.pl lib/swipl-${V}/library/http/http_log.pl -lib/swipl-${V}/library/http/http_mime_plugin.pl +lib/swipl-${V}/library/http/http_multipart_plugin.pl lib/swipl-${V}/library/http/http_open.pl lib/swipl-${V}/library/http/http_openid.pl lib/swipl-${V}/library/http/http_parameters.pl lib/swipl-${V}/library/http/http_path.pl +lib/swipl-${V}/library/http/http_proxy.pl lib/swipl-${V}/library/http/http_pwp.pl lib/swipl-${V}/library/http/http_server_files.pl lib/swipl-${V}/library/http/http_session.pl @@ -305,18 +292,22 @@ lib/swipl-${V}/library/http/http_ssl_plu lib/swipl-${V}/library/http/http_stream.pl lib/swipl-${V}/library/http/http_unix_daemon.pl lib/swipl-${V}/library/http/http_wrapper.pl +lib/swipl-${V}/library/http/hub.pl lib/swipl-${V}/library/http/inetd_httpd.pl +lib/swipl-${V}/library/http/jquery.pl lib/swipl-${V}/library/http/js_grammar.pl lib/swipl-${V}/library/http/js_write.pl lib/swipl-${V}/library/http/json.pl lib/swipl-${V}/library/http/json_convert.pl lib/swipl-${V}/library/http/mimepack.pl lib/swipl-${V}/library/http/mimetype.pl +lib/swipl-${V}/library/http/term_html.pl lib/swipl-${V}/library/http/thread_httpd.pl lib/swipl-${V}/library/http/web/ lib/swipl-${V}/library/http/web/css/ lib/swipl-${V}/library/http/web/css/dirindex.css lib/swipl-${V}/library/http/web/css/openid.css +lib/swipl-${V}/library/http/web/css/plterm.css lib/swipl-${V}/library/http/web/icons/ lib/swipl-${V}/library/http/web/icons/back.png lib/swipl-${V}/library/http/web/icons/c.png @@ -326,19 +317,27 @@ lib/swipl-${V}/library/http/web/icons/ge lib/swipl-${V}/library/http/web/icons/layout.png lib/swipl-${V}/library/http/web/icons/openid-logo-square.png lib/swipl-${V}/library/http/web/icons/openid-logo-tiny.png +lib/swipl-${V}/library/http/web/js/ +lib/swipl-${V}/library/http/web/js/jquery-1.11.3.min.js +lib/swipl-${V}/library/http/web/js/pengines.js +lib/swipl-${V}/library/http/websocket.pl lib/swipl-${V}/library/http/xpce_httpd.pl lib/swipl-${V}/library/http/yadis.pl +lib/swipl-${V}/library/iostream.pl lib/swipl-${V}/library/iso_639.pl lib/swipl-${V}/library/isub.pl +lib/swipl-${V}/library/lazy_lists.pl lib/swipl-${V}/library/listing.pl lib/swipl-${V}/library/lists.pl lib/swipl-${V}/library/main.pl lib/swipl-${V}/library/make.pl +lib/swipl-${V}/library/md5.pl lib/swipl-${V}/library/memfile.pl -lib/swipl-${V}/library/mime.pl +lib/swipl-${V}/library/modules.pl lib/swipl-${V}/library/nb_rbtrees.pl lib/swipl-${V}/library/nb_set.pl lib/swipl-${V}/library/occurs.pl +lib/swipl-${V}/library/odbc.pl lib/swipl-${V}/library/operators.pl lib/swipl-${V}/library/option.pl lib/swipl-${V}/library/optparse.pl @@ -346,6 +345,8 @@ lib/swipl-${V}/library/ordsets.pl lib/swipl-${V}/library/oset.pl lib/swipl-${V}/library/pairs.pl lib/swipl-${V}/library/pdt_console.pl +lib/swipl-${V}/library/pengines.pl +lib/swipl-${V}/library/pengines_io.pl lib/swipl-${V}/library/persistency.pl lib/swipl-${V}/library/pio.pl lib/swipl-${V}/library/pldoc/ @@ -365,7 +366,8 @@ lib/swipl-${V}/library/pldoc/doc_registe lib/swipl-${V}/library/pldoc/doc_search.pl lib/swipl-${V}/library/pldoc/doc_util.pl lib/swipl-${V}/library/pldoc/doc_wiki.pl -lib/swipl-${V}/library/pldoc/edit.gif +lib/swipl-${V}/library/pldoc/edit.png +lib/swipl-${V}/library/pldoc/editpred.png lib/swipl-${V}/library/pldoc/favicon.ico lib/swipl-${V}/library/pldoc/h1-bg.png lib/swipl-${V}/library/pldoc/h2-bg.png @@ -379,12 +381,13 @@ lib/swipl-${V}/library/pldoc/priv-bg.png lib/swipl-${V}/library/pldoc/private.png lib/swipl-${V}/library/pldoc/pub-bg.png lib/swipl-${V}/library/pldoc/public.png -lib/swipl-${V}/library/pldoc/reload.gif +lib/swipl-${V}/library/pldoc/reload.png lib/swipl-${V}/library/pldoc/source.png lib/swipl-${V}/library/pldoc/up.gif lib/swipl-${V}/library/plunit.pl lib/swipl-${V}/library/porter_stem.pl lib/swipl-${V}/library/portray_text.pl +lib/swipl-${V}/library/pprint.pl lib/swipl-${V}/library/predicate_options.pl lib/swipl-${V}/library/process.pl lib/swipl-${V}/library/prolog_autoload.pl @@ -392,12 +395,15 @@ lib/swipl-${V}/library/prolog_breakpoint lib/swipl-${V}/library/prolog_clause.pl lib/swipl-${V}/library/prolog_codewalk.pl lib/swipl-${V}/library/prolog_colour.pl +lib/swipl-${V}/library/prolog_format.pl lib/swipl-${V}/library/prolog_history.pl +lib/swipl-${V}/library/prolog_install.pl lib/swipl-${V}/library/prolog_metainference.pl lib/swipl-${V}/library/prolog_pack.pl lib/swipl-${V}/library/prolog_server.pl lib/swipl-${V}/library/prolog_source.pl lib/swipl-${V}/library/prolog_stack.pl +lib/swipl-${V}/library/prolog_stream.pl lib/swipl-${V}/library/prolog_xref.pl lib/swipl-${V}/library/protobufs.pl lib/swipl-${V}/library/pure_input.pl @@ -413,18 +419,22 @@ lib/swipl-${V}/library/rdf_ntriples.pl lib/swipl-${V}/library/rdf_parser.pl lib/swipl-${V}/library/rdf_triple.pl lib/swipl-${V}/library/rdf_write.pl +lib/swipl-${V}/library/readline.pl lib/swipl-${V}/library/readln.pl lib/swipl-${V}/library/readutil.pl lib/swipl-${V}/library/record.pl lib/swipl-${V}/library/rewrite.pl lib/swipl-${V}/library/rlimit.pl +lib/swipl-${V}/library/saml.pl lib/swipl-${V}/library/sandbox.pl lib/swipl-${V}/library/semweb/ lib/swipl-${V}/library/semweb/INDEX.pl -lib/swipl-${V}/library/semweb/README +lib/swipl-${V}/library/semweb/README.md lib/swipl-${V}/library/semweb/dc.rdfs lib/swipl-${V}/library/semweb/eor.rdfs lib/swipl-${V}/library/semweb/owl.owl +lib/swipl-${V}/library/semweb/rdf11.pl +lib/swipl-${V}/library/semweb/rdf11_containers.pl lib/swipl-${V}/library/semweb/rdf_cache.pl lib/swipl-${V}/library/semweb/rdf_compare.pl lib/swipl-${V}/library/semweb/rdf_db.pl @@ -436,9 +446,11 @@ lib/swipl-${V}/library/semweb/rdf_litind lib/swipl-${V}/library/semweb/rdf_ntriples.pl lib/swipl-${V}/library/semweb/rdf_persistency.pl lib/swipl-${V}/library/semweb/rdf_portray.pl +lib/swipl-${V}/library/semweb/rdf_sandbox.pl lib/swipl-${V}/library/semweb/rdf_turtle.pl lib/swipl-${V}/library/semweb/rdf_turtle_write.pl lib/swipl-${V}/library/semweb/rdf_zlib_plugin.pl +lib/swipl-${V}/library/semweb/rdfa.pl lib/swipl-${V}/library/semweb/rdfs.pl lib/swipl-${V}/library/semweb/rdfs.rdfs lib/swipl-${V}/library/semweb/sparql_client.pl @@ -451,6 +463,7 @@ lib/swipl-${V}/library/shell.pl lib/swipl-${V}/library/shlib.pl lib/swipl-${V}/library/snowball.pl lib/swipl-${V}/library/socket.pl +lib/swipl-${V}/library/solution_sequences.pl lib/swipl-${V}/library/sort.pl lib/swipl-${V}/library/ssl.pl lib/swipl-${V}/library/statistics.pl @@ -460,6 +473,8 @@ lib/swipl-${V}/library/syslog.pl lib/swipl-${V}/library/system.pl lib/swipl-${V}/library/table.pl lib/swipl-${V}/library/table_util.pl +lib/swipl-${V}/library/tabling.pl +lib/swipl-${V}/library/term_to_json.pl lib/swipl-${V}/library/terms.pl lib/swipl-${V}/library/test_cover.pl lib/swipl-${V}/library/test_wizard.pl @@ -479,20 +494,23 @@ lib/swipl-${V}/library/unix.pl lib/swipl-${V}/library/uri.pl lib/swipl-${V}/library/url.pl lib/swipl-${V}/library/utf8.pl +lib/swipl-${V}/library/uuid.pl lib/swipl-${V}/library/varnumbers.pl lib/swipl-${V}/library/vm.pl lib/swipl-${V}/library/when.pl lib/swipl-${V}/library/win_menu.pl lib/swipl-${V}/library/writef.pl lib/swipl-${V}/library/www_browser.pl +lib/swipl-${V}/library/xmldsig.pl +lib/swipl-${V}/library/xmlenc.pl lib/swipl-${V}/library/xpath.pl lib/swipl-${V}/library/xsdp_types.pl +lib/swipl-${V}/library/yall.pl lib/swipl-${V}/library/zlib.pl lib/swipl-${V}/swipl-win.rc lib/swipl-${V}/swipl.home lib/swipl-${V}/swipl.rc lib/swipl-${V}/xpce/ -lib/swipl-${V}/xpce/COPYING lib/swipl-${V}/xpce/Defaults lib/swipl-${V}/xpce/Defaults.user lib/swipl-${V}/xpce/README @@ -1545,7 +1563,8 @@ share/doc/swipl/Manual/chartype.html share/doc/swipl/Manual/check.html share/doc/swipl/Manual/chr.html share/doc/swipl/Manual/chrintro.html -share/doc/swipl/Manual/clicense.html +share/doc/swipl/Manual/clp.html +share/doc/swipl/Manual/clpb.html share/doc/swipl/Manual/clpfd.html share/doc/swipl/Manual/clpqr.html share/doc/swipl/Manual/cmdline.html @@ -1564,18 +1583,29 @@ share/doc/swipl/Manual/debugger.html share/doc/swipl/Manual/debugging.html share/doc/swipl/Manual/debugoverview.html share/doc/swipl/Manual/defmodule.html +share/doc/swipl/Manual/delcont.html share/doc/swipl/Manual/dialect.html +share/doc/swipl/Manual/dicts.html share/doc/swipl/Manual/dynamic-modules.html share/doc/swipl/Manual/dynamic.html share/doc/swipl/Manual/edit.html share/doc/swipl/Manual/editreload.html +share/doc/swipl/Manual/engine-examples.html +share/doc/swipl/Manual/engine-predicates.html +share/doc/swipl/Manual/engine-resources.html +share/doc/swipl/Manual/engines.html +share/doc/swipl/Manual/error.html share/doc/swipl/Manual/errors.html share/doc/swipl/Manual/examineprog.html share/doc/swipl/Manual/examples.html share/doc/swipl/Manual/excepthook.html share/doc/swipl/Manual/exception.html share/doc/swipl/Manual/exception3.html -share/doc/swipl/Manual/extvar.html +share/doc/swipl/Manual/ext-integration.html +share/doc/swipl/Manual/ext-issues.html +share/doc/swipl/Manual/ext-lists.html +share/doc/swipl/Manual/ext-syntax.html +share/doc/swipl/Manual/extensions.html share/doc/swipl/Manual/files.html share/doc/swipl/Manual/findappfile.html share/doc/swipl/Manual/findhome.html @@ -1615,6 +1645,7 @@ share/doc/swipl/Manual/initfile.html share/doc/swipl/Manual/initgoal.html share/doc/swipl/Manual/intlibs.html share/doc/swipl/Manual/intro.html +share/doc/swipl/Manual/iostream.html share/doc/swipl/Manual/jitindex.html share/doc/swipl/Manual/libpl.html share/doc/swipl/Manual/library.html @@ -1651,6 +1682,7 @@ share/doc/swipl/Manual/overrule.html share/doc/swipl/Manual/overview.html share/doc/swipl/Manual/pairs.html share/doc/swipl/Manual/pceemacs.html +share/doc/swipl/Manual/persistency.html share/doc/swipl/Manual/pio.html share/doc/swipl/Manual/plld.html share/doc/swipl/Manual/portabilitystrategies.html @@ -1670,7 +1702,6 @@ share/doc/swipl/Manual/qsavelimits.html share/doc/swipl/Manual/quasiquotations.html share/doc/swipl/Manual/quickstart.html share/doc/swipl/Manual/random.html -share/doc/swipl/Manual/readline.html share/doc/swipl/Manual/readutil.html share/doc/swipl/Manual/record.html share/doc/swipl/Manual/reexport.html @@ -1681,6 +1712,7 @@ share/doc/swipl/Manual/sicstus-chr.html share/doc/swipl/Manual/signal.html share/doc/swipl/Manual/simplex.html share/doc/swipl/Manual/softlicense.html +share/doc/swipl/Manual/solutionsequences.html share/doc/swipl/Manual/sponsor.html share/doc/swipl/Manual/statistics.html share/doc/swipl/Manual/status.html @@ -1690,8 +1722,8 @@ share/doc/swipl/Manual/summary.html share/doc/swipl/Manual/swiorother.html share/doc/swipl/Manual/swiprolog.html share/doc/swipl/Manual/syntax.html -share/doc/swipl/Manual/syntaxext.html share/doc/swipl/Manual/system.html +share/doc/swipl/Manual/tabling.html share/doc/swipl/Manual/termrw.html share/doc/swipl/Manual/thmonitor.html share/doc/swipl/Manual/threadcom.html @@ -1717,14 +1749,14 @@ share/doc/swipl/Manual/www_browser.html share/doc/swipl/Manual/xref.html share/doc/swipl/Manual/xrefchatdep.gif share/doc/swipl/Manual/xrefchatfile.gif +share/doc/swipl/Manual/yall.html share/doc/swipl/Manual/yellow_pages.gif share/doc/swipl/packages/ -share/doc/swipl/packages/R.html share/doc/swipl/packages/archive.html +share/doc/swipl/packages/bdb4pl.html share/doc/swipl/packages/clib.html +share/doc/swipl/packages/cql.html share/doc/swipl/packages/examples/ -share/doc/swipl/packages/examples/R/ -share/doc/swipl/packages/examples/R/r_demo.pl share/doc/swipl/packages/examples/chr/ share/doc/swipl/packages/examples/chr/bool.chr share/doc/swipl/packages/examples/chr/chrdif.chr @@ -1736,9 +1768,11 @@ share/doc/swipl/packages/examples/chr/gc share/doc/swipl/packages/examples/chr/leq.chr share/doc/swipl/packages/examples/chr/listdom.chr share/doc/swipl/packages/examples/chr/primes.chr +share/doc/swipl/packages/examples/cql/ +share/doc/swipl/packages/examples/cql/cql_demo.pl share/doc/swipl/packages/examples/http/ +share/doc/swipl/packages/examples/http/README.md share/doc/swipl/packages/examples/http/calc.pl -share/doc/swipl/packages/examples/http/debian-init-script share/doc/swipl/packages/examples/http/demo_body.pl share/doc/swipl/packages/examples/http/demo_client.pl share/doc/swipl/packages/examples/http/demo_daemon.pl @@ -1748,6 +1782,7 @@ share/doc/swipl/packages/examples/http/d share/doc/swipl/packages/examples/http/demo_pwp.pl share/doc/swipl/packages/examples/http/demo_threads.pl share/doc/swipl/packages/examples/http/demo_xpce.pl +share/doc/swipl/packages/examples/http/linux-init-script share/doc/swipl/packages/examples/http/pwp/ share/doc/swipl/packages/examples/http/pwp/context.pwp share/doc/swipl/packages/examples/http/pwp/index.pwp @@ -1760,6 +1795,21 @@ share/doc/swipl/packages/examples/http/p share/doc/swipl/packages/examples/http/pwp/pwp7.pwp share/doc/swipl/packages/examples/http/pwp/pwp8.pwp share/doc/swipl/packages/examples/http/pwp/pwpdb.pl +share/doc/swipl/packages/examples/http/systemd-script.service +share/doc/swipl/packages/examples/http/upstart-script.conf +share/doc/swipl/packages/examples/pengines/ +share/doc/swipl/packages/examples/pengines/client.pl +share/doc/swipl/packages/examples/pengines/server.pl +share/doc/swipl/packages/examples/pengines/web/ +share/doc/swipl/packages/examples/pengines/web/chunking.html +share/doc/swipl/packages/examples/pengines/web/debugging.html +share/doc/swipl/packages/examples/pengines/web/hack.html +share/doc/swipl/packages/examples/pengines/web/index.html +share/doc/swipl/packages/examples/pengines/web/input_output.html +share/doc/swipl/packages/examples/pengines/web/pengine.html +share/doc/swipl/packages/examples/pengines/web/queen.png +share/doc/swipl/packages/examples/pengines/web/queens.html +share/doc/swipl/packages/examples/pengines/web/simple.html share/doc/swipl/packages/examples/pldoc/ share/doc/swipl/packages/examples/pldoc/README share/doc/swipl/packages/examples/pldoc/man_server.pl @@ -1777,6 +1827,7 @@ share/doc/swipl/packages/examples/ssl/et share/doc/swipl/packages/examples/ssl/etc/Makefile share/doc/swipl/packages/examples/ssl/etc/README share/doc/swipl/packages/examples/ssl/etc/client/ +share/doc/swipl/packages/examples/ssl/etc/client/client-cert.p12 share/doc/swipl/packages/examples/ssl/etc/client/client-cert.pem share/doc/swipl/packages/examples/ssl/etc/client/client-key.pem share/doc/swipl/packages/examples/ssl/etc/demoCA/ @@ -1798,15 +1849,21 @@ share/doc/swipl/packages/examples/ssl/se share/doc/swipl/packages/http.html share/doc/swipl/packages/httpserver.gif share/doc/swipl/packages/index.html +share/doc/swipl/packages/libedit.html share/doc/swipl/packages/modules.gif share/doc/swipl/packages/nlp.html share/doc/swipl/packages/odbc.html share/doc/swipl/packages/pdt.html +share/doc/swipl/packages/penarch.png +share/doc/swipl/packages/pengines.html share/doc/swipl/packages/pl2cpp.html share/doc/swipl/packages/pldoc.html +share/doc/swipl/packages/pltpruncolour.png +share/doc/swipl/packages/pltpsynch.png share/doc/swipl/packages/plunit.html share/doc/swipl/packages/protobufs.html share/doc/swipl/packages/rdf2pl.html +share/doc/swipl/packages/readline.html share/doc/swipl/packages/semweb.html share/doc/swipl/packages/sgml.html share/doc/swipl/packages/ssl.html -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
