Re: [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp

[Alexander Turenko via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

On Fri, Mar 19, 2021 at 04:45:53PM +0300, Roman Khabibov wrote:
> The patchset is only for 2.8.
> 
> Issue: https://github.com/tarantool/smtp/issues/24
> Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/curl-smtp
> 
> Roman Khabibov (2):
>   build: enable smtp
>   build: install libCURL headers

Rebased on actual master and 1.10 and verified in CI for regressions.

Pushed to master, 2.7, 2.6, 1.10.

WBR, Alexander Turenko.

----

My fixups:

1. Markdown formatting.

diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md
index 86363adb3..003c7566e 100755
--- a/changelogs/unreleased/install-headers.md
+++ b/changelogs/unreleased/install-headers.md
@@ -1,4 +1,4 @@
 ## feature/build

 * Ship libcurl headers to system path "include/tarantool" in the
-case of libcurl included as bundled library or static build (gh-4559).
+  case of libcurl included as bundled library or static build (gh-4559).

2. Clafiried the include directory path in the changelog entry.

diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md
index 003c7566e..957574c05 100755
--- a/changelogs/unreleased/install-headers.md
+++ b/changelogs/unreleased/install-headers.md
@@ -1,4 +1,4 @@
 ## feature/build

-* Ship libcurl headers to system path "include/tarantool" in the
+* Ship libcurl headers to system path "${PREFIX}/include/tarantool" in the
   case of libcurl included as bundled library or static build (gh-4559).

----

On 1.10:

3. Linked the relevant issues in the changelog entry.

diff --git a/changelogs/unreleased/export-curl-symbols.md b/changelogs/unreleased/export-curl-symbols.md
index 3a8213b1c..ac07ccab9 100644
--- a/changelogs/unreleased/export-curl-symbols.md
+++ b/changelogs/unreleased/export-curl-symbols.md
@@ -1,3 +1,4 @@
 ## feature/build

-* libcurl symbols in the case of bundled libcurl are now exported (gh-####).
+* libcurl symbols in the case of bundled libcurl are now exported (gh-5223,
+  gh-5542).

4. The similar change for the commit message.

-This patch is just 1.10 adaptation of two original commits 29ec628
-47c19ee.
+This patch is just 1.10 adaptation of two original commits:
+
+* 29ec628918bd7279de08e47becc070420775c2eb ('Ensure all curl symbols are
+  exported')
+* 47c19eeb4f67cb7257ce32542443c09410b6e752 ('build: don't re-export
+  libcurl.so/dylib symbols')
+
+Fixes #5223
+Fixes #5542

4. Removed a period from the URL.

-See related issue: https://github.com/tarantool/smtp/issues/24.
+See related issue: https://github.com/tarantool/smtp/issues/24

5. Added the comment from master's patch.

diff --git a/test/box-tap/curl-build.test.lua b/test/box-tap/curl-build.test.lua
index 640d5d143..ae0d397b5 100755
--- a/test/box-tap/curl-build.test.lua
+++ b/test/box-tap/curl-build.test.lua
@@ -78,6 +78,9 @@ else
     RTLD_DEFAULT = ffi.cast("void *", 0LL)
 end

+--
+-- gh-5223: Check if all curl symbols are exported.
+--
 -- The following list was obtained by parsing libcurl.a static library:
 -- nm libcurl.a | grep -oP 'T \K(curl_.+)$' | sort
 local curl_symbols = {

6. Adjusted a comment to master's wording.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26807c678..80337ffa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,7 +358,7 @@ if (ENABLE_BUNDLED_LIBCURL)
 endif()

 #
-# Export libcurl symbols if the library is bundled.
+# Export libcurl symbols if the library is linked statically.
 #
 if (ENABLE_BUNDLED_LIBCURL)
     set(EXPORT_LIBCURL_SYMBOLS ON)

7. Mentioned actual commit hashes in backports.

+(backported from commit 4bde1dbc0fddbff04889f4a483dd97083435dd3a)
+(backported from commit 38d0b0c1f62886f40db1279da64f2fac75473119)