svn commit: r516613 - in head/www/serf: . files
Lev A. Serebryakov
lev at FreeBSD.org
Sun Nov 3 22:54:24 UTC 2019
Author: lev
Date: Sun Nov 3 22:54:23 2019
New Revision: 516613
URL: https://svnweb.freebsd.org/changeset/ports/516613
Log:
Fix build with LibreSSL 2.8+
PR: 233480
Submitted by: Bernard Spil <brnrd at freebsd.org>
Modified:
head/www/serf/Makefile
head/www/serf/files/patch-buckets_ssl__buckets.c
Modified: head/www/serf/Makefile
==============================================================================
--- head/www/serf/Makefile Sun Nov 3 22:48:11 2019 (r516612)
+++ head/www/serf/Makefile Sun Nov 3 22:54:23 2019 (r516613)
@@ -3,7 +3,7 @@
PORTNAME= serf
PORTVERSION= 1.3.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= APACHE/serf
Modified: head/www/serf/files/patch-buckets_ssl__buckets.c
==============================================================================
--- head/www/serf/files/patch-buckets_ssl__buckets.c Sun Nov 3 22:48:11 2019 (r516612)
+++ head/www/serf/files/patch-buckets_ssl__buckets.c Sun Nov 3 22:54:23 2019 (r516613)
@@ -1,11 +1,11 @@
--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC
+++ buckets/ssl_buckets.c
-@@ -52,7 +52,7 @@
- #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+ }
#endif
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define USE_OPENSSL_1_1_API
- #endif
-
+-#ifdef USE_OPENSSL_1_1_API
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_malloc_init();
+ #else
+ CRYPTO_malloc_init();
More information about the svn-ports-head
mailing list