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

lang/swi-prolog: Drop a few #if defined(LIBRESSL_VERSION_NUMBER) in

Browse Source 
preparation for upcoming libcrypto bump.
This commit is contained in:
tb 2021-10-26 10:01:12 +00:00
parent a45c1dcaf1
commit 023155883f
2 changed files with 48 additions and 3 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.90 2021/08/17 20:22:02 naddy Exp $
# $OpenBSD: Makefile,v 1.91 2021/10/26 10:01:12 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 = 11
REVISION = 12
DISTNAME = swipl-$V
PKGNAME = swi-prolog-$V
CATEGORIES = lang

47
lang/swi-prolog/patches/patch-packages_ssl_ssl4pl_c
View File

@ -1,8 +1,53 @@
$OpenBSD: patch-packages_ssl_ssl4pl_c,v 1.5 2021/05/04 15:25:22 tb Exp $
$OpenBSD: patch-packages_ssl_ssl4pl_c,v 1.6 2021/10/26 10:01:12 tb Exp $
Index: packages/ssl/ssl4pl.c
--- packages/ssl/ssl4pl.c.orig
+++ packages/ssl/ssl4pl.c
@@ -572,7 +572,7 @@ unify_name(term_t term, X509_NAME* name)
return PL_unify_nil(list);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define X509_REVOKED_get0_serialNumber(R) ((R)->serialNumber)
#define X509_REVOKED_get0_revocationDate(R) ((R)->revocationDate)
#define EVP_PKEY_base_id(key) ((key)->type)
@@ -673,7 +673,7 @@ unify_crl(term_t term, X509_CRL* crl)
static int
unify_rsa(term_t item, RSA* rsa)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
return ( PL_unify_functor(item, FUNCTOR_rsa8) &&
unify_bignum_arg(1, item, rsa->n) &&
unify_bignum_arg(2, item, rsa->e) &&
@@ -1762,7 +1762,7 @@ ssl_cb_cert_verify(int preverify_ok, X509_STORE_CTX *c
4) Otherwise, FAIL.
*/
int i;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define ASN1_STRING_get0_data(D) ASN1_STRING_data(D)
#define X509_STORE_CTX_get0_cert(C) ((C)->cert)
#endif
@@ -2362,7 +2362,7 @@ get_dh2048(void)
DH *dh = DH_new();
if (dh == NULL) return NULL;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
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))
@@ -2612,7 +2612,7 @@ ssl_lib_init(void)
* One-time library initialization code
*/
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
(void) SSL_library_init();
SSL_load_error_strings();
#endif
@@ -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);