diff options
-rw-r--r-- | 0001-fix-installation-layout-e.g.-honors-GNUInstallDirs.patch | 99 | ||||
-rw-r--r-- | 0001-install-kms_caller_identity_request.h.patch | 24 | ||||
-rw-r--r-- | 0002-add-option-to-NOT-install-static-libraries.patch | 76 | ||||
-rw-r--r-- | compat_reports/libkms_message/1.0.1_to_1.0.2/compat_report.html | 493 | ||||
-rw-r--r-- | compat_reports/libmongocrypt/1.0.1_to_1.0.2/compat_report.html | 504 | ||||
-rw-r--r-- | libkms_message.xml | 62 | ||||
-rw-r--r-- | libmongocrypt.spec | 18 | ||||
-rw-r--r-- | libmongocrypt.xml | 62 |
8 files changed, 1156 insertions, 182 deletions
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 <remi@remirepo.net> -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 <remi@remirepo.net> +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 <remi@remirepo.net> -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 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 --> +<!-- kind:source;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="viewport" content="width=device-width,initial-scale=1" /> +<meta name="keywords" content="libkms_message, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libkms_message library between 1.0.1 and 1.0.2 versions" /> +<meta name="robots" content="noindex" /> +<title>libkms_message: 1.0.1 to 1.0.2 compatibility report</title> +<style type="text/css"> +body { + font-family:Arial, sans-serif; + background-color:White; + color:Black; +} +hr { + color:Black; + background-color:Black; + height:1px; + border:0; +} +h1 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.625em; +} +h2 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.25em; + white-space:nowrap; +} +span.section { + font-weight:bold; + cursor:pointer; + color:#003E69; + white-space:nowrap; + margin-left:0.3125em; +} +span.new_sign { + font-weight:bold; + margin-left:1.65em; + color:#003E69; +} +span.new_sign_lbl { + margin-left:3em; + font-size:1em; + color:Black; +} +span:hover.section { + color:#336699; +} +span.sect_aff { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:#cc3300; +} +span.sect_info { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:Black; +} +span.ext { + font-weight:normal; +} +span.h_name { + color:#cc3300; + font-size:0.875em; + font-weight:bold; +} +div.h_list, div.lib_list { + font-size:0.94em; + padding-left:0.4em; +} +span.ns { + color:#408080; + font-size:0.94em; +} +span.lib_name { + color:Green; + font-size:0.875em; + font-weight:bold; +} +span.iname { + font-weight:bold; + color:#003E69; + margin-left:0.3125em; +} +span.iname_b { + font-weight:bold; +} +span.iname_a { + color:#333333; + font-weight:bold; + font-size:0.94em; +} +span.sym_p { + font-weight:normal; + white-space:normal; +} +span.sym_pd { + white-space:normal; +} +span.sym_p span, span.sym_pd span { + white-space:nowrap; +} +div.affect { + padding-left:1em; + padding-bottom:10px; + font-size:0.87em; + font-style:italic; + line-height:0.9em; +} +div.affected { + padding-left:1.9em; + padding-top:10px; +} +table.ptable { + border-collapse:collapse; + border:1px outset black; + margin-left:0.95em; + margin-top:3px; + margin-bottom:3px; + width:56.25em; +} +table.ptable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + text-align:left; + vertical-align:top; + max-width:28em; + word-wrap:break-word; +} +table.ptable th.pn { + width:2%; +} +table.ptable th.chg { + width:47%; +} +table.vtable { + border-collapse:collapse; + border:1px outset black; + margin-left:1.9em; + margin-top:0.7em; +} +table.vtable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + vertical-align:top; + max-width:450px; + word-wrap:break-word; +} +table.ptable th, table.vtable th { + background-color:#eeeeee; + font-weight:bold; + color:#333333; + font-family:Verdana, Arial; + font-size:0.875em; + border:1px solid gray; + text-align:center; + vertical-align:top; + white-space:nowrap; + padding:3px; +} +table.summary { + border-collapse:collapse; + border:1px outset black; +} +table.summary th { + background-color:#eeeeee; + font-weight:normal; + text-align:left; + font-size:0.94em; + white-space:nowrap; + border:1px inset gray; + padding:3px; +} +table.summary td { + text-align:right; + white-space:nowrap; + border:1px inset gray; + padding:3px 5px 3px 10px; +} +span.mngl { + padding-left:1em; + font-size:0.875em; + cursor:text; + color:#444444; + font-weight:bold; +} +span.pleft { + padding-left:2.5em; +} +span.sym_ver { + color:#333333; + white-space:nowrap; + font-family:"DejaVu Sans Mono", Monospace; +} +span.attr { + color:#333333; + font-weight:normal; +} +span.color_p { + font-style:italic; + color:Brown; +} +span.p { + font-style:italic; +} +span.fp { + font-style:italic; + background-color:#DCDCDC; +} +span.ttype { + font-weight:normal; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:normal; +} +.warning { + background-color:#F4F4AF; + font-weight:normal; +} +.failed { + background-color:#FFCCCC; + font-weight:normal; +} +.new { + background-color:#C6DEFF; + font-weight:normal; +} +.compatible { + background-color:#CCFFCC; + font-weight:normal; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:normal; +} +.incompatible { + background-color:#FFCCCC; + font-weight:normal; +} +.gray { + background-color:#DCDCDC; + font-weight:normal; +} +.top_ref { + font-size:0.69em; +} +.footer { + font-size:0.75em; +} + +.tabset { + float:left; +} +a.tab { + border:1px solid Black; + float:left; + margin:0px 5px -1px 0px; + padding:3px 5px 3px 5px; + position:relative; + font-size:0.875em; + background-color:#DDD; + text-decoration:none; + color:Black; +} +a.disabled:hover +{ + color:Black; + background:#EEE; +} +a.active:hover +{ + color:Black; + background:White; +} +a.active { + border-bottom-color:White; + background-color:White; +} +div.tab { + border-top:1px solid Black; + padding:0px; + width:100%; + clear:both; +} +</style> +<script type="text/javascript" language="JavaScript"> +<!-- +function showContent(header, id) +{ + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = 'block'; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[−]"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]"); + } +} +function initTabs() +{ + var url = window.location.href; + if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1) + { + var tab1 = document.getElementById('BinaryID'); + var tab2 = document.getElementById('SourceID'); + tab1.className='tab disabled'; + tab2.className='tab active'; + } + var sets = document.getElementsByTagName('div'); + for (var i = 0; i < sets.length; i++) + { + if (sets[i].className.indexOf('tabset') != -1) + { + var tabs = []; + var links = sets[i].getElementsByTagName('a'); + for (var j = 0; j < links.length; j++) + { + if (links[j].className.indexOf('tab') != -1) + { + tabs.push(links[j]); + links[j].tabs = tabs; + var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1)); + //reset all tabs on start + if (tab) + { + if (links[j].className.indexOf('active')!=-1) { + tab.style.display = 'block'; + } + else { + tab.style.display = 'none'; + } + } + links[j].onclick = function() + { + var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1)); + if (tab) + { + //reset all tabs before change + for (var k = 0; k < this.tabs.length; k++) + { + document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none'; + this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled'); + } + this.className = 'tab active'; + tab.style.display = 'block'; + // window.location.hash = this.id.replace('ID', ''); + return false; + } + } + } + } + } + } + if(url.indexOf('#')!=-1) { + location.href=location.href; + } +} +if (window.addEventListener) window.addEventListener('load', initTabs, false); +else if (window.attachEvent) window.attachEvent('onload', initTabs); +--> +</script> +</head> +<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libkms_message</span> library between <span style='color:Red;'>1.0.1</span> and <span style='color:Red;'>1.0.2</span> versions on <span style='color:Blue;'>x86_64</span></h1> + + <br/> + <div class='tabset'> + <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a> + <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a> + </div><div id='BinaryTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libkms_message</td></tr> +<tr><th>Version #1</th><td>1.0.1</td></tr> +<tr><th>Version #2</th><td>1.0.2</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>9</td></tr> +<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>10</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>39 / 22</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 10 </span></h2><hr/> +<div class='h_list'> +kms_b64.h<br/> +kms_caller_identity_request.h<br/> +kms_decrypt_request.h<br/> +kms_encrypt_request.h<br/> +kms_message.h<br/> +kms_message_defines.h<br/> +kms_request.h<br/> +kms_request_opt.h<br/> +kms_response.h<br/> +kms_response_parser.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libkms_message.so.0.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><div id='SourceTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libkms_message</td></tr> +<tr><th>Version #1</th><td>1.0.1</td></tr> +<tr><th>Version #2</th><td>1.0.2</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>10</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>39 / 22</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 10 </span></h2><hr/> +<div class='h_list'> +kms_b64.h<br/> +kms_caller_identity_request.h<br/> +kms_decrypt_request.h<br/> +kms_encrypt_request.h<br/> +kms_message.h<br/> +kms_message_defines.h<br/> +kms_request.h<br/> +kms_request_opt.h<br/> +kms_response.h<br/> +kms_response_parser.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libkms_message.so.0.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><hr/> +<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.3  </i> +</div> +<br/> + +</body></html> 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 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 --> +<!-- kind:source;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:1;tool_version:2.3 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="viewport" content="width=device-width,initial-scale=1" /> +<meta name="keywords" content="libmongocrypt, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libmongocrypt library between 1.0.1 and 1.0.2 versions" /> +<title>libmongocrypt: 1.0.1 to 1.0.2 compatibility report</title> +<style type="text/css"> +body { + font-family:Arial, sans-serif; + background-color:White; + color:Black; +} +hr { + color:Black; + background-color:Black; + height:1px; + border:0; +} +h1 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.625em; +} +h2 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.25em; + white-space:nowrap; +} +span.section { + font-weight:bold; + cursor:pointer; + color:#003E69; + white-space:nowrap; + margin-left:0.3125em; +} +span.new_sign { + font-weight:bold; + margin-left:1.65em; + color:#003E69; +} +span.new_sign_lbl { + margin-left:3em; + font-size:1em; + color:Black; +} +span:hover.section { + color:#336699; +} +span.sect_aff { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:#cc3300; +} +span.sect_info { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:Black; +} +span.ext { + font-weight:normal; +} +span.h_name { + color:#cc3300; + font-size:0.875em; + font-weight:bold; +} +div.h_list, div.lib_list { + font-size:0.94em; + padding-left:0.4em; +} +span.ns { + color:#408080; + font-size:0.94em; +} +span.lib_name { + color:Green; + font-size:0.875em; + font-weight:bold; +} +span.iname { + font-weight:bold; + color:#003E69; + margin-left:0.3125em; +} +span.iname_b { + font-weight:bold; +} +span.iname_a { + color:#333333; + font-weight:bold; + font-size:0.94em; +} +span.sym_p { + font-weight:normal; + white-space:normal; +} +span.sym_pd { + white-space:normal; +} +span.sym_p span, span.sym_pd span { + white-space:nowrap; +} +div.affect { + padding-left:1em; + padding-bottom:10px; + font-size:0.87em; + font-style:italic; + line-height:0.9em; +} +div.affected { + padding-left:1.9em; + padding-top:10px; +} +table.ptable { + border-collapse:collapse; + border:1px outset black; + margin-left:0.95em; + margin-top:3px; + margin-bottom:3px; + width:56.25em; +} +table.ptable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + text-align:left; + vertical-align:top; + max-width:28em; + word-wrap:break-word; +} +table.ptable th.pn { + width:2%; +} +table.ptable th.chg { + width:47%; +} +table.vtable { + border-collapse:collapse; + border:1px outset black; + margin-left:1.9em; + margin-top:0.7em; +} +table.vtable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + vertical-align:top; + max-width:450px; + word-wrap:break-word; +} +table.ptable th, table.vtable th { + background-color:#eeeeee; + font-weight:bold; + color:#333333; + font-family:Verdana, Arial; + font-size:0.875em; + border:1px solid gray; + text-align:center; + vertical-align:top; + white-space:nowrap; + padding:3px; +} +table.summary { + border-collapse:collapse; + border:1px outset black; +} +table.summary th { + background-color:#eeeeee; + font-weight:normal; + text-align:left; + font-size:0.94em; + white-space:nowrap; + border:1px inset gray; + padding:3px; +} +table.summary td { + text-align:right; + white-space:nowrap; + border:1px inset gray; + padding:3px 5px 3px 10px; +} +span.mngl { + padding-left:1em; + font-size:0.875em; + cursor:text; + color:#444444; + font-weight:bold; +} +span.pleft { + padding-left:2.5em; +} +span.sym_ver { + color:#333333; + white-space:nowrap; + font-family:"DejaVu Sans Mono", Monospace; +} +span.attr { + color:#333333; + font-weight:normal; +} +span.color_p { + font-style:italic; + color:Brown; +} +span.p { + font-style:italic; +} +span.fp { + font-style:italic; + background-color:#DCDCDC; +} +span.ttype { + font-weight:normal; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:normal; +} +.warning { + background-color:#F4F4AF; + font-weight:normal; +} +.failed { + background-color:#FFCCCC; + font-weight:normal; +} +.new { + background-color:#C6DEFF; + font-weight:normal; +} +.compatible { + background-color:#CCFFCC; + font-weight:normal; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:normal; +} +.incompatible { + background-color:#FFCCCC; + font-weight:normal; +} +.gray { + background-color:#DCDCDC; + font-weight:normal; +} +.top_ref { + font-size:0.69em; +} +.footer { + font-size:0.75em; +} + +.tabset { + float:left; +} +a.tab { + border:1px solid Black; + float:left; + margin:0px 5px -1px 0px; + padding:3px 5px 3px 5px; + position:relative; + font-size:0.875em; + background-color:#DDD; + text-decoration:none; + color:Black; +} +a.disabled:hover +{ + color:Black; + background:#EEE; +} +a.active:hover +{ + color:Black; + background:White; +} +a.active { + border-bottom-color:White; + background-color:White; +} +div.tab { + border-top:1px solid Black; + padding:0px; + width:100%; + clear:both; +} +</style> +<script type="text/javascript" language="JavaScript"> +<!-- +function showContent(header, id) +{ + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = 'block'; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[−]"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]"); + } +} +function initTabs() +{ + var url = window.location.href; + if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1) + { + var tab1 = document.getElementById('BinaryID'); + var tab2 = document.getElementById('SourceID'); + tab1.className='tab disabled'; + tab2.className='tab active'; + } + var sets = document.getElementsByTagName('div'); + for (var i = 0; i < sets.length; i++) + { + if (sets[i].className.indexOf('tabset') != -1) + { + var tabs = []; + var links = sets[i].getElementsByTagName('a'); + for (var j = 0; j < links.length; j++) + { + if (links[j].className.indexOf('tab') != -1) + { + tabs.push(links[j]); + links[j].tabs = tabs; + var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1)); + //reset all tabs on start + if (tab) + { + if (links[j].className.indexOf('active')!=-1) { + tab.style.display = 'block'; + } + else { + tab.style.display = 'none'; + } + } + links[j].onclick = function() + { + var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1)); + if (tab) + { + //reset all tabs before change + for (var k = 0; k < this.tabs.length; k++) + { + document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none'; + this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled'); + } + this.className = 'tab active'; + tab.style.display = 'block'; + // window.location.hash = this.id.replace('ID', ''); + return false; + } + } + } + } + } + } + if(url.indexOf('#')!=-1) { + location.href=location.href; + } +} +if (window.addEventListener) window.addEventListener('load', initTabs, false); +else if (window.attachEvent) window.attachEvent('onload', initTabs); +--> +</script> +</head> +<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libmongocrypt</span> library between <span style='color:Red;'>1.0.1</span> and <span style='color:Red;'>1.0.2</span> versions on <span style='color:Blue;'>x86_64</span></h1> + + <br/> + <div class='tabset'> + <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a> + <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a> + </div><div id='BinaryTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libmongocrypt</td></tr> +<tr><th>Version #1</th><td>1.0.1</td></tr> +<tr><th>Version #2</th><td>1.0.2</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>9</td></tr> +<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>4</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>48 / 32</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 4 </span></h2><hr/> +<div class='h_list'> +mongocrypt-compat.h<br/> +mongocrypt-config.h<br/> +mongocrypt-export.h<br/> +mongocrypt.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libmongocrypt.so.0.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><div id='SourceTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libmongocrypt</td></tr> +<tr><th>Version #1</th><td>1.0.1</td></tr> +<tr><th>Version #2</th><td>1.0.2</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>4</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>48 / 32</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td class='warning'><a href='#Constant_Source_Problems_Low' style='color:Blue;'>1</a></td></tr> +</table> + +<a name='Low_Risk_Source_Problems'></a><a name='Constant_Source_Problems_Low'></a> +<h2>Problems with Constants, Low Severity <span class='warning'> 1 </span></h2><hr/> +<span class='h_name'>mongocrypt.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_1')"> +<span class='ext'>[+]</span> MONGOCRYPT_VERSION</span> +<br/> +<div id="c_1" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The value of constant <b>MONGOCRYPT_VERSION</b> has been changed from <b>"1.0.1"</b> to <b>"1.0.2"</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Headers'></a><h2>Header Files <span class='gray'> 4 </span></h2><hr/> +<div class='h_list'> +mongocrypt-compat.h<br/> +mongocrypt-config.h<br/> +mongocrypt-export.h<br/> +mongocrypt.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libmongocrypt.so.0.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><hr/> +<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.3  </i> +</div> +<br/> + +</body></html> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<descriptor> + +<!-- Template for the Library Descriptor --> + +<!-- + Necessary Sections + --> + +<version> + <!-- Version of the library --> +1.0.2 +</version> + +<headers> + <!-- The list of paths to header files and/or + directories with header files, one per line --> +/usr/include/kms_message +</headers> + +<libs> + <!-- The list of paths to shared objects and/or + directories with shared objects, one per line --> +/usr/lib64/libkms_message.so +</libs> + +<!-- + Additional Sections + --> + +<include_paths> + <!-- The list of paths to be searched for header files + needed for compiling of library headers, one per line --> +</include_paths> + +<gcc_options> + <!-- Additional gcc options, one per line --> +</gcc_options> + +<include_preamble> + <!-- The list of header files that should be included before other headers, one per line. + For example, it is a tree.h for libxml2 and ft2build.h for freetype2 --> +</include_preamble> + +<opaque_types> + <!-- The list of opaque types, one per line --> +</opaque_types> + +<skip_interfaces> + <!-- The list of functions (mangled/symbol names in C++) + that should be skipped while testing, one per line --> +</skip_interfaces> + +<skip_constants> + <!-- The list of constants that should not be checked, one name per line --> +</skip_constants> + +<skip_headers> + <!-- The list of headers that should not be processed, one name per line --> +</skip_headers> + +</descriptor> 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 <remi@remirepo.net> - 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 <remi@remirepo.net> - 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<descriptor> + +<!-- Template for the Library Descriptor --> + +<!-- + Necessary Sections + --> + +<version> + <!-- Version of the library --> +1.0.2 +</version> + +<headers> + <!-- The list of paths to header files and/or + directories with header files, one per line --> +/usr/include/mongocrypt +</headers> + +<libs> + <!-- The list of paths to shared objects and/or + directories with shared objects, one per line --> +/usr/lib64/libmongocrypt.so +</libs> + +<!-- + Additional Sections + --> + +<include_paths> + <!-- The list of paths to be searched for header files + needed for compiling of library headers, one per line --> +</include_paths> + +<gcc_options> + <!-- Additional gcc options, one per line --> +</gcc_options> + +<include_preamble> + <!-- The list of header files that should be included before other headers, one per line. + For example, it is a tree.h for libxml2 and ft2build.h for freetype2 --> +</include_preamble> + +<opaque_types> + <!-- The list of opaque types, one per line --> +</opaque_types> + +<skip_interfaces> + <!-- The list of functions (mangled/symbol names in C++) + that should be skipped while testing, one per line --> +</skip_interfaces> + +<skip_constants> + <!-- The list of constants that should not be checked, one name per line --> +</skip_constants> + +<skip_headers> + <!-- The list of headers that should not be processed, one name per line --> +</skip_headers> + +</descriptor> |