From caf28ad2ce4700688728faeb5b3910e71fcea2c3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jul 2020 08:38:03 +0200 Subject: update to 2.15.3 open https://github.com/datastax/cpp-driver/pull/479 fix for openssl 1.0.2 on EL-7 --- .gitignore | 2 + 479.patch | 24 + cassandra-cpp-driver.spec | 18 +- compat_reports/2.15.1_to_2.15.2/compat_report.html | 521 +++++++++++++++++++++ compat_reports/2.15.2_to_2.15.3/compat_report.html | 477 +++++++++++++++++++ libcassandra.xml | 2 +- 6 files changed, 1040 insertions(+), 4 deletions(-) create mode 100644 479.patch create mode 100644 compat_reports/2.15.1_to_2.15.2/compat_report.html create mode 100644 compat_reports/2.15.2_to_2.15.3/compat_report.html diff --git a/.gitignore b/.gitignore index 1ab5c4f..01f0400 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/479.patch b/479.patch new file mode 100644 index 0000000..ddc11b1 --- /dev/null +++ b/479.patch @@ -0,0 +1,24 @@ +From 464bdd6b70409a62ee47ff6c9d0ca09d3f90ed76 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 21 Jul 2020 08:33:48 +0200 +Subject: [PATCH] SSL_CTX_set_max_proto_version requires openssl 1.1 + +--- + src/ssl/ssl_openssl_impl.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ssl/ssl_openssl_impl.cpp b/src/ssl/ssl_openssl_impl.cpp +index 29d26ef51..3b1124378 100644 +--- a/src/ssl/ssl_openssl_impl.cpp ++++ b/src/ssl/ssl_openssl_impl.cpp +@@ -539,8 +539,10 @@ OpenSslContext::OpenSslContext() + , trusted_store_(X509_STORE_new()) { + SSL_CTX_set_cert_store(ssl_ctx_, trusted_store_); + SSL_CTX_set_verify(ssl_ctx_, SSL_VERIFY_NONE, ssl_no_verify_callback); ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + // Limit to TLS 1.2 for now. TLS 1.3 has broken the handshake code. + SSL_CTX_set_max_proto_version(ssl_ctx_, TLS1_2_VERSION); ++#endif + #if DEBUG_SSL + SSL_CTX_set_info_callback(ssl_ctx_, ssl_info_callback); + #endif diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec index e3b0970..40b34f3 100644 --- a/cassandra-cpp-driver.spec +++ b/cassandra-cpp-driver.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 2b3fb19e1ee28ac12ec9dde63a560511018b7195 +%global gh_commit ee2151664314f4efe3d7d00e49677445fe6c8830 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner datastax %global gh_project cpp-driver @@ -17,14 +17,16 @@ Name: cassandra-cpp-driver Summary: DataStax C/C++ Driver for Apache Cassandra -Version: 2.15.1%{?prever:~%{prever}} -Release: 2%{?dist} +Version: 2.15.3%{?prever:~%{prever}} +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://datastax.github.io/cpp-driver/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever:-%{prever}}-%{gh_short}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/datastax/cpp-driver/pull/479.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake >= 2.8.12 @@ -54,6 +56,8 @@ for %{name}. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 + find examples -name .gitignore -exec rm {} \; -print @@ -96,6 +100,14 @@ make install DESTDIR="%{buildroot}" %changelog +* Tue Jul 21 2020 Remi Collet - 2.15.3-1 +- update to 2.15.3 +- open https://github.com/datastax/cpp-driver/pull/479 + fix for openssl 1.0.2 on EL-7 + +* Tue May 12 2020 Remi Collet - 2.15.2-1 +- update to 2.15.2 + * Fri Mar 20 2020 Remi Collet - 2.15.1-2 - rebuild 2.15.1 for new tag with our patch merged diff --git a/compat_reports/2.15.1_to_2.15.2/compat_report.html b/compat_reports/2.15.1_to_2.15.2/compat_report.html new file mode 100644 index 0000000..c6555e0 --- /dev/null +++ b/compat_reports/2.15.1_to_2.15.2/compat_report.html @@ -0,0 +1,521 @@ + + + + + + + + + +libcassandra: 2.15.1 to 2.15.2 compatibility report + + + +

API compatibility report for the libcassandra library between 2.15.1 and 2.15.2 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcassandra
Version #12.15.1
Version #22.15.2
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.1
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcassandra
Version #12.15.1
Version #22.15.2
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low2
+ + +

Problems with Constants, Low Severity  2 

+cassandra.h
+ +[+] CASS_VERSION_PATCH +
+ + +
+dse.h
+ +[+] DSE_VERSION_PATCH +
+ + +
+to the top
+

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.1
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/compat_reports/2.15.2_to_2.15.3/compat_report.html b/compat_reports/2.15.2_to_2.15.3/compat_report.html new file mode 100644 index 0000000..d27c03d --- /dev/null +++ b/compat_reports/2.15.2_to_2.15.3/compat_report.html @@ -0,0 +1,477 @@ + + + + + + + + + + +libcassandra: 2.15.2 to 2.15.3 compatibility report + + + +

API compatibility report for the libcassandra library between 2.15.2 and 2.15.3 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcassandra
Version #12.15.2
Version #22.15.3
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.2
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcassandra
Version #12.15.2
Version #22.15.3
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.2
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libcassandra.xml b/libcassandra.xml index b964f93..c33c2e6 100644 --- a/libcassandra.xml +++ b/libcassandra.xml @@ -9,7 +9,7 @@ -2.15.1 +2.15.3 -- cgit