Attachment #200411 for bug #234314

Lines 2-9 Link Here

(-)Makefile (-3 / +2 lines)
2		2
3	PORTNAME= mongodb	3	PORTNAME= mongodb
4	DISTVERSIONPREFIX= r	4	DISTVERSIONPREFIX= r
5	DISTVERSION= 3.4.16	5	DISTVERSION= 3.4.18
6	PORTREVISION= 4
7	CATEGORIES= databases net	6	CATEGORIES= databases net
8	MASTER_SITES= https://fastdl.mongodb.org/src/ \	7	MASTER_SITES= https://fastdl.mongodb.org/src/ \
9	http://fastdl.mongodb.org/src/ \	8	http://fastdl.mongodb.org/src/ \
Lines 11-17 Link Here
11	PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}	10	PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
12	DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}	11	DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
13		12
14	MAINTAINER= eric@camachat.org	13	MAINTAINER= ronald-lists@klop.ws
15	COMMENT= Distributed document-oriented "NoSQL" database	14	COMMENT= Distributed document-oriented "NoSQL" database
16		15
17	# mongodb is AGPLv3, C++ driver is APACHE20	16	# mongodb is AGPLv3, C++ driver is APACHE20

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1534086405	1	TIMESTAMP = 1545596629
2	SHA256 (mongodb-src-r3.4.16.tar.gz) = 4dbfd72906d4bfe6bf22229c9ae525acde908ad676878a6512d749964fb3de2a	2	SHA256 (mongodb-src-r3.4.18.tar.gz) = a1c17e9977307752ddac4b06bcb65be177035057c21955df5a65e2db74a20856
3	SIZE (mongodb-src-r3.4.16.tar.gz) = 40093657	3	SIZE (mongodb-src-r3.4.18.tar.gz) = 40117387




--- src/mongo/util/net/ssl_manager.cpp.orig	2018-08-29 22:42:21.000000000 +0200
+++ src/mongo/util/net/ssl_manager.cpp	2018-12-23 21:05:48.170857000 +0100
@@ -158,7 +158,7 @@
 #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
 // clang-format on
 

 // Copies of OpenSSL after 1.1.0 define new functions for interaction with
 // X509 structure. We must polyfill used definitions to interact with older
 // OpenSSL versions.
@@ -1382,11 +1382,6 @@
         case TLS1_2_VERSION:
             counts.tls12.addAndFetch(1);
             break;
-#ifdef TLS1_3_VERSION
-        case TLS1_3_VERSION:
-            counts.tls13.addAndFetch(1);
-            break;
-#endif
         default:
             // Do nothing
             break;

Return to bug 234314

Lines 1-6 Link Here

(-)files/patch-src_mongo_util_net_ssl__manager.cpp (-3 / +15 lines)
1	--- src/mongo/util/net/ssl_manager.cpp.orig 2017-06-08 16:11:03 UTC	1	--- src/mongo/util/net/ssl_manager.cpp.orig 2018-08-29 22:42:21.000000000 +0200
2	+++ src/mongo/util/net/ssl_manager.cpp	2	+++ src/mongo/util/net/ssl_manager.cpp 2018-12-23 21:05:48.170857000 +0100
3	@@ -125,7 +125,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE	3	@@ -158,7 +158,7 @@
4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS	4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
5	// clang-format on	5	// clang-format on
6		6
Lines 9-11 Link Here
9	// Copies of OpenSSL after 1.1.0 define new functions for interaction with	9	// Copies of OpenSSL after 1.1.0 define new functions for interaction with
10	// X509 structure. We must polyfill used definitions to interact with older	10	// X509 structure. We must polyfill used definitions to interact with older
11	// OpenSSL versions.	11	// OpenSSL versions.
		12	@@ -1382,11 +1382,6 @@
		13	case TLS1_2_VERSION:
		14	counts.tls12.addAndFetch(1);
		15	break;
		16	-#ifdef TLS1_3_VERSION
		17	- case TLS1_3_VERSION:
		18	- counts.tls13.addAndFetch(1);
		19	- break;
		20	-#endif
		21	default:
		22	// Do nothing
		23	break;