Skip to content

Commit c5d1012

Browse files
remicolletremicollet
committed
update to 1.7.1
 open https://jira.mongodb.org/browse/MONGOCRYPT-532 32-bit not supported fix i686 build using patch from mongodb/libmongocrypt#561 update to 1.7.0 drop patch merged upstream open https://jira.mongodb.org/browse/MONGOCRYPT-521 broken LTO build add upstream patch for LTO open https://jira.mongodb.org/browse/MONGOCRYPT-522 using shared libbson adapt our patch for shared libbson open https://jira.mongodb.org/browse/MONGOCRYPT-523 offline build add upstream patch to use bundled IntelRDFPMathLib20U2 open https://jira.mongodb.org/browse/MONGOCRYPT-524 32-bit not supported
1 parent ed5a62e commit c5d1012

6 files changed

+75
-33
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
/1.6.0.tar.gz
1717
/1.6.1.tar.gz
1818
/1.6.2.tar.gz
19+
/1.7.0.tar.gz
20+
/IntelRDFPMathLib20U2.tar.xz
21+
/1.7.1.tar.gz

‎libmongocrypt-gcc13.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎libmongocrypt-i686.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From e520f2b12c2750bca142dd118f58c932520e1891 Mon Sep 17 00:00:00 2001
2+
From: Remi Collet <[email protected]>
3+
Date: Mon, 6 Feb 2023 16:49:51 +0100
4+
Subject: [PATCH] MONGOCRYPT-532 Fix i686 (32-bit) build
5+
6+
---
7+
cmake/IntelDFP.cmake | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/cmake/IntelDFP.cmake b/cmake/IntelDFP.cmake
11+
index fb7714862..fe6e749c7 100644
12+
--- a/cmake/IntelDFP.cmake
13+
+++ b/cmake/IntelDFP.cmake
14+
@@ -332,7 +332,7 @@ set_property (TARGET intel_dfp_obj PROPERTY POSITION_INDEPENDENT_CODE TRUE)
15+
16+
# DFP needs information about the build target platform. Compute that:
17+
set (proc_lower $<LOWER_CASE:${CMAKE_SYSTEM_PROCESSOR}>)
18+
-set (ia32_list i386 emscripted x86 arm)
19+
+set (ia32_list i386 i486 i586 i686 pentium3 pentium4 athlon geode emscripted x86 arm)
20+
set (efi2_list aarch64 arm64 x86_64 ppc64le riscv64)
21+
22+
set (is_linux $<PLATFORM_ID:Linux>)

‎libmongocrypt-static.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,14 @@ diff -up libmongocrypt-1.5.1/cmake/mongocrypt-config.cmake.old libmongocrypt-1.5
6060
# embed the libbson symbols.)
6161
set (_using_shared_libbson "@USE_SHARED_LIBBSON@")
6262

63+
--- libmongocrypt-1.7.0/cmake/ImportBSON.cmake.old 2023-01-27 09:44:33.602270081 +0100
64+
+++ libmongocrypt-1.7.0/cmake/ImportBSON.cmake 2023-01-27 09:44:40.931242458 +0100
65+
@@ -119,7 +119,7 @@
66+
INTERFACE_INCLUDE_DIRECTORIES "${_MONGOCRYPT_SYSTEM_LIBBSON_INCLUDE_DIR}"
67+
)
68+
set_property (TARGET bson_shared PROPERTY IMPORTED_LOCATION "${_MONGOCRYPT_SYSTEM_LIBBSON_SHARED}")
69+
- set_property (TARGET bson_static PROPERTY IMPORTED_LOCATION "${_MONGOCRYPT_SYSTEM_LIBBSON_STATIC}")
70+
+ set_property (TARGET bson_static PROPERTY IMPORTED_LOCATION "${_MONGOCRYPT_SYSTEM_LIBBSON_SHARED}")
71+
set_property (
72+
CACHE _MONGOCRYPT_SYSTEM_LIBBSON_SHARED
73+
_MONGOCRYPT_SYSTEM_LIBBSON_INCLUDE_DIR

‎libmongocrypt.spec

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# remirepo/fedora spec file for libmongocrypt
22
#
3-
# Copyright (c) 2020-2022 Remi Collet
4-
# License: CC-BY-SA
3+
# Copyright (c) 2020-2023 Remi Collet
4+
# License: CC-BY-SA-4.0
55
# http://creativecommons.org/licenses/by-sa/4.0/
66
#
77
# Please, preserve the changelog entries
@@ -14,23 +14,24 @@
1414

1515
Name: %{libname}
1616
Summary: The companion C library for client side encryption in drivers
17-
Version: 1.6.2
18-
Release: 2%{?dist}
17+
Version: 1.7.1
18+
Release: 1%{?dist}
1919

2020
# see kms-message/THIRD_PARTY_NOTICES
2121
# kms-message/src/kms_b64.c is ISC
22+
# IntelRDFPMathLib is BSD-3-Clause
2223
# everything else is ASL 2.0
23-
License: ASL 2.0 and ISC
24+
License: Apache-2.0 AND ISC AND BSD-3-Clause
2425
URL: https://github.com/%{gh_owner}/%{gh_project}
2526

2627
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{version}.tar.gz
2728

2829
# drop all reference to static libraries
2930
Patch0: %{libname}-static.patch
30-
# For GCC 13
31-
Patch1: %{libname}-gcc13.patch
31+
# fix i686 build
32+
Patch1: %{libname}-i686.patch
3233

33-
BuildRequires: cmake >= 3.5
34+
BuildRequires: cmake >= 3.12
3435
BuildRequires: gcc
3536
BuildRequires: gcc-c++
3637
# pkg-config may pull compat-openssl10
@@ -39,6 +40,9 @@ BuildRequires: cmake(bson-1.0) >= 1.11
3940
# for documentation
4041
BuildRequires: doxygen
4142
BuildRequires: make
43+
# for IntelRDFPMathLib
44+
BuildRequires: git
45+
Provides: bundled(IntelRDFPMathLib) = 2.2
4246

4347

4448
%description
@@ -58,11 +62,17 @@ for %{name}.
5862

5963
%prep
6064
%autosetup -n %{gh_project}-%{version}%{?prever:-dev} -p1
61-
echo "%{version}" >VERSION_CURRENT
65+
66+
# Gather license files
67+
tar xf third-party/IntelRDFPMathLib*.tar.xz --strip-components=1 */eula.txt
68+
mv eula.txt LICENSE.intelrdfpmathlib
69+
cp kms-message/THIRD_PARTY_NOTICES LICENSE.kms_b64
70+
cp kms-message/COPYING LICENSE.kms-message
6271

6372

6473
%build
6574
%cmake \
75+
-DBUILD_VERSION=%{version} \
6676
-DENABLE_PIC:BOOL=ON \
6777
-DUSE_SHARED_LIBBSON:BOOL=ON \
6878
-DMONGOCRYPT_MONGOC_DIR:STRING=USE-SYSTEM \
@@ -88,7 +98,7 @@ fi
8898

8999

90100
%files
91-
%license LICENSE
101+
%license LICENSE*
92102
%{_libdir}/libkms_message.so.%{soname}*
93103
%{_libdir}/libmongocrypt.so.%{soname}*
94104

@@ -106,7 +116,24 @@ fi
106116

107117

108118
%changelog
109-
* Wed Dec 7 2022 Remi Collet <[email protected]> - 1.6.2-2
119+
* Mon Feb 6 2023 Remi Collet <[email protected]> - 1.7.0-1
120+
- update to 1.7.1
121+
- open https://jira.mongodb.org/browse/MONGOCRYPT-532 32-bit not supported
122+
- fix i686 build using patch from
123+
https://github.com/mongodb/libmongocrypt/pull/561
124+
125+
* Tue Jan 24 2023 Remi Collet <[email protected]> - 1.7.0-1
126+
- update to 1.7.0
127+
- drop patch merged upstream
128+
- open https://jira.mongodb.org/browse/MONGOCRYPT-521 broken LTO build
129+
- add upstream patch for LTO
130+
- open https://jira.mongodb.org/browse/MONGOCRYPT-522 using shared libbson
131+
- adapt our patch for shared libbson
132+
- open https://jira.mongodb.org/browse/MONGOCRYPT-523 offline build
133+
- add upstream patch to use bundled IntelRDFPMathLib20U2
134+
- open https://jira.mongodb.org/browse/MONGOCRYPT-524 32-bit not supported
135+
136+
* Fri Jan 20 2023 Remi Collet <[email protected]> - 1.6.2-2
110137
- add patch for GCC 13 from
111138
https://github.com/mongodb/libmongocrypt/pull/535
112139

‎sources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SHA512 (1.6.2.tar.gz) = 4317904e183c381c89be5487599d21ed9304f698cff04e42b769e521b1a453f0457ae8f4407306811a142d6b6790f205aee4ab1f84c4066040cce8f2fdd92087
1+
SHA512 (1.7.1.tar.gz) = 11240f75b155f620ef694c8434521d7a206b9c450f2de72a6f50c2ce474aa2595ec4fbc8376dfbb5429cd0b36f7ad1dcc499fd5b27331d811ac1c0cb632f579f

0 commit comments

Comments
 (0)