cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang/swi-prolog: avoid upcoming build breakage

Browse Source 
Remove two #if defined(LIBRESSL_VERSION_NUMBER) to take the OpenSSL 1.1.1
code path. This way swi-prolog will continue building once we will have
made some structs opaque in libssl.

ok edd (maintainer)
This commit is contained in:
tb 2021-05-04 15:25:22 +00:00
parent 8a4d237d06
commit 945d060505
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/swi-prolog/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.87 2021/02/06 22:08:35 naddy Exp $
# $OpenBSD: Makefile,v 1.88 2021/05/04 15:25:22 tb Exp $
BROKEN-hppa = undefined reference to __sync_fetch_and_add_4
BROKEN-sparc64 = infinite loop or aborts during build
@ -6,7 +6,7 @@ BROKEN-sparc64 = infinite loop or aborts during build
COMMENT = Prolog for the real world
V = 7.6.0
REVISION = 8
REVISION = 9
DISTNAME = swipl-$V
PKGNAME = swi-prolog-$V
CATEGORIES = lang

23
lang/swi-prolog/patches/patch-packages_ssl_ssl4pl_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-packages_ssl_ssl4pl_c,v 1.5 2021/05/04 15:25:22 tb Exp $
Index: packages/ssl/ssl4pl.c
--- packages/ssl/ssl4pl.c.orig
+++ packages/ssl/ssl4pl.c
@@ -3549,7 +3549,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 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
version = session->ssl_version;
master_key = session->master_key;
master_key_length = session->master_key_length;
@@ -3585,7 +3585,7 @@ pl_ssl_session(term_t stream_t, term_t session_t)
master_key_length, master_key) )
goto err;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if ( !add_key_string(list_t, FUNCTOR_session_id1,
session->session_id_length, session->session_id) )
goto err;