Attachment #233189 for bug #263254

View | Details | Raw Unified | Return to bug 263254
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/www/tomcat-native/Makefile (-2 / +1 lines)
1	# Created by: Alex Dupre <ale@FreeBSD.org>	1	# Created by: Alex Dupre <ale@FreeBSD.org>
2		2
3	PORTNAME= tomcat-native	3	PORTNAME= tomcat-native
4	PORTVERSION= 1.2.24	4	PORTVERSION= 1.2.32
5	PORTREVISION= 1
6	CATEGORIES= www java	5	CATEGORIES= www java
7	MASTER_SITES= https://archive.apache.org/dist/tomcat/tomcat-connectors/native/${PORTVERSION}/source/	6	MASTER_SITES= https://archive.apache.org/dist/tomcat/tomcat-connectors/native/${PORTVERSION}/source/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	7	DISTNAME= ${PORTNAME}-${PORTVERSION}-src

Lines 1-3 Link Here

(-)b/www/tomcat-native/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588667024	1	TIMESTAMP = 1649837222
2	SHA256 (tomcat-native-1.2.24-src.tar.gz) = 037f52f9a345e766a7dde8361c55b3b69045928f9a8068a406612b603819e76c	2	SHA256 (tomcat-native-1.2.32-src.tar.gz) = 805ca999267f07afe701a8a434d517dc0b7f4317c366560f43c0fbca593578bd
3	SIZE (tomcat-native-1.2.24-src.tar.gz) = 419572	3	SIZE (tomcat-native-1.2.32-src.tar.gz) = 429747

Removed Link Here

(-)a/www/tomcat-native/files/patch-include_ssl__private.h (-11 lines)
1	--- include/ssl_private.h.orig 2020-04-24 19:24:44 UTC
2	+++ include/ssl_private.h
3	@@ -241,7 +241,7 @@
4	#define TLS_server_method SSLv23_server_method
5	#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER) */
6
7	-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
8	+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
9	#define HAVE_KEYLOG_CALLBACK
10	#endif
11




--- 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);

Return to bug 263254

Removed Link Here

(-)a/www/tomcat-native/files/patch-src_ssl.c (-46 lines)
1	--- src/ssl.c.orig 2020-04-24 19:24:44 UTC
2	+++ src/ssl.c
3	@@ -367,11 +367,6 @@ static apr_status_t ssl_init_cleanup(void *data)
4	#endif
5	free_dh_params();
6
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
8	- /* Openssl v1.1+ handles all termination automatically. Do
9	- * nothing in this case.
10	- */
11	-#else
12	/*
13	* Try to kill the internals of the SSL library.
14	*/
15	@@ -394,7 +389,6 @@ static apr_status_t ssl_init_cleanup(void *data)
16	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
17	ERR_remove_thread_state(NULL);
18	#endif
19	-#endif
20
21	#ifdef HAVE_KEYLOG_CALLBACK
22	if (key_log_file) {
23	@@ -764,14 +758,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
24	TCN_FREE_CSTRING(engine);
25	return (jint)APR_SUCCESS;
26	}
27	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
28	- /* Openssl v1.1+ handles all initialisation automatically, apart
29	- * from hints as to how we want to use the library.
30	- *
31	- * We tell openssl we want to include engine support.
32	- */
33	- OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
34	-#else
35	+
36	/* We must register the library in full, to ensure our configuration
37	* code can successfully test the SSL environment.
38	*/
39	@@ -785,6 +772,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
40	#endif
41	OPENSSL_load_builtin_modules();
42
43	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
44	#if ! (defined(WIN32) \|\| defined(WIN64))
45	err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
46	tcn_global_pool);