[Libreoffice-commits] core.git: external/curl

2023-06-13 Thread Taichi Haradaguchi (via logerrit) 
 external/curl/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40fb6f95bbe8a80e71a318c1a843ba6772ad9ab5
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Jun 13 00:53:34 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Jun 13 11:18:09 2023 +0200

external/curl: fix URL in README.

The current URL of the curl project's website is https://curl.se/.

Change-Id: Ibbbd2b0c8b6616bd1f59af06f2a41f62674d3bab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152939
Tested-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>

diff --git a/external/curl/README b/external/curl/README
index 8dab66f98296..4a7044623608 100644
--- a/external/curl/README
+++ b/external/curl/README
@@ -1 +1 @@
-A URL manipulation engine from [https://curl.haxx.se/].
+A URL manipulation engine from [https://curl.se/].

[Libreoffice-commits] core.git: external/curl

2022-05-31 Thread Michael Stahl (via logerrit) 
 external/curl/UnpackedTarball_curl.mk |1 
 external/curl/curl-7.26.0_win-proxy.patch |  121 --
 2 files changed, 122 deletions(-)

New commits:
commit 225d8f31ad5fdcb802fbaa4ccb5266c80a3dd037
Author: Michael Stahl 
AuthorDate: Tue May 31 11:43:07 2022 +0200
Commit: Michael Stahl 
CommitDate: Tue May 31 15:59:28 2022 +0200

curl: remove curl-7.26.0_win-proxy.patch

There is no justification why this patch was added, upstream doesn't
want to add such a feature[1], and maintaining feature patches in LO
for bundled externals doesn't make sense.

Also, this doesn't respect the Inet::Settings::ooInetHTTPProxy*
settings from the configuration.

Let's remove it and hope nobody complains.

[1] https://curl.se/mail/lib-2022-05/0083.html

Change-Id: I1ccdefb76f69e6795a28d4d25bf443555c16ab0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index b89b000228c9..e78adabb8d07 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
external/curl/curl-msvc-zlib.patch.1 \
external/curl/curl-msvc-disable-protocols.patch.1 \
-   external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
external/curl/configurable-z-option.patch.0 \
 ))
diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
deleted file mode 100644
index 1c5469a35479..
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ /dev/null
@@ -1,121 +0,0 @@
 curl/winbuild/MakefileBuild.vc.orig2017-10-23 17:15:22.969492548 
+0200
-+++ curl/winbuild/MakefileBuild.vc 2017-10-23 17:16:38.491490679 +0200
-@@ -72,7 +72,7 @@
- 
- CFLAGS_LIBCURL_STATIC  = /DCURL_STATICLIB
- 
--WIN_LIBS= ws2_32.lib wldap32.lib advapi32.lib crypt32.lib
-+WIN_LIBS= ws2_32.lib wldap32.lib advapi32.lib crypt32.lib winhttp.lib
- 
- BASE_NAME  = libcurl
- BASE_NAME_DEBUG= $(BASE_NAME)_debug
 curl-7.26.0/lib/url.c
-+++ misc/build/curl-7.26.0/lib/url.c
-@@ -78,6 +78,10 @@
- bool curl_win32_idn_to_ascii(const char *in, char **out);
- #endif  /* USE_LIBIDN2 */
- 
-+#ifdef _WIN32
-+#include 
-+#endif
-+
- #include "urldata.h"
- #include "netrc.h"
- 
-@@ -4586,6 +4590,21 @@
- }
- 
- #ifndef CURL_DISABLE_HTTP
-+#ifdef _WIN32
-+static char *wstrToCstr(LPWSTR wStr)
-+{
-+  int bufSize;
-+  char *out = NULL;
-+  if(wStr) {
-+bufSize = WideCharToMultiByte(
-+  CP_ACP,  0, wStr, -1, NULL, 0, NULL, NULL);
-+out = (char *)malloc(bufSize * sizeof(char));
-+WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL);
-+  }
-+  return out;
-+}
-+#endif
-+
- /
- * Detect what (if any) proxy to use. Remember that this selects a host
- * name and is not limited to HTTP proxies only.
-@@ -4613,6 +4633,66 @@
-* For compatibility, the all-uppercase versions of these variables are
-* checked if the lowercase versions don't exist.
-*/
-+#ifdef _WIN32
-+  char *no_proxy = NULL;
-+  WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig;
-+  ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *)
-+malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
-+  if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) {
-+if(!ieProxyConfig->fAutoDetect) {
-+  char *ieProxy;
-+  char *ieNoProxy;
-+  char *pos;
-+
-+  ieProxy = wstrToCstr(ieProxyConfig->lpszProxy);
-+  ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass);
-+
-+  /* Convert the ieNoProxy into a proper no_proxy value */
-+  if(ieNoProxy) {
-+no_proxy = strdup(ieNoProxy);
-+pos = strpbrk(no_proxy, "; ");
-+while(pos) {
-+  no_proxy[pos-no_proxy] = ',';
-+  pos = strpbrk(no_proxy, "; ");
-+}
-+  }
-+
-+  if(!check_noproxy(conn->host.name, no_proxy)) {
-+/* Look for the http proxy setting */
-+char *tok;
-+char *saveptr;
-+
-+if(ieProxy) {
-+  tok = strtok_s(ieProxy, ";", );
-+  if(!strchr(tok, '=')) {
-+proxy = strdup(ieProxy);
-+  }
-+  else {
-+do {
-+  if(strncmp(tok, "http=", 5) == 0) {
-+/* We found HTTP proxy value, then use it */
-+proxy = strdup(tok + 5);
-+  }
-+  tok = strtok_s(NULL, ";", );
-+}
-+while(tok);
-+  }
-+}
-+  }
-+
-+  free(ieProxy);
-+  free(ieNoProxy);
-+}
-+else {
-+  /* TODO Handle the Proxy config Auto Detection case */
-+}
-+
-+GlobalFree(ieProxyConfig->lpszAutoConfigUrl);
-+

[Libreoffice-commits] core.git: external/curl

2022-01-24 Thread Stephan Bergmann (via logerrit) 
 external/curl/UnpackedTarball_curl.mk|1 
 external/curl/configure-eval-fix.patch.0 |  146 +++
 2 files changed, 147 insertions(+)

New commits:
commit 9b2c6bbcc330cd19d41ed25f95589c700d435b2c
Author: Stephan Bergmann 
AuthorDate: Mon Jan 24 08:50:36 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 24 10:15:28 2022 +0100

external/curl: Fix manipulation of LD_LIBRARY_PATH

This fixes the same issue as


"curl-functions.m4: fix LIBRARY_PATH adjustment to avoid eval", just in a 
less
intrusive way so that we can get away with just fixing the resulting 
configure
rather than having to run any Autotools reconfiguration commands.

40a84af1bdd7b3c414a8a78ca32b0951c03f9976 "upgrade to curl-7.81.0" caused
 to fail with the cryptic

[...]
> checking for gethostbyname in -lnetwork... no
> checking for gethostbyname in -lnet... no
> configure: error: couldn't find libraries for gethostbyname()
> 
/home/tdf/lode/jenkins/workspace/lo_ubsan/external/curl/ExternalProject_curl.mk:41:
 recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/ExternalProject/curl/build' 
failed
> make[1]: *** 
[/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/ExternalProject/curl/build] 
Error 1

because somewhere in the middle of curl's configure LD_LIBRARY_PATH got 
garbled
because of this issue, so that invoking
/home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang started to fail 
with

> /home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang: 
/lib64/libstdc++.so.6: version `GLIBCXX_3.4.22' not found (required by 
/home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang)
> /home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang: 
/lib64/libstdc++.so.6: version `GLIBCXX_3.4.20' not found (required by 
/home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang)
> /home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang: 
/lib64/libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by 
/home/tdf/lode/opt_private/clang-llvmorg-9.0.1/bin/clang)

(because that clang is built against a local GCC and libstdc++, so needs
LD_LIBRARY_PATH to be set up properly to find the latter), which caused the
gethostbyname check to fail (as seen when looking into that build's
workdir/UnpackedTarball/curl/config.log).

Change-Id: I3d45018cdfdb22b98c0dec0757e754a172a811de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128850
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index b89b000228c9..7a8f5a265341 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
external/curl/configurable-z-option.patch.0 \
+   external/curl/configure-eval-fix.patch.0 \
 ))
 
 ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/configure-eval-fix.patch.0 
b/external/curl/configure-eval-fix.patch.0
new file mode 100644
index ..616f3fb607ad
--- /dev/null
+++ b/external/curl/configure-eval-fix.patch.0
@@ -0,0 +1,146 @@
+--- configure
 configure
+@@ -17942,7 +17942,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+eval "export $library_path_var"
+@@ -18230,7 +18230,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+eval "export $library_path_var"
+@@ -19676,7 +19676,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+eval "export $library_path_var"
+@@ -22525,7 +22525,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+eval "export $library_path_var"
+@@ -24251,7 +24251,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+eval "export $library_path_var"
+@@ -34015,7 +34015,7 @@
+  *)   library_path_var=LD_LIBRARY_PATH ;;
+esac
+ 
+-   eval "old=$$library_path_var"
++   eval "old=\$$library_path_var"
+eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
+ 
+

[Libreoffice-commits] core.git: external/curl RepositoryExternal.mk

2021-11-01 Thread Michael Stahl (via logerrit) 
 RepositoryExternal.mk |2 +-
 external/curl/ExternalPackage_curl.mk |2 +-
 external/curl/ExternalProject_curl.mk |1 +
 external/curl/UnpackedTarball_curl.mk |1 +
 external/curl/curl-msvc-zlib.patch.1  |   16 
 5 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 4b7f8f7cf3146317ae2770a766efe48f7a295f72
Author: Michael Stahl 
AuthorDate: Wed Oct 27 21:07:48 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Nov 1 19:01:49 2021 +0100

curl: build with zlib on WNT

Change-Id: I53eb6ed41fb8a17a79f72807df15822e9c1c6e88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124290
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23d4b2e63637..c28b049caef8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2763,7 +2763,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-schannel/lib/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
+   $(call 
gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-zlib-static-ipv6-sspi-schannel/lib/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 924fc53ebd62..0485dacb2d3b 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,curl,curl))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-schannel/bin/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-zlib-static-ipv6-sspi-schannel/bin/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 11beda8c7c5c..d068f2dc36f2 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -88,6 +88,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
ENABLE_IPV6=yes \
ENABLE_SSPI=yes \
ENABLE_WINSSL=yes \
+   WITH_ZLIB=static \
,winbuild)
$(call gb_Trace_EndRange,curl,EXTERNAL)
 
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 642dd3113730..f1244d0fd989 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
+   external/curl/curl-msvc-zlib.patch.1 \
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
diff --git a/external/curl/curl-msvc-zlib.patch.1 
b/external/curl/curl-msvc-zlib.patch.1
new file mode 100644
index ..654303c21874
--- /dev/null
+++ b/external/curl/curl-msvc-zlib.patch.1
@@ -0,0 +1,16 @@
+find internal zlib in nmake buildsystem
+
+--- curl/winbuild/MakefileBuild.vc.orig2   2021-10-27 20:44:48.685237000 
+0200
 curl/winbuild/MakefileBuild.vc 2021-10-27 20:47:23.792407400 +0200
+@@ -222,8 +222,9 @@
+ ZLIB_LIB_DIR = $(ZLIB_PATH)\lib
+ ZLIB_LFLAGS  = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)"
+ !ELSE
+-ZLIB_INC_DIR = $(DEVEL_INCLUDE)
+-ZLIB_LIB_DIR = $(DEVEL_LIB)
++ZLIB_INC_DIR = $(WORKDIR)/UnpackedTarball/zlib
++ZLIB_LIB_DIR = $(WORKDIR)/LinkTarget/StaticLibrary
++ZLIB_LFLAGS  = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)"
+ !ENDIF
+ 
+ # Depending on how zlib is built the libraries have different names, we

[Libreoffice-commits] core.git: external/curl

2021-11-01 Thread Michael Stahl (via logerrit) 
 external/curl/UnpackedTarball_curl.mk |1 +
 external/curl/curl-debug.patch.1  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 68a3df2f1282f40fa4accaed21a69a84d76be37d
Author: Michael Stahl 
AuthorDate: Fri Oct 1 17:42:09 2021 +0200
Commit: Michael Stahl 
CommitDate: Mon Nov 1 18:12:59 2021 +0100

curl: patch invalid format string in debug log

This causes:
soffice.bin: sendf.c:243: Curl_infof: Assertion `!strchr(fmt, '\n')' failed.

Change-Id: I5a78b2225f6769cc49025e1e73ce72cd3d6bec16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122963
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 2cdfbfc08632..642dd3113730 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
+   external/curl/curl-debug.patch.1 \
 ))
 
 ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/curl-debug.patch.1 b/external/curl/curl-debug.patch.1
new file mode 100644
index ..a000913ed335
--- /dev/null
+++ b/external/curl/curl-debug.patch.1
@@ -0,0 +1,11 @@
+--- curl/lib/vtls/nss.c.orig   2021-10-01 17:34:59.302663021 +0200
 curl/lib/vtls/nss.c2021-10-01 17:35:55.37010 +0200
+@@ -955,7 +955,7 @@
+   subject = CERT_NameToAscii(>subject);
+   issuer = CERT_NameToAscii(>issuer);
+   common_name = CERT_GetCommonName(>subject);
+-  infof(data, "subject: %s\n", subject);
++  infof(data, "subject: %s", subject);
+ 
+   CERT_GetCertTimes(cert, , );
+   PR_ExplodeTime(notBefore, PR_GMTParameters, );

[Libreoffice-commits] core.git: external/curl

2020-07-05 Thread Tor Lillqvist (via logerrit) 
 external/curl/UnpackedTarball_curl.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 95856ba49d73e8af0d654ac30cbdf34c6fc7d37d
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 23:52:34 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 09:11:11 2020 +0200

Use up-to-date config.{guess,sub} for external/curl, too

Change-Id: I65741410e9ba14326a6ad7a676d1dfb10006e34f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97988
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 1cdb64c0bca2..2cdfbfc08632 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,curl))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,curl))
+
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl external/libtommath external/libxml2 external/libxslt external/openssl external/postgresql external/xmlsec

2017-11-01 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |5 +++--
 external/libtommath/ExternalProject_libtommath.mk |4 +---
 external/libxml2/ExternalProject_libxml2.mk   |5 +++--
 external/libxslt/ExternalProject_libxslt.mk   |5 +++--
 external/openssl/ExternalProject_openssl.mk   |7 +++
 external/postgresql/ExternalProject_postgresql.mk |4 +++-
 external/xmlsec/ExternalProject_xmlsec.mk |5 +++--
 7 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 4fcdc190afe710c2530ea40e30609570519a5ff2
Author: Michael Stahl 
Date:   Wed Nov 1 11:52:56 2017 +0100

external: consistently use gb_ExternalProject_use_nmake

... instead of hard-coding some subset of the variables everywhere.

Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index b9ac6980d758..b074a937b189 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -69,10 +69,11 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 
 else ifeq ($(COM),MSC)
 
+$(eval $(call gb_ExternalProject_use_nmake,curl,build))
+
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
-   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
+   nmake -f Makefile.vc \
mode=dll \
VC=12 \
$(if $(filter 
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
diff --git a/external/libtommath/ExternalProject_libtommath.mk 
b/external/libtommath/ExternalProject_libtommath.mk
index 955adc8c4d3d..f534e62a126d 100644
--- a/external/libtommath/ExternalProject_libtommath.mk
+++ b/external/libtommath/ExternalProject_libtommath.mk
@@ -18,9 +18,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build))
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,libtommath,build):
$(call gb_ExternalProject_run,build,\
-   export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
-   && export LIB="$(ILIB)" \
-   && nmake -nologo -f makefile.msvc \
+   nmake -nologo -f makefile.msvc \
)
 else
 $(call gb_ExternalProject_get_state_target,libtommath,build) :
diff --git a/external/libxml2/ExternalProject_libxml2.mk 
b/external/libxml2/ExternalProject_libxml2.mk
index c27efdf36b72..0d8559dfb04f 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -16,13 +16,14 @@ $(eval $(call gb_ExternalProject_register_targets,libxml2,\
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_use_external_project,libxml2,icu)
 
+$(eval $(call gb_ExternalProject_use_nmake,libxml2,build))
+
 $(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
-   && unset MAKEFLAGS \
-   && LIB="$(ILIB)" nmake \
+   && nmake \
,win32)
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,libxml2,build):
diff --git a/external/libxslt/ExternalProject_libxslt.mk 
b/external/libxslt/ExternalProject_libxslt.mk
index 27667299e383..8d6a40f5e187 100644
--- a/external/libxslt/ExternalProject_libxslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -15,14 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,libxslt,\
build \
 ))
 ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalProject_use_nmake,libxslt,build))
+
 $(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
vcmanifest=yes \
lib=$(call 
gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
-   && unset MAKEFLAGS \
-   && LIB="$(ILIB)" nmake \
+   && nmake \
,win32)
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,libxslt,build):
diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 941da5b14eeb..211de4ab06fd 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -55,14 +55,13 @@ OPENSSL_PLATFORM := \
   )
 
 ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalProject_use_nmake,openssl,build))
+
 $(call

[Libreoffice-commits] core.git: external/curl

2017-09-19 Thread Tor Lillqvist 
 external/curl/UnpackedTarball_curl.mk |8 
 external/curl/curl-osx.patch.1|  285 ++
 2 files changed, 293 insertions(+)

New commits:
commit eba34a557cdacd6a39d2e86fadc25eb1e2707b57
Author: Tor Lillqvist 
Date:   Tue Sep 19 22:28:24 2017 +0300

connectx() is available only on Mac OS X 10.11 and newer

Compiling against the 10.13 SDK with --with-macosx-version-min-
required set to 10.9 or 10.10 (or defaulted, meaning 10.9) causes a
compilation error now. Earlier SDKs did not catch it if you were using
connectx() even if targeting pre-10.11.

Try the approach from https://github.com/curl/curl/pull/1336/commits .

Change-Id: I7cac294931c8afa6ff26a6ca9cf4491aff249de0

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index b0d103204430..81673b775986 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -31,4 +31,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+ifneq ($(filter 1090 101000,$(MAC_OS_X_VERSION_MIN_REQUIRED)),)
+$(eval $(call gb_UnpackedTarball_add_patches,curl,\
+   external/curl/curl-osx.patch.1 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/curl/curl-osx.patch.1 b/external/curl/curl-osx.patch.1
new file mode 100644
index ..7694a1dcda2c
--- /dev/null
+++ b/external/curl/curl-osx.patch.1
@@ -0,0 +1,285 @@
+From efebf4d4f882a57a98a0653d21d543cd4132d23d Mon Sep 17 00:00:00 2001
+From: Palo Markovic 
+Date: Sat, 18 Mar 2017 16:37:02 +1300
+Subject: [PATCH] macOS: Fixed crash on 10.8 caused by missing connectx()
+ function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The connectx() function call appeared in Darwin 15.0.0
+That covers OS X 10.11, iOS 9 and tvOS 9.
+
+Because connectx is not declared with weak_import attribute it’s not possible
+to build libcurl on OS X 10.11 and later and target systems which don’t have
+_connectx symbol declared in libsystem_kernel.dylib (i.e. OS 10.8 and earlier).
+
+Solution is to use connectx only on platforms that officially support it
+i.e. by defining CFLAGS="-mmacosx-version-min=10.11" in configure step.
+
+Note: It is possible to conditionally use connectx() in libcurl targeting
+range of systems based on availability determined during runtime using dlsym().
+
+[Bug: https://github.com/curl/curl/issues/1330]
+---
+ lib/connect.c|  2 +-
+ lib/curl_setup.h | 16 
+ lib/url.c|  2 +-
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 197eff242f..33251914b8 100644
+--- a/lib/connect.c
 b/lib/connect.c
+@@ -1075,7 +1075,7 @@ static CURLcode singleipconnect(struct connectdata *conn,
+   /* Connect TCP sockets, bind UDP */
+   if(!isconnected && (conn->socktype == SOCK_STREAM)) {
+ if(conn->bits.tcp_fastopen) {
+-#if defined(CONNECT_DATA_IDEMPOTENT) /* OS X */
++#if defined(HAVE_DARWIN_CONNECTX) /* Darwin */
+   sa_endpoints_t endpoints;
+   endpoints.sae_srcif = 0;
+   endpoints.sae_srcaddr = NULL;
+diff --git a/lib/curl_setup.h b/lib/curl_setup.h
+index 0fe3633ec7..8643e1fd28 100644
+--- a/lib/curl_setup.h
 b/lib/curl_setup.h
+@@ -762,4 +762,20 @@ endings either CRLF or LF so 't' is appropriate.
+ #  endif
+ # endif
+ 
++/* Detect Darwin connectx() function availability.
++ * The connectx() function call appeared in Darwin 15.0.0
++ * but it's not declared using availability attribute.
++ */
++#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
++#  if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
++#define HAVE_DARWIN_CONNECTX 1
++#  endif
++#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
++#  if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 9)
++#define HAVE_DARWIN_CONNECTX 1
++#  endif
++#elif defined(CONNECT_DATA_IDEMPOTENT)  /* Fallback for other Darwin OS */
++#  define HAVE_DARWIN_CONNECTX 1
++#endif
++
+ #endif /* HEADER_CURL_SETUP_H */
+diff --git a/lib/url.c b/lib/url.c
+index 03feaa20f7..08fbe5132b 100644
+--- a/lib/url.c
 b/lib/url.c
+@@ -2834,7 +2834,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption 
option,
+ data->set.tcp_keepintvl = va_arg(param, long);
+ break;
+   case CURLOPT_TCP_FASTOPEN:
+-#if defined(CONNECT_DATA_IDEMPOTENT) || defined(MSG_FASTOPEN)
++#if defined(HAVE_DARWIN_CONNECTX) || defined(MSG_FASTOPEN)
+ data->set.tcp_fastopen = (0 != va_arg(param, long))?TRUE:FALSE;
+ #else
+ result = CURLE_NOT_BUILT_IN;
+From 45756a8a23967570da1390f9b1475c1db38a52d1 Mon Sep 17 00:00:00 2001
+From: Palo Markovic 
+Date: Sat, 25 Mar 2017 13:20:51 +1300
+Subject: [PATCH] macOS: moved connectx check to configuration phase
+
+---
+ acinclude.m4 | 40 
+ configure.ac |  1 +
+ lib/connect.c|  2 +-

[Libreoffice-commits] core.git: external/curl

2017-09-07 Thread Stephan Bergmann 
 external/curl/ExternalProject_curl.mk |1 
 external/curl/UnpackedTarball_curl.mk |1 
 external/curl/zlib.patch.0|  100 ++
 3 files changed, 102 insertions(+)

New commits:
commit 6a478cf43f647458e507de21c4c1edb70679ac74
Author: Stephan Bergmann 
Date:   Wed Sep 6 23:28:46 2017 +0200

Pass --without-system-zlib into external/curl

For (implicit) --with-zlib, curl's configure would insist on calling 
pkg-config
and insist on using -lz to link against the zlib library.  None of that fits
LO's --without-system-zlib option.

So make curl's configure honor any passed in ZLIB_CLFAGS/LIBS (unless 
--without-
zlib were explicitly specified; also, ZLIB_CLFAGS/LIBS would override any
explicitly specified --with-zlib=PATH, which could be considered an error, 
but
we do never explicitly specify --with-zlib=PATH in
external/curl/ExternalProject_curl.mk, anyway).

Both ZLIB_CLFAGS/LIBS are set in config_host.mk, so are always set as env 
vars,
so would already be visible to curl's configure.  I nevertheless pass them 
into
curl's configure explicitly in external/curl/ExternalProject_curl.mk, to 
make
that more obvious.

With (implicit) --with-system-zlib, LO's configure.ac will set ZLIB_LIBS and
leave ZLIB_CFLAGS empty (and checks that zlib.h is indeed available without 
any
ZLIB_CLFAGS being necessary).  And with --without-system-zlib, LO's 
configure.ac
will set both ZLIB_CFLAGS/LIBS.  So curl's configure, as invoked from
external/curl/ExternalProject_curl.mk, will now always go into the newly 
added
case honoring any passed in ZLIB_CLFAGS/LIBS, which should thus always work 
out
nicely and use the same zlib settings as configured for LO itself.

(For documentation purposes, external/curl/zlib.patch.0 also contains the
changes to curl's configure.ac that are reflected in the changes to curl's
configure.)

Change-Id: Icf5eefe44a7f9beb8a43a9af381f46e5c8b98b04
Reviewed-on: https://gerrit.libreoffice.org/42032
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index d6590c368193..bd03275d4888 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -60,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
CPPFLAGS='$(curl_CPPFLAGS)' \
LDFLAGS='$(curl_LDFLAGS)' \
+   ZLIB_CFLAGS='$(ZLIB_CFLAGS)' ZLIB_LIBS='$(ZLIB_LIBS)' \
&& cd lib \
&& $(MAKE) \
)
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 5eba91f73f17..b0d103204430 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
+   external/curl/zlib.patch.0 \
 ))
 
 ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0
new file mode 100644
index ..87614c7703f7
--- /dev/null
+++ b/external/curl/zlib.patch.0
@@ -0,0 +1,100 @@
+--- configure
 configure
+@@ -937,8 +937,8 @@
+ ZLIB_LIBS
+ HAVE_LIBZ_FALSE
+ HAVE_LIBZ_TRUE
+-HAVE_LIBZ
+ PKGCONFIG
++HAVE_LIBZ
+ CURL_DISABLE_GOPHER
+ CURL_DISABLE_SMTP
+ CURL_DISABLE_SMB
+@@ -20709,7 +20709,6 @@
+ clean_CPPFLAGS=$CPPFLAGS
+ clean_LDFLAGS=$LDFLAGS
+ clean_LIBS=$LIBS
+-ZLIB_LIBS=""
+ 
+ # Check whether --with-zlib was given.
+ if test "${with_zlib+set}" = set; then :
+@@ -20718,6 +20719,7 @@
+ 
+ 
+ if test "$OPT_ZLIB" = "no" ; then
++ZLIB_LIBS=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
+ $as_echo "$as_me: WARNING: zlib disabled" >&2;}
+ else
+@@ -20725,6 +20725,21 @@
+ OPT_ZLIB=""
+   fi
+ 
++ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
++  CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
++  LIBS="$ZLIB_LIBS $LIBS"
++  HAVE_LIBZ="1"
++
++
++$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
++
++  AMFIXLIB="1"
++ else
++  ZLIB_LIBS=""
++
+ 
+ if test -n "$PKG_CONFIG"; then
+   PKGCONFIG="$PKG_CONFIG"
+@@ -21005,6 +21020,7 @@
+ $as_echo "$as_me: found both libz and libz.h header" >&6;}
+ curl_zlib_msg="enabled"
+   fi
++ fi
+ fi
+ 
+  if test x"$AMFIXLIB" = x1; then
+--- configure.ac
 configure.ac
+@@ -880,19 +880,30 @@
+ clean_CPPFLAGS=$CPPFLAGS
+ clean_LDFLAGS=$LDFLAGS
+ clean_LIBS=$LIBS
+-ZLIB_LIBS=""
+ AC_ARG_WITH(zlib,
+

[Libreoffice-commits] core.git: external/curl

2017-09-06 Thread Stephan Bergmann 
 external/curl/ExternalProject_curl.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5139f902f36500f7a2a0a8da3eef79c26416dab
Author: Stephan Bergmann 
Date:   Wed Sep 6 23:24:08 2017 +0200

Clean up passing CPPFLAGS/LDFLAGS into external/curl

Change-Id: I3a4730c9a43f5e4904504bb136b3ccbcf29207b4
Reviewed-on: https://gerrit.libreoffice.org/42030
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 95d004e097d1..d6590c368193 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 ifneq ($(OS),WNT)
 
 curl_CPPFLAGS :=
-curl_LDFLAGS := $(if $(filter LINUX 
FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)
+curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN)
 
 ifneq ($(OS),ANDROID)
 ifneq ($(SYSBASE),)
@@ -39,8 +39,6 @@ endif
 # use --with-nss only on platforms other than Mac OS X and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   CPPFLAGS="$(curl_CPPFLAGS)" \
-   LDFLAGS=$(curl_LDFLAGS) \
./configure \
$(if $(filter IOS MACOSX,$(OS)),\
--with-darwinssl,\
@@ -60,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(ENABLE_DEBUG),--enable-debug) \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
+   CPPFLAGS='$(curl_CPPFLAGS)' \
+   LDFLAGS='$(curl_LDFLAGS)' \
&& cd lib \
&& $(MAKE) \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2017-09-06 Thread Stephan Bergmann 
 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8067ae344014f4f61219ed3fcfff6b48e2a2b2d8
Author: Stephan Bergmann 
Date:   Wed Sep 6 23:21:40 2017 +0200

Pass "verbose" flag into external/curl

Change-Id: Ic42bbeaee8faa8a5e99fbdd22775870bd2e5bae0

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 73fd1ac63591..95d004e097d1 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -58,6 +58,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
+   $(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& cd lib \
&& $(MAKE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2017-01-26 Thread Thorsten Behrens 
 external/curl/curl-7.26.0_win-proxy.patch |  117 ++
 1 file changed, 117 insertions(+)

New commits:
commit 2be42d9480fc831144e4d5b216b0a01ffbdb5c8f
Author: Thorsten Behrens 
Date:   Tue Jan 24 16:43:18 2017 +0100

curl: get winProxy support back

with properly aligned asterisks

Change-Id: I48b31bce45cdce378fa1cfdd9ddde82b9e669cf5
Reviewed-on: https://gerrit.libreoffice.org/33500
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index 7edf1b5..1c47886 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -9,3 +9,120 @@
  CFLAGS   = $(CFLAGS) $(EXCFLAGS)
  
  CFGSET   = FALSE
+--- curl-7.26.0/lib/url.c
 misc/build/curl-7.26.0/lib/url.c
+@@ -78,6 +78,10 @@
+ bool curl_win32_idn_to_ascii(const char *in, char **out);
+ #endif  /* USE_LIBIDN2 */
+ 
++#ifdef _WIN32
++#include 
++#endif
++
+ #include "urldata.h"
+ #include "netrc.h"
+ 
+@@ -4586,6 +4590,21 @@
+   return FALSE;
+ }
+ 
++#ifdef _WIN32
++static char *wstrToCstr(LPWSTR wStr)
++{
++  int bufSize;
++  char *out = NULL;
++  if(wStr != NULL) {
++bufSize = WideCharToMultiByte(
++  CP_ACP,  0, wStr, -1, NULL, 0, NULL, NULL);
++out = (char *)malloc(bufSize * sizeof(char));
++WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL);
++  }
++  return out;
++}
++#endif
++
+ /
+ * Detect what (if any) proxy to use. Remember that this selects a host
+ * name and is not limited to HTTP proxies only.
+@@ -4594,6 +4613,7 @@
+ static char *detect_proxy(struct connectdata *conn)
+ {
+   char *proxy = NULL;
++  char *no_proxy=NULL;
+ 
+ #ifndef CURL_DISABLE_HTTP
+   /* If proxy was not specified, we check for default proxy environment
+@@ -4613,7 +4633,64 @@
+* For compatibility, the all-uppercase versions of these variables are
+* checked if the lowercase versions don't exist.
+*/
+-  char *no_proxy=NULL;
++#ifdef _WIN32
++  WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig;
++  ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *)
++malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
++  if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) {
++if(!ieProxyConfig->fAutoDetect) {
++  char *ieProxy;
++  char *ieNoProxy;
++  char *pos;
++
++  ieProxy = wstrToCstr(ieProxyConfig->lpszProxy);
++  ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass);
++
++  /* Convert the ieNoProxy into a proper no_proxy value */
++  if(NULL != ieNoProxy) {
++no_proxy = strdup(ieNoProxy);
++pos = strpbrk(no_proxy, "; ");
++while(NULL != pos) {
++  no_proxy[pos-no_proxy] = ',';
++  pos = strpbrk(no_proxy, "; ");
++}
++  }
++
++  if(!check_noproxy(conn->host.name, no_proxy)) {
++/* Look for the http proxy setting */
++char *tok;
++char *saveptr;
++
++if(NULL != ieProxy) {
++  tok = strtok_s(ieProxy, ";", );
++  if(strchr(tok, '=') == NULL) {
++proxy = strdup(ieProxy);
++  }
++  else {
++do {
++  if(strncmp(tok, "http=", 5) == 0) {
++/* We found HTTP proxy value, then use it */
++proxy = strdup(tok + 5);
++  }
++  tok = strtok_s(NULL, ";", );
++}
++while(NULL != tok);
++  }
++}
++  }
++
++  free(ieProxy);
++  free(ieNoProxy);
++}
++else {
++  /* TODO Handle the Proxy config Auto Detection case */
++}
++
++GlobalFree(ieProxyConfig->lpszAutoConfigUrl);
++GlobalFree(ieProxyConfig->lpszProxy);
++GlobalFree(ieProxyConfig->lpszProxyBypass);
++  }
++#else /* !WIN32 */
+   char proxy_env[128];
+ 
+   no_proxy=curl_getenv("no_proxy");
+@@ -4663,6 +4739,7 @@
+ }
+   } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified
+non-proxy */
++#endif /* WIN32 */
+   free(no_proxy);
+ 
+ #else /* !CURL_DISABLE_HTTP */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl vcl/Library_vcl.mk

2016-12-19 Thread Caolán McNamara 
 external/curl/ExternalProject_curl.mk |4 ++--
 vcl/Library_vcl.mk|7 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ea992517bf8b1d48c2e02717f5bc9efc3ebb1c2e
Author: Caolán McNamara 
Date:   Mon Dec 19 09:30:03 2016 +

with missing nss build curl and vcl appropiately

Change-Id: Iaef197e9ab736c219897933a76f4c75a3e3acaa6

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 76b4a45..1f70972 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
-   nss3 \
+   $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,nss3) \
zlib \
 ))
 
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
./configure \
$(if $(filter IOS MACOSX,$(OS)),\
--with-darwinssl,\
-   --with-nss$(if $(SYSTEM_NSS),,="$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+   $(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--without-nss,--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \
--without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7a76868..050ee31 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -60,11 +60,16 @@ $(eval $(call gb_Library_use_externals,vcl,\
$(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \
curl) \
jpeg \
+   libeot \
+))
+
+ifeq ($(TLS),NSS)
+$(eval $(call gb_Library_use_externals,vcl,\
$(if $(filter-out IOS WNT,$(OS)), \
nss3 \
plc4) \
-   libeot \
 ))
+endif
 
 $(eval $(call gb_Library_use_libraries,vcl,\
 $(call gb_Helper_optional,BREAKPAD, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2016-03-13 Thread Christian Lohmaier 
 external/curl/UnpackedTarball_curl.mk |6 ++
 external/curl/curl-nss.patch.1|   12 
 2 files changed, 18 insertions(+)

New commits:
commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18
Author: Christian Lohmaier 
Date:   Sun Mar 13 15:33:08 2016 +0100

tdf#98416 fix curl's configure check for nss (missing -lnssutil3)

without -lnssutil3, the configure check for nss fails when using
internal nss:
configure:24028: checking for SSL_VersionRangeSet in -lnss3
[…]
…/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to
`NSSUTIL_ArgParseModuleSpecEx@NSSUTIL_3.21'

causing curl to build without ssl support:
SSL support:  no 
(--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} )

This makes gdrive and other remote file methods fail

Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 2e4d4cc..8e236b4 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -25,6 +25,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-7.26.0_win-proxy.patch \
 ))
 
+ifeq ($(SYSTEM_NSS),)
+$(eval $(call gb_UnpackedTarball_add_patches,curl,\
+   external/curl/curl-nss.patch.1 \
+))
+endif
+
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-android.patch \
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
new file mode 100644
index 000..69fde5f
--- /dev/null
+++ b/external/curl/curl-nss.patch.1
@@ -0,0 +1,12 @@
+diff -ur curl.org/configure curl/configure
+--- curl.org/configure 2016-03-13 15:14:07.17776 +0100
 curl/configure 2016-03-13 15:16:44.13276 +0100
+@@ -24009,7 +24009,7 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired 
libraries and compilation flags for NSS." >&5
+ $as_echo "$as_me: WARNING: Using hard-wired libraries and compilation flags 
for NSS." >&2;}
+   addld="-L$OPT_NSS/lib"
+-  addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
++  addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lnssutil3"
+   addcflags="-I$OPT_NSS/include"
+   version="unknown"
+   nssprefix=$OPT_NSS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2016-03-11 Thread Giuseppe Castagno 
 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30b9c6a457de61f3c94431ecc75716f866c3379e
Author: Giuseppe Castagno 
Date:   Thu Mar 10 14:54:28 2016 +0100

tdf#98416: Explicitly disable curl hardcoded CA certificate store

Add --without-ca-bundle --without-ca-path options to curl configure
in Linux, to explicitly disable the hardcoded curl CA certificate
store.

If the store is not disabled, curl configure will try to find
one suitable for the Linux distro on which it's being built, leading
to possible problems when building on a Linux distro type while
targeting another Linux distro type (e.g. building on Red Hat
derivative targeting Debian derivative).

Change-Id: Id1ddf1d74e33bc66e4f7187e376d7379f5c4f36a
Reviewed-on: https://gerrit.libreoffice.org/23141
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index e31f5d6..9dd4a07 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,6 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-librtmp --disable-ldaps --disable-tftp 
--disable-pop3 \
--disable-imap --disable-smtp --disable-manual 
--without-metalink \
--without-nghttp2 \
+   $(if $(filter LINUX,$(OS)),--without-ca-bundle 
--without-ca-path) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2015-06-02 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 805f12dd51ea72deda8f5be5839a205640ba968d
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 2 15:36:00 2015 +0200

curl: sigh... *actually* disable rtmp support

Change-Id: I07ffe3a9ad6556fb5da3149a3cbe12ffcc5f56b4

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 5a80e26..c0ba892 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
-   --without-rtmp \
+   --without-librtmp \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2015-06-02 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f4844a9abebcb0451161625c42a1e2b48796102d
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 2 15:30:28 2015 +0200

curl: disable rtmp support

configure will add a dependency on librtmp.so.0 if the development
package happens to be installed.

Change-Id: I8500cc166d70763118e5054680f1f8c70942ba3f

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 8f94771..5a80e26 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
+   --without-rtmp \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl external/firebird external/glew external/libebook external/libgltf external/libmspub external/libmwaw external/libodfgen external/liborcus external/librev

2014-08-29 Thread Stephan Bergmann 
 external/curl/ExternalProject_curl.mk |4 ++--
 external/firebird/ExternalProject_firebird.mk |2 +-
 external/glew/ExternalProject_glew.mk |4 ++--
 external/libebook/ExternalProject_libebook.mk |2 +-
 external/libgltf/ExternalProject_libgltf.mk   |2 +-
 external/libmspub/ExternalProject_libmspub.mk |2 +-
 external/libmwaw/ExternalProject_libmwaw.mk   |2 +-
 external/libodfgen/ExternalProject_libodfgen.mk   |2 +-
 external/liborcus/ExternalProject_liborcus.mk |2 +-
 external/librevenge/ExternalProject_librevenge.mk |2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6bc81d4e78184cf57d6bc99f1f2dba6938b4fa85
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 17:14:53 2014 +0200

Simplify some $ENABLE_DEBUG expressions

Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index b012079..e8e1345 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 cd lib \
 $(MAKE) \
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 
--disable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
CC=$(CC) -mthreads $(if 
$(MINGW_SHARED_GCCLIB),-shared-libgcc) \
LIBS=-lws2_32 -lwinmm $(if 
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP)) \
LDFLAGS=$(patsubst ;, -L,$(ILIB)) \
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 6e3f582..f557a361 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
 $(if $(filter WNT,$(OS)),\
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 7eec3e8..54348f5 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -24,8 +24,8 @@ else
 
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,glew,\
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD=$(CC) \
-   $(MAKE) STRIP= glew.lib $(if $(filter 
DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \
+   $(if $(ENABLE_DEBUG),STRIP=) LD=$(CC) \
+   $(MAKE) STRIP= glew.lib $(if $(filter 
DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \
)
 
 endif
diff --git a/external/libebook/ExternalProject_libebook.mk 
b/external/libebook/ExternalProject_libebook.mk
index 293028f..ca1c7e4 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
--without-docs \
--without-tools \
--disable-tests \
-   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \

[Libreoffice-commits] core.git: external/curl

2014-03-02 Thread Douglas Mencken 
 external/curl/ExternalProject_curl.mk |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 92ca6ef11daa892cffaff136b9a4380665f0ecc2
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Sun Mar 2 06:41:51 2014 -0500

curl (bundled): fix logic breakout

use --with-nss only on platforms other than Mac OS X and iOS

(see commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e)

Change-Id: Ie6cb35ea5f5db2d08f303f70d1559188912ba8e5
Reviewed-on: https://gerrit.libreoffice.org/8418
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index e1d8c07..5e36ec8 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -35,20 +35,17 @@ ifeq ($(SYSTEM_NSS),)
 curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
 endif
 
-# use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage
-# (note that --with-darwinssl option is not very compatible)
+# use --with-darwinssl on Mac OS X 10.5 and iOS to get a native UI for SSL 
certs for CMIS usage
+# use --with-nss only on platforms other than Mac OS X and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(curl_CPPFLAGS) \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter IOS,$(OS)),\
-   --with-darwinssl \
-   --with-nss$(if $(SYSTEM_NSS),,=$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out)) \
+   $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if 
$(SYSTEM_NSS),,=$(call gb_UnpackedTarball_get_dir,nss)/dist/out)) \
+   $(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
-   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--without-nss,\
-   --with-darwinssl \
-   --with-nss$(if $(SYSTEM_NSS),,=$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out))) \
+   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,--with-darwinssl)) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2014-03-01 Thread Douglas Mencken 
 external/curl/ExternalProject_curl.mk |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Thu Feb 27 13:34:06 2014 -0500

curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5

Change-Id: I3e8576926df875d73de10d5212adde2685c3a799
Reviewed-on: https://gerrit.libreoffice.org/8386
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 3f3336b..e1d8c07 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -36,14 +36,19 @@ curl_CPPFLAGS += -I$(call 
gb_UnpackedTarball_get_dir,nss)/dist/public/nss
 endif
 
 # use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage
+# (note that --with-darwinssl option is not very compatible)
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(curl_CPPFLAGS) \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter MACOSX IOS,$(OS)),\
-   --with-darwinssl, \
+   $(if $(filter IOS,$(OS)),\
+   --with-darwinssl \
--with-nss$(if $(SYSTEM_NSS),,=$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out)) \
+   $(if $(filter MACOSX,$(OS)),\
+   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--without-nss,\
+   --with-darwinssl \
+   --with-nss$(if $(SYSTEM_NSS),,=$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out))) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2014-01-20 Thread Stephan Bergmann 
 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8804d3a63ae25d9211b3bf64d764c4eb4bd6c132
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 20 23:29:27 2014 +0100

Fake proper lib ID for macosx-change-install-names into external/curl

Change-Id: I4ce1123698ced152c076a4d0e4ad276be9a55bfe

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 42cb4e8..23161a0 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 cd lib \
 $(MAKE) \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2014-01-17 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7edb1f5f32b21a934e3ed4999482ceb07568dfd0
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 17 15:54:59 2014 +0100

curl: we really want --with-darwinssl on Mac for libcmis

(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7)

Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 208a556..42cb4e8 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -35,14 +35,16 @@ ifeq ($(SYSTEM_NSS),NO)
 curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
 endif
 
+# use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(curl_CPPFLAGS) \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter 
IOS,$(OS)),--with-darwinssl,--without-ssl) \
-   $(if $(filter MACOSX,$(OS)),,\
+   $(if $(filter MACOSX IOS,$(OS)),\
+   --with-darwinssl, \
--with-nss$(if $(filter 
NO,$(SYSTEM_NSS)),=$(call gb_UnpackedTarball_get_dir,nss)/dist/out)) \
+   --without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2013-11-18 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 461bdf0b4f863a5ba39dd76b6baf416fbb64b5e8
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 18 23:20:45 2013 +0100

curl: try to use Mac OS X native SSL/TLS implementation

This should give better OS integration for things like adding CAs.

Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 932c08b..6f024bf 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -40,7 +40,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS=$(curl_CPPFLAGS) \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   --with-nss$(if $(filter NO,$(SYSTEM_NSS)),=$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out) \
+   $(if $(filter MACOSX IOS,$(OS)),\
+   --with-darwinssl, \
+   --with-nss$(if $(filter 
NO,$(SYSTEM_NSS)),=$(call gb_UnpackedTarball_get_dir,nss)/dist/out)) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2013-11-18 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |2 +-
 external/curl/UnpackedTarball_curl.mk |2 +-
 external/curl/curl-7.26.0_win-proxy.patch |4 ++--
 external/curl/curl-msvc.patch.1   |4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 43d477b1685f6c1ad48885c7a73411030c78513d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 18 23:40:05 2013 +0100

curl: actually use Makefile.vc10 instead of Makefile.vc9

... they are currently identical but it seems more appropriate.

Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 6f024bf..81d46f6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -72,7 +72,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   MAKEFLAGS= LIB=$(ILIB) nmake -f Makefile.vc9 \
+   MAKEFLAGS= LIB=$(ILIB) nmake -f Makefile.vc10 \
cfg=$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS=/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE 
/DUSE_WINDOWS_SSPI $(SOLARINC) $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 0516a31..05e9aa5 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-   lib/Makefile.vc9 \
+   lib/Makefile.vc10 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index addb47e..26c42f7 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
 curl-7.26.0/lib/Makefile.vc9
-+++ misc/build/curl-7.26.0/lib/Makefile.vc9
+--- curl-7.26.0/lib/Makefile.vc10
 misc/build/curl-7.26.0/lib/Makefile.vc10
 @@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE)
  SSLLIBS  = libeay32.lib ssleay32.lib
  ZLIBLIBSDLL  = zdll.lib
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 42970d3..927b3f1 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -1,7 +1,7 @@
 MSVC: using SOLARINC and EXCFLAGS
 
 curl/lib/Makefile.vc9  2012-05-24 12:07:02.0 -0400
-+++ curl/lib/Makefile.vc9  2012-10-29 11:53:44.658809300 -0400
+--- curl/lib/Makefile.vc10 2012-05-24 12:07:02.0 -0400
 curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400
 @@ -117,7 +117,7 @@
  ZLIBLIBSDLL  = zdll.lib
  ZLIBLIBS = zlib.lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2013-11-18 Thread Michael Stahl 
 external/curl/UnpackedTarball_curl.mk|1 +
 external/curl/curl-msvc-schannel.patch.1 |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit 460d6ce526b79f4d98600d60a63f894e197b66fe
Author: Michael Stahl mst...@redhat.com
Date:   Tue Nov 19 00:06:50 2013 +0100

curl: use WNT native Schannel SSL/TLS implementation

This should give better OS integration for things like adding CAs.

Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 05e9aa5..2e4d4cc 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-freebsd.patch.1 \
external/curl/curl-msvc.patch.1 \
+   external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
 ))
diff --git a/external/curl/curl-msvc-schannel.patch.1 
b/external/curl/curl-msvc-schannel.patch.1
new file mode 100644
index 000..68af66d
--- /dev/null
+++ b/external/curl/curl-msvc-schannel.patch.1
@@ -0,0 +1,22 @@
+MSVC: use WNT native Schannel SSL/TLS implementation
+
+--- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100
 curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100
+@@ -260,7 +260,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_REL)
+ DIROBJ = $(CFG)
+ LNK= $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) 
/IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)
+-CC = $(CCNODBG) $(RTLIB)
++CC = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF
+@@ -411,7 +411,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_DBG)
+ DIROBJ = $(CFG)
+ LNK= $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) 
/IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)
+-CC = $(CCDEBUG) $(RTLIBD) 
++CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2013-10-30 Thread Michael Stahl 
 external/curl/ExternalProject_curl.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 30 13:06:25 2013 +0100

curl: set the right RPATH too

Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 23dce11..142a782 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 ifneq ($(OS),WNT)
 
 curl_CPPFLAGS :=
-curl_LDFLAGS :=
+curl_LDFLAGS := $(if $(filter LINUX 
FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)
 
 ifneq ($(SYSBASE),)
 curl_CPPFLAGS += -I$(SYSBASE)/usr/include
@@ -36,7 +36,7 @@ endif
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(curl_CPPFLAGS) \
-   LDFLAGS=$(curl_LDFLAGS) \
+   LDFLAGS=$(curl_LDFLAGS) \
./configure \
--with-nss$(if $(filter NO,$(SYSTEM_NSS)),=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out) \
--without-ssl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

2013-10-30 Thread Tor Lillqvist 
 external/curl/ExternalProject_curl.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5e50987119d4ac6878911ad07e19680cc30384b9
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Oct 30 20:06:18 2013 +0200

Fix build for Android: Don't use SYSBASE that way

Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 142a782..4b046fc 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -23,10 +23,12 @@ ifneq ($(OS),WNT)
 curl_CPPFLAGS :=
 curl_LDFLAGS := $(if $(filter LINUX 
FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)
 
+ifneq ($(OS),ANDROID)
 ifneq ($(SYSBASE),)
 curl_CPPFLAGS += -I$(SYSBASE)/usr/include
 curl_LDFLAGS += -L$(SYSBASE)/usr/lib
 endif
+endif
 
 # there are 2 include paths, the other one is passed to --with-nss below
 ifeq ($(SYSTEM_NSS),NO)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits