946f457c88
* Fixes CVE-2020-8284 CVE-2021-22924 * Also fixes these which don't look relevant to LO: CVE-2020-8231 CVE-2020-8285 CVE-2020-8286 CVE-2021-22876 CVE-2021-22890 CVE-2021-22897 CVE-2021-22898 CVE-2021-22901 CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926 * disable some new protocols and dependencies * remove curl-ios.patch.1 as the code no longer exists upstream Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
36 lines
1,019 B
Groff
36 lines
1,019 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,20 @@
|
|
# 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_MQTT 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)
|