configure.ac | 2 download.lst | 15 +- external/cairo/ExternalPackage_cairo.mk | 2 external/mdnsresponder/UnpackedTarball_mDNSResponder.mk | 5 external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 | 85 ------------ external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 | 16 -- 6 files changed, 10 insertions(+), 115 deletions(-)
New commits: commit feac8b003aee8168c46f8b00e279bc14add321fb Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Feb 22 14:38:48 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Feb 22 14:38:48 2019 +0100 Bump version to 5.3-63 Change-Id: Ibfe53436137cc5fa3de6c857176e7fdcd4083e42 diff --git a/configure.ac b/configure.ac index 418b05915f82..12f76b089db1 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.59],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.63],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit 963fcfcb6fc40811e3efd132fb07626b3094e843 Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Wed Feb 20 15:23:11 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Feb 22 14:30:53 2019 +0100 mDNSResponder: upgrade to release 878.200.35 Apple can't afford the costly GPG licenses to sign releases apparently, but the sha256 matches some OpenWRT and FreshPorts repos... Fixes CVE-2015-7988. Removing windows build patches, fixed upstream (except for the last hunk of the SOCKET patch, but that is in code that is only used on MacOSX). Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/download.lst b/download.lst index 8cea5fb5fa7f..6bb974abc429 100644 --- a/download.lst +++ b/download.lst @@ -110,8 +110,8 @@ export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz export MDDS_MD5SUM := 8855cf852a6088cfdc792c6f7ceb0243 export MDDS_TARBALL := mdds-1.2.2.tar.bz2 -export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762 -export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz +export MDNSRESPONDER_MD5SUM := e773f290a7d29f1072247985d6add2ff +export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk index 5b0140e4c149..9b436b2f077c 100644 --- a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk +++ b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mDNSResponder)) $(eval $(call gb_UnpackedTarball_set_tarball,mDNSResponder,$(MDNSRESPONDER_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,mDNSResponder,\ - external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 \ - external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 b/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 deleted file mode 100644 index 9952f86e88ec..000000000000 --- a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 +++ /dev/null @@ -1,85 +0,0 @@ -commit 77838efb0748689ee77007a92d9a01e03e6dbdb7 -Author: Stephan Bergmann <sberg...@redhat.com> -AuthorDate: Fri Nov 27 22:40:23 2015 +0100 -Commit: Stephan Bergmann <sberg...@redhat.com> -CommitDate: Sat Nov 28 14:00:07 2015 +0100 - - Use proper return type for DNSServiceRefSockFD - - ...which is e.g. unsigned long long for Windows 64-bit (and declaring the - function in dns_sd.h is not necessary, and the dnssd_sock_t typedef is not known - there) - - Change-Id: Iaa0eb03a83b76200204ba905313bcc27b5007b39 - -diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h -index 31daaeb..faaa741 100644 ---- a/mDNSShared/dns_sd.h -+++ b/mDNSShared/dns_sd.h -@@ -741,35 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty - * - *********************************************************************************************/ - --/* DNSServiceRefSockFD() -- * -- * Access underlying Unix domain socket for an initialized DNSServiceRef. -- * The DNS Service Discovery implementation uses this socket to communicate between the client and -- * the daemon. The application MUST NOT directly read from or write to this socket. -- * Access to the socket is provided so that it can be used as a kqueue event source, a CFRunLoop -- * event source, in a select() loop, etc. When the underlying event management subsystem (kqueue/ -- * select/CFRunLoop etc.) indicates to the client that data is available for reading on the -- * socket, the client should call DNSServiceProcessResult(), which will extract the daemon's -- * reply from the socket, and pass it to the appropriate application callback. By using a run -- * loop or select(), results from the daemon can be processed asynchronously. Alternatively, -- * a client can choose to fork a thread and have it loop calling "DNSServiceProcessResult(ref);" -- * If DNSServiceProcessResult() is called when no data is available for reading on the socket, it -- * will block until data does become available, and then process the data and return to the caller. -- * The application is reponsible for checking the return value of DNSServiceProcessResult() to determine -- * if the socket is valid and if it should continue to process data on the socket. -- * When data arrives on the socket, the client is responsible for calling DNSServiceProcessResult(ref) -- * in a timely fashion -- if the client allows a large backlog of data to build up the daemon -- * may terminate the connection. -- * -- * sdRef: A DNSServiceRef initialized by any of the DNSService calls. -- * -- * return value: The DNSServiceRef's underlying socket descriptor, or -1 on -- * error. -- */ -- --int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef); -- -- - /* DNSServiceProcessResult() - * - * Read a reply from the daemon, calling the appropriate application callback. This call will -diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c -index c38197c..c6b50a2 100644 ---- a/mDNSShared/dnssd_clientstub.c -+++ b/mDNSShared/dnssd_clientstub.c -@@ -799,7 +799,7 @@ cleanup: - return err; - } - --int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) -+dnssd_sock_t DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) - { - if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD called with NULL DNSServiceRef"); return dnssd_InvalidSocket; } - -@@ -816,7 +816,7 @@ int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) - return dnssd_InvalidSocket; - } - -- return (int) sdRef->sockfd; -+ return sdRef->sockfd; - } - - #if _DNS_SD_LIBDISPATCH -@@ -2025,7 +2025,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue - dispatch_queue_t queue - ) - { -- int dnssd_fd = DNSServiceRefSockFD(service); -+ dnssd_sock_t dnssd_fd = DNSServiceRefSockFD(service); - if (dnssd_fd == dnssd_InvalidSocket) return kDNSServiceErr_BadParam; - if (!queue) - { diff --git a/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 b/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 deleted file mode 100644 index 9f5c06260b12..000000000000 --- a/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ ---- mDNSResponder/mDNSShared/dnssd_clientstub.c.orig 2015-11-30 16:36:08.081554188 +0100 -+++ mDNSResponder/mDNSShared/dnssd_clientstub.c 2015-11-30 16:38:35.749542735 +0100 -@@ -579,7 +579,12 @@ - else - { - syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: connect() failed path:%s Socket:%d Err:%d Errno:%d %s", -- uds_serverpath, sdr->sockfd, err, dnssd_errno, dnssd_strerror(dnssd_errno)); -+#if defined(USE_TCP_LOOPBACK) -+ MDNS_TCP_SERVERADDR, -+#else -+ uds_serverpath, -+#endif -+ sdr->sockfd, err, dnssd_errno, dnssd_strerror(dnssd_errno)); - dnssd_close(sdr->sockfd); - FreeDNSServiceOp(sdr); - return kDNSServiceErr_ServiceNotRunning; commit ca2fe7d646fb62f046b81a524cbcb3457252e89e Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Fri Feb 22 13:53:17 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Feb 22 13:53:17 2019 +0100 libjpeg-turbo: upgrade to release 1.5.3 Fixes CVE-2017-15232, which looks rather minor. Change-Id: Icffb0c5160bef79577431a02eb10ed9492e01d11 Reviewed-on: https://gerrit.libreoffice.org/68091 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/download.lst b/download.lst index cf2117c9e43f..8cea5fb5fa7f 100644 --- a/download.lst +++ b/download.lst @@ -81,8 +81,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export JPEG_TURBO_MD5SUM := 86b0d5f7507c2e6c21c00219162c3c44 -export JPEG_TURBO_TARBALL := libjpeg-turbo-1.4.2.tar.gz +export JPEG_TURBO_MD5SUM := 7c82f0f6a3130ec06b8a4d0b321cbca3 +export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz export LANGTAGREG_MD5SUM := 59a3595c1052c5b51f996f44fe9994b9 export LANGTAGREG_TARBALL := language-subtag-registry-2017-04-19.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 commit 77f9849e8da15174876dde027d86289648256d85 Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Fri Feb 22 13:47:46 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Feb 22 13:47:46 2019 +0100 cairo: upgrade to release 1.16.0 This fixes some minor CVEs. Not including the fix for CVE-2018-18064, which does not affect LO because we use the default implementation of FT_Memory which uses free/malloc. Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd Reviewed-on: https://gerrit.libreoffice.org/68088 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/download.lst b/download.lst index ff5b360c3150..cf2117c9e43f 100644 --- a/download.lst +++ b/download.lst @@ -12,7 +12,8 @@ export BREAKPAD_TARBALL := breakpad.zip export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz -export CAIRO_TARBALL := 23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz +export CAIRO_MD5SUM := f19e0353828269c22bd72e271243a552 +export CAIRO_TARBALL := cairo-1.16.0.tar.xz export CDR_MD5SUM := e369f30b5b861ee0fc4f9e6cbad701fe export CDR_TARBALL := libcdr-0.1.3.tar.bz2 export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index b1686973537a..6c9ec5ed1594 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) ifneq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.6)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11600.0)) endif commit d4c92d8dea89025e7ce7d977aca83ed9f1eac7ae Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Fri Feb 22 13:33:45 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Feb 22 13:33:45 2019 +0100 curl: upgrade to release 7.64.0 fixes CVE-2018-16890 and CVE-2019-3822 Change-Id: I4c0021a5002590659cbfbdf642a7704a05309bf2 Reviewed-on: https://gerrit.libreoffice.org/67444 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/download.lst b/download.lst index 81641caeddba..ff5b360c3150 100644 --- a/download.lst +++ b/download.lst @@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-mas export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_MD5SUM := 6121427a7199cd6094fc48c9e31e8992 -export CURL_TARBALL := curl-7.63.0.tar.gz +export CURL_MD5SUM := a026740d599a32bcbbe6e70679397899 +export CURL_TARBALL := curl-7.64.0.tar.gz export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits