[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp xmlsecurity/CppunitTest_xmlsecurity_signing.mk

[Michael Stahl]

 external/gpgmepp/UnpackedTarball_gpgmepp.mk    |    2 +-
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit db48a3ec98a1cf2bccd157c2db06eb6146011c45
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 20 17:48:46 2018 +0100

    gpgmepp,xmlsecurity: fix testODFEncryptedGPG() failure caused...
    
    ...by CppunitTest setting LD_LIBRARY_PATH to include instdir/program.
    
    This causes the spawned gpg-agent to load instdir/program/libassuan.so.0
    instead of /usr/... and fail with:
    
    writev(2, [{iov_base="gpg-agent", iov_len=9}, {iov_base=": ",
     iov_len=2}, {iov_base="relocation error", iov_len=16}, {iov_base=": ",
     iov_len=2}, {iov_base="gpg-agent", iov_len=9}, {iov_base=": ",
     iov_len=2}, {iov_base="symbol assuan_sock_set_system_ho"...,
     iov_len=118}, {iov_base="", iov_len=0}, {iov_base="", iov_len=0},
     {iov_base="\n", iov_len=1}], 10) = 159
    
    The failure happens in the libreoffice-6-0 branch on Fedora 27, whereas
    the master branch doesn't fail because it has a newer version of
    libassuan that happens to provide the required symbol.
    
    Fix this by applying the patch that was added for ASAN in
    d15f042abd5a1093984a0c8380837145f38c4efc to clear LD_LIBRARY_PATH
    always on Linux.
    
    Change-Id: I6a5c7fdfdd32234f39a182581b03d79739880c11
    Reviewed-on: https://gerrit.libreoffice.org/50056
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 81e4be9cd39f1ae794a96471bf48637312a0f781)
    Reviewed-on: https://gerrit.libreoffice.org/50059
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 931d163d7576..df13d4976c7e 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -23,6 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
     external/gpgmepp/w32-build-fixes-2.patch \
-    $(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,external/gpgmepp/asan.patch) \
+    $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index bad092e6675b..c382e3b09e75 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -52,12 +52,11 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE)
 $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport))
 endif
 
-ifeq ($(ENABLE_RUNTIME_OPTIMIZATIONS),)
+# reset the LD_LIBRARY_PATH for spawned GPG processes
 ifeq ($(OS),LINUX)
 $(call gb_CppunitTest_get_target,xmlsecurity_signing): \
     EXTRA_ENV_VARS := \
         LIBO_LD_PATH=$$LD_LIBRARY_PATH
 endif
-endif
 
 # vim: set noet sw=4 ts=4: