89b08e2318
- fixes a very minor CVE: CVE-2017-1000254 - the Windows nmakefiles we were previously using have been removed, so we use the *other* Windows nmake build system now - /EHs override is pointless, default /EHsc should work fine - the macros defined in ExternalProject are not needed any more - curl-msvc-schannel.patch.1: drop, not needed with new makefiles - curl-osx.patch.1: none of it applies, presumably fixed upstream Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66 Reviewed-on: https://gerrit.libreoffice.org/43724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
35 lines
994 B
Groff
35 lines
994 B
Groff
disable protocols nobody needs in MSVC build
|
|
|
|
--- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200
|
|
+++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200
|
|
@@ -733,4 +733,19 @@
|
|
# define ENABLE_IPV6 1
|
|
#endif
|
|
|
|
+#define CURL_DISABLE_DICT 1
|
|
+#define CURL_DISABLE_FILE 1
|
|
+//#undef CURL_DISABLE_FTP
|
|
+#define CURL_DISABLE_GOPHER 1
|
|
+//#undef CURL_DISABLE_HTTP
|
|
+#define CURL_DISABLE_IMAP 1
|
|
+#define CURL_DISABLE_LDAP 1
|
|
+#define CURL_DISABLE_LDAPS 1
|
|
+#define CURL_DISABLE_POP3 1
|
|
+#define CURL_DISABLE_RTSP 1
|
|
+#define CURL_DISABLE_SMB 1
|
|
+#define CURL_DISABLE_SMTP 1
|
|
+#define CURL_DISABLE_TELNET 1
|
|
+#define CURL_DISABLE_TFTP 1
|
|
+
|
|
#endif /* HEADER_CURL_CONFIG_WIN32_H */
|
|
--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 23:41:21.393200000 +0200
|
|
+++ curl/winbuild/MakefileBuild.vc 2017-10-23 23:34:16.028000000 +0200
|
|
@@ -431,7 +431,7 @@
|
|
|
|
EXE_OBJS = $(CURL_OBJS) $(CURL_DIROBJ)\curl.res
|
|
|
|
-all : $(TARGET) $(PROGRAM_NAME)
|
|
+all : $(TARGET)
|
|
|
|
package: $(TARGET)
|
|
@cd $(DIRDIST)
|