diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2014-07-15 10:31:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-17 09:29:53 +0000 |
| commit | 01f46d8a5d8b60e791205e74ffb86e730499b273 (patch) | |
| tree | 661fb0de5923b38cc01d90955ff187e2755c1131 /RepositoryExternal.mk | |
| parent | c0af71d4f195dd374c688e4548dcc440519e1883 (diff) | |
fdo#72277: Use NSS CACERT in cmis ucp with internal curl
This fix contains two parts:
* initialize NSS in the CMIS UCP right before sending an HTTP request
in case internal curl is used. This makes internal curl find the NSS
CACERT database from the user mozilla profile.
* add nsspem to allow curl to use CACERTs from libnssckbi. Without
libnsspem curl is unable to read the certificates from the NSS
database. The nss-pem code has been extracted from the fedora-hosted
repository: https://git.fedorahosted.org/cgit/nss-pem.git
System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support and thus
build nsspem.
(cherry picked from commit 165075e0d705cbd146463c94b027e728db864ab2)
(cherry picked from commit 6602f904ac1858ef571eab5b2df733be0461e7e3)
(cherry picked from commit 85d1bd151cca1572e39019288cb2b7b35fc0bbda)
(cherry picked from commit 0058b4370070c96e1edc9dd3c80715187ad30cca)
(cherry picked from commit a8fd30771a019f727b07adfd82d610028f640f1e)
(cherry picked from commit 89361fa68af9a6854dc3a07711279f27561ea8fb)
Conflicts:
external/nss/UnpackedTarball_nss.mk
Change-Id: Ie8dedf020480cca01bf9761382886566a1150778
Reviewed-on: https://gerrit.libreoffice.org/10364
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c42f8f9be488..919df968d026 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2438,6 +2438,9 @@ endif # !SYSTEM_LIBPNG ifneq ($(SYSTEM_CURL),) define gb_LinkTarget__use_curl +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_CURL \ +) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(CURL_CFLAGS) \ |