From 89ceb6d0b10fb9fae59a7dffe34d7d606c0feb0a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Feb 2020 08:24:15 +0100 Subject: update to 1.0.2 drop patches merged upstream install missing header using patch from https://github.com/mongodb/libmongocrypt/pull/90 --- ...llation-layout-e.g.-honors-GNUInstallDirs.patch | 99 ---- 0001-install-kms_caller_identity_request.h.patch | 24 + ...dd-option-to-NOT-install-static-libraries.patch | 76 ---- .../1.0.1_to_1.0.2/compat_report.html | 493 ++++++++++++++++++++ .../1.0.1_to_1.0.2/compat_report.html | 504 +++++++++++++++++++++ libkms_message.xml | 62 +++ libmongocrypt.spec | 18 +- libmongocrypt.xml | 62 +++ 8 files changed, 1156 insertions(+), 182 deletions(-) delete mode 100644 0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch create mode 100644 0001-install-kms_caller_identity_request.h.patch delete mode 100644 0002-add-option-to-NOT-install-static-libraries.patch create mode 100644 compat_reports/libkms_message/1.0.1_to_1.0.2/compat_report.html create mode 100644 compat_reports/libmongocrypt/1.0.1_to_1.0.2/compat_report.html create mode 100644 libkms_message.xml create mode 100644 libmongocrypt.xml diff --git a/0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch b/0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch deleted file mode 100644 index e56c926..0000000 --- a/0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch +++ /dev/null @@ -1,99 +0,0 @@ -From ef75913b08e709329df1f325ac05033efbbe3d3c Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 17 Jan 2020 09:49:38 +0100 -Subject: [PATCH 1/2] fix installation layout, e.g. honors GNUInstallDirs - ---- - CMakeLists.txt | 4 ++-- - kms-message/CMakeLists.txt | 20 ++++++++++---------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bef1a7..010c292 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ configure_file (cmake/mongocrypt-config.cmake - install (EXPORT mongocrypt_targets - NAMESPACE mongo:: - FILE mongocrypt_targets.cmake -- DESTINATION lib/cmake/mongocrypt -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mongocrypt - ) - - install ( -@@ -359,7 +359,7 @@ install ( - cmake/mongocrypt-config.cmake - "${CMAKE_CURRENT_BINARY_DIR}/mongocrypt/mongocrypt-config-version.cmake" - DESTINATION -- lib/cmake/mongocrypt -+ ${CMAKE_INSTALL_LIBDIR}/cmake/mongocrypt - COMPONENT - Devel - ) -diff --git a/kms-message/CMakeLists.txt b/kms-message/CMakeLists.txt -index fcfb07d..bfc1bd0 100644 ---- a/kms-message/CMakeLists.txt -+++ b/kms-message/CMakeLists.txt -@@ -124,10 +124,10 @@ set_property (TARGET kms_message_static APPEND PROPERTY - include (CMakePackageConfigHelpers) - install (TARGETS kms_message kms_message_static - EXPORT kms_message_targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- RUNTIME DESTINATION bin -- INCLUDES DESTINATION include -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - - install ( -@@ -141,7 +141,7 @@ install ( - src/kms_message/kms_request_opt.h - src/kms_message/kms_response.h - src/kms_message/kms_response_parser.h -- DESTINATION include/kms_message -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/kms_message - COMPONENT Devel - ) - -@@ -162,7 +162,7 @@ configure_file (cmake/kms_message-config.cmake - COPYONLY - ) - --set (ConfigPackageLocation lib/cmake/kms_message) -+set (ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/kms_message) - install (EXPORT kms_message_targets - NAMESPACE mongo:: - FILE kms_message_targets.cmake -@@ -178,8 +178,8 @@ install ( - ) - - # pkg-config. --set (PKG_CONFIG_LIBDIR "\${prefix}/lib") --set (PKG_CONFIG_INCLUDEDIR "\${prefix}/include") -+set (PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") -+set (PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - set (PKG_CONFIG_LIBS "-L\${libdir} -lkms_message") - set (PKG_CONFIG_CFLAGS "-I\${includedir}") - configure_file ( -@@ -189,7 +189,7 @@ configure_file ( - - install ( - FILES "${CMAKE_CURRENT_BINARY_DIR}/libkms_message.pc" -- DESTINATION lib/pkgconfig -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) - - # cannot run tests without crypto -@@ -211,4 +211,4 @@ if (NOT DISABLE_NATIVE_CRYPTO) - target_link_libraries(test_kms_request "${OPENSSL_LIBRARIES}") - target_include_directories(test_kms_request PRIVATE "${OPENSSL_INCLUDE_DIR}") - endif() --endif () -\ No newline at end of file -+endif () --- -2.24.1 - diff --git a/0001-install-kms_caller_identity_request.h.patch b/0001-install-kms_caller_identity_request.h.patch new file mode 100644 index 0000000..3940032 --- /dev/null +++ b/0001-install-kms_caller_identity_request.h.patch @@ -0,0 +1,24 @@ +From 8c17e8cb46b9cfb92b12b7ccef88c7792123eb96 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 12 Feb 2020 08:09:10 +0100 +Subject: [PATCH] install kms_caller_identity_request.h + +--- + kms-message/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kms-message/CMakeLists.txt b/kms-message/CMakeLists.txt +index fae39bd..45c2060 100644 +--- a/kms-message/CMakeLists.txt ++++ b/kms-message/CMakeLists.txt +@@ -139,6 +139,7 @@ install ( + install ( + FILES + src/kms_message/kms_b64.h ++ src/kms_message/kms_caller_identity_request.h + src/kms_message/kms_decrypt_request.h + src/kms_message/kms_encrypt_request.h + src/kms_message/kms_message.h +-- +2.24.1 + diff --git a/0002-add-option-to-NOT-install-static-libraries.patch b/0002-add-option-to-NOT-install-static-libraries.patch deleted file mode 100644 index e2bd02a..0000000 --- a/0002-add-option-to-NOT-install-static-libraries.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 777fb32be7eb6082dbed88becd2e1ee573247e40 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 17 Jan 2020 11:09:21 +0100 -Subject: [PATCH 2/2] add option to NOT install static libraries - ---- - CMakeLists.txt | 19 ++++++++++++++----- - kms-message/CMakeLists.txt | 8 +++++++- - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 010c292..f97c18c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,7 @@ endif() - set (CMAKE_C_STANDARD 99) - - option (ENABLE_SHARED_BSON "Dynamically link libbson (default is static)" OFF) -+option (ENABLE_STATIC "Install static libraries" ON) - - set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) - -@@ -262,7 +263,13 @@ if (NOT MONGOCRYPT_CRYPTO STREQUAL none) - target_include_directories (example-state-machine-static PRIVATE ./src) - endif () - --install (TARGETS mongocrypt mongocrypt_static -+if (ENABLE_STATIC) -+ set (TARGETS_TO_INSTALL mongocrypt mongocrypt_static) -+else () -+ set (TARGETS_TO_INSTALL mongocrypt) -+endif () -+install ( -+ TARGETS ${TARGETS_TO_INSTALL} - EXPORT mongocrypt_targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -324,10 +331,12 @@ install ( - FILES "${CMAKE_BINARY_DIR}/libmongocrypt.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) --install ( -- FILES "${CMAKE_BINARY_DIR}/libmongocrypt-static.pc" -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig --) -+if (ENABLE_STATIC) -+ install ( -+ FILES "${CMAKE_BINARY_DIR}/libmongocrypt-static.pc" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig -+ ) -+endif () - - include (CMakePackageConfigHelpers) - set (INCLUDE_INSTALL_DIRS "${CMAKE_INSTALL_INCLUDEDIR}/mongocrypt") -diff --git a/kms-message/CMakeLists.txt b/kms-message/CMakeLists.txt -index bfc1bd0..fae39bd 100644 ---- a/kms-message/CMakeLists.txt -+++ b/kms-message/CMakeLists.txt -@@ -122,7 +122,13 @@ set_property (TARGET kms_message_static APPEND PROPERTY - ) - - include (CMakePackageConfigHelpers) --install (TARGETS kms_message kms_message_static -+if (ENABLE_STATIC) -+ set (TARGETS_TO_INSTALL kms_message kms_message_static) -+else () -+ set (TARGETS_TO_INSTALL kms_message) -+endif () -+install ( -+ TARGETS ${TARGETS_TO_INSTALL} - EXPORT kms_message_targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} --- -2.24.1 - diff --git a/compat_reports/libkms_message/1.0.1_to_1.0.2/compat_report.html b/compat_reports/libkms_message/1.0.1_to_1.0.2/compat_report.html new file mode 100644 index 0000000..4c2285f --- /dev/null +++ b/compat_reports/libkms_message/1.0.1_to_1.0.2/compat_report.html @@ -0,0 +1,493 @@ + + + + + + + + + + +libkms_message: 1.0.1 to 1.0.2 compatibility report + + + +

API compatibility report for the libkms_message library between 1.0.1 and 1.0.2 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibkms_message
Version #11.0.1
Version #21.0.2
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files10
Total Libraries1
Total Symbols / Types39 / 22
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  10 

+
+kms_b64.h
+kms_caller_identity_request.h
+kms_decrypt_request.h
+kms_encrypt_request.h
+kms_message.h
+kms_message_defines.h
+kms_request.h
+kms_request_opt.h
+kms_response.h
+kms_response_parser.h
+
+
to the top
+

Libraries  1 

+
+libkms_message.so.0.0.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibkms_message
Version #11.0.1
Version #21.0.2
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files10
Total Libraries1
Total Symbols / Types39 / 22
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  10 

+
+kms_b64.h
+kms_caller_identity_request.h
+kms_decrypt_request.h
+kms_encrypt_request.h
+kms_message.h
+kms_message_defines.h
+kms_request.h
+kms_request_opt.h
+kms_response.h
+kms_response_parser.h
+
+
to the top
+

Libraries  1 

+
+libkms_message.so.0.0.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/compat_reports/libmongocrypt/1.0.1_to_1.0.2/compat_report.html b/compat_reports/libmongocrypt/1.0.1_to_1.0.2/compat_report.html new file mode 100644 index 0000000..c48eac3 --- /dev/null +++ b/compat_reports/libmongocrypt/1.0.1_to_1.0.2/compat_report.html @@ -0,0 +1,504 @@ + + + + + + + + + +libmongocrypt: 1.0.1 to 1.0.2 compatibility report + + + +

API compatibility report for the libmongocrypt library between 1.0.1 and 1.0.2 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibmongocrypt
Version #11.0.1
Version #21.0.2
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files4
Total Libraries1
Total Symbols / Types48 / 32
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  4 

+
+mongocrypt-compat.h
+mongocrypt-config.h
+mongocrypt-export.h
+mongocrypt.h
+
+
to the top
+

Libraries  1 

+
+libmongocrypt.so.0.0.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibmongocrypt
Version #11.0.1
Version #21.0.2
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files4
Total Libraries1
Total Symbols / Types48 / 32
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		Low1
+ + +

Problems with Constants, Low Severity  1 

+mongocrypt.h
+ +[+] MONGOCRYPT_VERSION +
+ + +
+to the top
+

Header Files  4 

+
+mongocrypt-compat.h
+mongocrypt-config.h
+mongocrypt-export.h
+mongocrypt.h
+
+
to the top
+

Libraries  1 

+
+libmongocrypt.so.0.0.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libkms_message.xml b/libkms_message.xml new file mode 100644 index 0000000..932cc8a --- /dev/null +++ b/libkms_message.xml @@ -0,0 +1,62 @@ + + + + + + + + + +1.0.2 + + + + +/usr/include/kms_message + + + + +/usr/lib64/libkms_message.so + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libmongocrypt.spec b/libmongocrypt.spec index c6729aa..cf585d7 100644 --- a/libmongocrypt.spec +++ b/libmongocrypt.spec @@ -14,8 +14,8 @@ Name: %{libname} Summary: The companion C library for client side encryption in drivers -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} # see kms-message/THIRD_PARTY_NOTICES # kms-message/src/kms_b64.c is ISC @@ -25,17 +25,15 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{version}.tar.gz -# Fix install layout, PR #87 -Patch0: 0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch -Patch1: 0002-add-option-to-NOT-install-static-libraries.patch +# install missing header +Patch0: 0001-install-kms_caller_identity_request.h.patch BuildRequires: cmake >= 3.5 BuildRequires: gcc BuildRequires: gcc-c++ # pkg-config may pull compat-openssl10 BuildRequires: openssl-devel -# should be libson-1.0 only available in 1.16 -BuildRequires: cmake(libbson-1.0) >= 1.11 +BuildRequires: cmake(bson-1.0) >= 1.11 # for documentation BuildRequires: doxygen @@ -99,6 +97,12 @@ make test %changelog +* Wed Feb 12 2020 Remi Collet - 1.0.2-1 +- update to 1.0.2 +- drop patches merged upstream +- install missing header using patch from + https://github.com/mongodb/libmongocrypt/pull/90 + * Sat Jan 18 2020 Remi Collet - 1.0.1-2 - modernize spec from review #1792224 - add generated html documentation diff --git a/libmongocrypt.xml b/libmongocrypt.xml new file mode 100644 index 0000000..8247c4e --- /dev/null +++ b/libmongocrypt.xml @@ -0,0 +1,62 @@ + + + + + + + + + +1.0.2 + + + + +/usr/include/mongocrypt + + + + +/usr/lib64/libmongocrypt.so + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit