svn commit: r535088 - in head/www/tomcat-native: . files
Alex Dupre
ale at FreeBSD.org
Wed May 13 07:55:25 UTC 2020
Author: ale
Date: Wed May 13 07:55:24 2020
New Revision: 535088
URL: https://svnweb.freebsd.org/changeset/ports/535088
Log:
Fix build with libressl.
PR: 246373
Submitted by: Michael Osipov <michael.osipov at siemens.com>
Added:
head/www/tomcat-native/files/
head/www/tomcat-native/files/patch-include_ssl__private.h (contents, props changed)
head/www/tomcat-native/files/patch-src_ssl.c (contents, props changed)
Modified:
head/www/tomcat-native/Makefile
Modified: head/www/tomcat-native/Makefile
==============================================================================
--- head/www/tomcat-native/Makefile Wed May 13 07:55:12 2020 (r535087)
+++ head/www/tomcat-native/Makefile Wed May 13 07:55:24 2020 (r535088)
@@ -3,6 +3,7 @@
PORTNAME= tomcat-native
PORTVERSION= 1.2.24
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Added: head/www/tomcat-native/files/patch-include_ssl__private.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/tomcat-native/files/patch-include_ssl__private.h Wed May 13 07:55:24 2020 (r535088)
@@ -0,0 +1,11 @@
+--- include/ssl_private.h.orig 2020-04-24 19:24:44 UTC
++++ include/ssl_private.h
+@@ -241,7 +241,7 @@
+ #define TLS_server_method SSLv23_server_method
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_KEYLOG_CALLBACK
+ #endif
+
Added: head/www/tomcat-native/files/patch-src_ssl.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/tomcat-native/files/patch-src_ssl.c Wed May 13 07:55:24 2020 (r535088)
@@ -0,0 +1,46 @@
+--- src/ssl.c.orig 2020-04-24 19:24:44 UTC
++++ src/ssl.c
+@@ -367,11 +367,6 @@ static apr_status_t ssl_init_cleanup(void *data)
+ #endif
+ free_dh_params();
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+- /* Openssl v1.1+ handles all termination automatically. Do
+- * nothing in this case.
+- */
+-#else
+ /*
+ * Try to kill the internals of the SSL library.
+ */
+@@ -394,7 +389,6 @@ static apr_status_t ssl_init_cleanup(void *data)
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ ERR_remove_thread_state(NULL);
+ #endif
+-#endif
+
+ #ifdef HAVE_KEYLOG_CALLBACK
+ if (key_log_file) {
+@@ -764,14 +758,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
+ TCN_FREE_CSTRING(engine);
+ return (jint)APR_SUCCESS;
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+- /* Openssl v1.1+ handles all initialisation automatically, apart
+- * from hints as to how we want to use the library.
+- *
+- * We tell openssl we want to include engine support.
+- */
+- OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
+-#else
++
+ /* We must register the library in full, to ensure our configuration
+ * code can successfully test the SSL environment.
+ */
+@@ -785,6 +772,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
+ #endif
+ OPENSSL_load_builtin_modules();
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #if ! (defined(WIN32) || defined(WIN64))
+ err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
+ tcn_global_pool);
More information about the svn-ports-head
mailing list