summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-08-30Release 5.2.7.9feature/cib_contract136Thorsten Behrens1-1/+1
Change-Id: I70e035962c22bce0b1efc49bc23d8718ab73701a
2019-08-30construct final url from parsed outputCaolán McNamara1-2/+10
Change-Id: Ifd733625a439685ad307603eb2b00bf463eb9ca9 Reviewed-on: https://gerrit.libreoffice.org/77373 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 87959e5deea6d33cd35dbb3b8423056f9566710e) Reviewed-on: https://gerrit.libreoffice.org/77377 (cherry picked from commit c03acb9b8a97254cfcf7c45ef920b93b7f1dd344)
2019-08-30Improve checkStephan Bergmann1-1/+1
Change-Id: I8280a81eef2ced0ff0ace51ea9f094421abafe13 Reviewed-on: https://gerrit.libreoffice.org/78108 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 761e6dd25782420bf06e4a2ff3205a79b6cbb136) Reviewed-on: https://gerrit.libreoffice.org/78129 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ffad51e9e625a22f1efab3da7886baf4134b444f)
2019-08-30Improve check for absolute URIStephan Bergmann1-1/+1
Change-Id: I4dee44832107f72f8f3fb68554428dc1e646c346 Reviewed-on: https://gerrit.libreoffice.org/77706 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c79efeb66f7951305d0334bc288aee1c571a8728) Reviewed-on: https://gerrit.libreoffice.org/77724 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 52f7aa318722bd17c77ee5c4fa8307936e7b53af)
2019-08-30an absolute uri is invalid inputCaolán McNamara1-0/+5
Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc Reviewed-on: https://gerrit.libreoffice.org/77564 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103) Reviewed-on: https://gerrit.libreoffice.org/77572 Tested-by: Jenkins (cherry picked from commit 5445f7ffd09e891b220dabb19cd013bcf591fc08)
2019-08-30gdb pretty-printers: fix StringPrinterHelper for gdb 8.0Michael Stahl2-5/+5
Latest gdb release "lazy_string" validates the array size: Traceback (most recent call last): File "/work/lo/master/solenv/gdb/libreoffice/util/string.py", line 29, in to_string return self.make_string(data, self.encoding, len) File "/work/lo/master/solenv/gdb/libreoffice/util/string.py", line 66, in make_string return data.lazy_string(encoding, length) gdb.error: Length is larger than array size. rtl_uString has "sal_Unicode buffer[1];", which is a lie as the real size is the same as "length". Taking the address of "buffer" appears to avoid the exception. Change-Id: I85710b1adfae584ba09c8d517e9b49b290e79d8a (cherry picked from commit 205677c88cb01e2bbee278443867baed2c89e5fe) (cherry picked from commit 8c3874409539440cae7eda4ab74f2b73f272fbe1)
2019-08-30tdf#109080 First page header/footer ODF (1/2)Luke Deller4-0/+33
The proposal to add <style:header-first> / <style:footer-first> to the ODF standard has not yet been accepted, so meanwhile we should be using an extension namespace for these elements. This first commit (intended for backport) adds support for reading <loext:header-first> / <loext:footer-first> (cherry picked from commit bff8cd3d52223002263dcb8c09758c4fc753b6e3) Reviewed-on: https://gerrit.libreoffice.org/40227 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c027764f94a1fc0a367e03b412d3c11d6c10769c) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I616b6a0acaead9d767ae7d119e539b865f3a6774
2019-08-30NSS fix lcc support patchJan-Marek Glogowski2-0/+12
This hangs the build process with current MSVC cl.exe. It even hangs when just calling "cl -? >/dev/null". Probably a cl.exe bug to detect redirection properly? This adds stdin redirection to /dev/null, like in configure.ac checks. Reviewed-on: https://gerrit.libreoffice.org/75495 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit b11ea5e9c37b19f0d60a4075146668954a7bf728) Change-Id: Ie03c3103ac68cd131dc280755621a8ce0417314f Reviewed-on: https://gerrit.libreoffice.org/75514 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30nss: upgrade to release 3.45Michael Stahl6-550/+9
Fixes CVE-2019-11729 CVE-2019-11719 CVE-2019-11727, and the less important CVE-2018-12384 and CVE-2018-12404 from intermediate releases. Since NSS 3.44 it's possible to build as static libraries and for iOS; drop the nss-chromium-nss-static.patch and nss-more-static.patch and hope that it works. Drop one hunk from nss.patch that looks fixed upstream. Change-Id: I7f37ac36f7f8dfd49d0bfb4a6185ca49d4f618a3 Reviewed-on: https://gerrit.libreoffice.org/75344 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6efc8a33f69bc7f4be45b7b81f67cd74c163b99e) Reviewed-on: https://gerrit.libreoffice.org/75411 Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-30expand pyuno path separatorsCaolán McNamara1-1/+2
Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239 Reviewed-on: https://gerrit.libreoffice.org/77102 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7) Reviewed-on: https://gerrit.libreoffice.org/77120 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30decode url escape codes and check each path segmentCaolán McNamara1-1/+28
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76378 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0) Reviewed-on: https://gerrit.libreoffice.org/76453 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30tdf#126641: don't fail on file URLs with fragmentMike Kaganski1-1/+3
This only fixes part that the URL refuses to open the target file. Honoring fragment isn't fixed here, since it's the system call to ShellExecuteExW that in this case internally converts the file URL into a system path, and strips the fragment from it. Regression from commit d59ec4cd1660410fa1b18c50d2d83b1417a82ddc. Change-Id: I6c9ed27e9a5bd7f2780dd3be96f816a6e825e043 Reviewed-on: https://gerrit.libreoffice.org/76778 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2207269a84c7c9920af3385b837ce67978c720b4) Reviewed-on: https://gerrit.libreoffice.org/76848 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit dd2b7919058fc0e23a7117d39110d3ecaaad1fb2) Reviewed-on: https://gerrit.libreoffice.org/76881 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 72861eaf7cf9af3e7764b13d9e74edc5548806d2) Reviewed-on: https://gerrit.libreoffice.org/77095 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30keep name percent-encodedStephan Bergmann1-1/+3
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b Reviewed-on: https://gerrit.libreoffice.org/77006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc) Reviewed-on: https://gerrit.libreoffice.org/77096 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30Properly obtain locationStephan Bergmann2-11/+19
Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8 Reviewed-on: https://gerrit.libreoffice.org/77019 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a9cde2557242a0c343d99533f3ee032599c66f42) Reviewed-on: https://gerrit.libreoffice.org/77023 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 28c6af3ddc283ca9c5712359a9abcb385c1575b4) Reviewed-on: https://gerrit.libreoffice.org/77097 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30expand LibreLogo check to global eventsCaolán McNamara3-11/+15
Reviewed-on: https://gerrit.libreoffice.org/76189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d) Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f (cherry picked from commit e5702eefdfe6d44a92fdfb3c6a3ff47fec83ee49) Reviewed-on: https://gerrit.libreoffice.org/76452 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30remove LibreLogo from buildMichael Stahl9-53/+2
Conflicts: scp2/AutoInstall.mk setup_native/source/packinfo/packinfo_office.txt sw/Module_sw.mk Change-Id: I62b45ea4890f5693e7d12f2b8c4ae43a9a03d16e
2019-08-30More uses of referer URL with SvxBrushItemStephan Bergmann6-8/+28
Reviewed-on: https://gerrit.libreoffice.org/73643 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d) Conflicts: sw/source/core/text/porfld.cxx sw/source/core/unocore/unosett.cxx Reviewed-on: https://gerrit.libreoffice.org/73860 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced) Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23
2019-08-30explictly exclude LibreLogo from XScript usageCaolán McNamara1-0/+13
Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228 Reviewed-on: https://gerrit.libreoffice.org/73659 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cb0024e3668979dfdef44db5aa15ddfaf035e695)
2019-08-30sanitize LibreLogo callsLászló Németh1-1/+50
Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1 Reviewed-on: https://gerrit.libreoffice.org/73627 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3)
2019-08-30oops, forgot to commit thatMichael Stahl1-1/+1
Change-Id: I7b0a08ca47996f80112f68daef3e2ba5e3be221b (cherry picked from commit 15d46079a5b6429dba0d501e7db218188294587a)
2019-08-30extensions: fix MSVC 2017 build of Library_so_activex_x64Michael Stahl1-1/+3
Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5 (cherry picked from commit 869a249cebaf58d13812194297561fc361dd3a36)
2019-08-30Disable warning C4005 for Vista-compatible SDK 7.1A buildsThorsten Behrens1-1/+2
No point in pulling in all warning fixes from 5.4 Change-Id: I926b2b41628d7059ec9187918ac9df9c1160dfe6
2019-08-30gbuild: stop defining _USING_V110_SDK71_Michael Stahl1-1/+0
Change-Id: Ic8eee967269b3666b15795f20ee62817dadfb0ff (cherry picked from commit 713ed7b338b467b176af7eb5e9a80559b8496e8e)
2019-08-30gbuild: define _WIN32_WINNT = _WIN32_WINNT_WIN7 = 0x0601Michael Stahl1-6/+4
And rely on implicitly derived _WIN32_IE = _WIN32_IE_WIN7 = _WIN32_IE_IE80 Change-Id: I94717e2ed66387bdc76f9047c02c0820d4adc1f9 (cherry picked from commit 2829dabaf37e6d9c736430f3fb9bbfb786b078ad)
2019-08-30scp2: package 64-bit MSVC runtimes for explorer extensionsMichael Stahl2-4/+12
Not a backport because master is a bit too refactored now. Reviewed-on: https://gerrit.libreoffice.org/38365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ab4344c34ddf048adf9a3fad0dd1fa2970935550) Conflicts: scp2/source/winexplorerext/file_winexplorerext.scp Change-Id: I1eccb99252fb66dc1fcc9cb5af978c61717ff629
2019-08-30tdf#105311 VC++ Runtime installed in wrong directoryDavid Ostrovsky5-1/+141
Starting from MSVC 14.0, the directory table layout of VC++ Runtime merge module changed. As consequence, all MSI produced with newer compilers, including MSVC 15.0 (aka VS 2017) are broken in term that the VC++ Runtime DLLs are installed in the wrong directory, e.g.: C:\System64. According to the specification for merging merge module (msm), see: "Authoring Merge Module Directory Tables": [1], custom action 51 (set property) must be emitted for every directory name in the merge module directory table if the directory name is starting with the standard directory name. Quoting it here: " When a predefined directory is included in a merge module, the merge tool automatically adds a Custom Action Type 51 to the target database. The merge module author must ensure that a CustomAction table is also included. The CustomAction table may be empty, but this table is required to exist in the target database and ensures that the modified predefined directories are written to the correct locations. For example, when a system directory is included in a merge module, the merge module author must ensure that a Custom Action table exists. Note that the matching algorithm for the generation of these type 51 custom actions only checks that the directory name begins with one of the predefined SystemFolder properties. It does not verify that the directory name exactly equals the directory property. Any directory beginning with one of these standard folder names gets a type 51 custom action, even if the rest of the name is not a GUID. Authors need to take care that this does not generate false positive matches, and unintended custom action generation, on derivative primary keys that begin with one of the SystemFolder properties." Rectify the problem by analyzing the directory table from the merge module, checking whether the directory name starts with the standard prefix name and if it is the case, emitting custom action 51 to set this variable to the standard directory name. Implementation details: We use the existing facility for emitting the custom action table events including referencing them in the corresponding sequence tables. Given that the specification above doesn't mention what sequence table should be referencing this emitted custom action, we reversed engineer this information from WiX toolkit. Merging the VC++ CRT module with WiX toolkit and investigating the resulting MSI with Orca MSI reader, reveals that these sequence tables were referencing from these sequence tables: * AdminExecuteSequence * AdminUISequence * AdvtExecuteSequence * InstallExecuteSequence * InstallUISequence Replicate this behaviour here as well. Note, though, that custom actions are generally not referenced in AdminUISequence and AdvtExecuteSequence tables in LibreOffice MSI building tool chain. Rendering of the custom action is achieved by programmatic emulation of custom action in SCP module. Consider this similar SCP module based action: Name = "MigrateInstallPath"; Typ = "321"; Source = "shlxtmsi.dll"; Target = "MigrateInstallPath"; Inbinarytable = 1; Assignment1 = ("InstallExecuteSequence", "", "CostInitialize"); Assignment2 = ("InstallUISequence", "", "CostInitialize"); We instantiate the following data structure to emit custom action System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1: Name = "System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1" Typ = "51" Source = "System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1" Target = "[System64Folder]" Styles = "NO_FILES" Assignment1 = ("AdminExecuteSequence", "", "CostInitialize") Assignment2 = ("InstallExecuteSequence", "", "CostInitialize") Assignment3 = ("InstallUISequence", "", "CostInitialize") [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa367787%28v=vs.85%29.aspx Change-Id: I2fbd37ff63298d99b2ba1b6afe6e875f56d8e378 Reviewed-on: https://gerrit.libreoffice.org/33366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 30473907a565764eb35a19051dc0d52704cf7bb7)
2019-08-30const fixes for python3-devel-3.7.0-1.fc29.x86_64Stephan Bergmann3-3/+3
Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c Reviewed-on: https://gerrit.libreoffice.org/56841 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 76a29148be63cb006a7e25e312dc93acc93e071f)
2019-08-30tdf#122134: use CurrentMajorVersionNumber to filter out Windows 10Mike Kaganski4-3/+5
On Windows 8.1, the one that is problematic to tell from Windows 10 (because the latter also exposes its version as 603 to the msiexec), the registry value doesn't exist at HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion but let's play safe and also check for "#6" value just in case. Reference: https://stackoverflow.com/questions/31072543/reliable-way-to-get-windows-version-from-registry Thanks to Mitchell <blazer64@gmail.com> for the idea! Reviewed-on: https://gerrit.libreoffice.org/65231 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit d87fa557ff58c3b9f5c9079a1d7595e095694111) Reviewed-on: https://gerrit.libreoffice.org/65242 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 72f2fbc75dc254ea8e13527b592bd0b4fb946bab) Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt Change-Id: Ic907c4d992a7cb1d12e392686c19cd6fd6da3c7c
2019-08-30tdf#108580 related: improve existing redist detectionMike Kaganski1-0/+12
This uses VC Runtime upgrade code (checked using Upgrade table) to find installed redist, instead of checking registry keys that change between versions (while the runtime is still compatible, as with 2015 and 2017). Also, it checks if UCRT is present. Now, if either VC Runtime or UCRT is absent, we try to install the redist. This would allow to install UCRT in scenarios when first install was attempted on a system not suitable for UCRT (like Win7 w/o SP1, or Win8.1 w/o April 2014 update rollup), where VC Runtime gets installed, but UCRT is still missing. We use the ucrtbase.dll version to check that; and as the expected version is 10.x, we take into account that Win10 lies about versions. Reviewed-on: https://gerrit.libreoffice.org/52794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 1f8a3657216e44796cb94087450552aa977ebdae) Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt Change-Id: I864dfc09cf1bdc775501729fa2a27dc98295588c
2019-08-30tdf#121987: Don't fail installation if failed to enable WU serviceMike Kaganski1-19/+47
Since commit 1882827320ed760de82211cf690b686f8d34ff74, an attempt to install UCRT will be performed regardless there is an evidence that it's present on the system, to workaround some cases where the existing UCRT is broken (tdf#115405, tdf#119910). But that made other errors to emerge: on systems where users disable WU service using some exotic ways, installer is unable to enable the service, and fails. [1][2] Examples of such hard-disables are using `sc delete` [3] and associating WU service with a guest account. Many such cases are reported for Windows 10, where installation of the UCRT is not required. So the solution (imperfect, but possibly the best possible here) is to allow installer to continue in case of failure enabling the service. This will automatically eliminate all problems related to Win10; and also for cases where users are advanced enough (the majority of such hard-disable cases should be those), it might be enough to add a relevant FAQ entry. [1] https://ask.libreoffice.org/en/question/172227/cannot-install-631/ [2] https://ask.libreoffice.org/en/question/175571/installation-failed-unknown-error-win10x64/ [3] https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/sc-delete Change-Id: Ie85016eb6f0667f39412a3089fe1b1855cb1fc73 Reviewed-on: https://gerrit.libreoffice.org/64825 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 53058090beede6a399e2f408f62c28a2921ff8ab) Reviewed-on: https://gerrit.libreoffice.org/64829 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-08-30tdf#115405, tdf#119910: don't check if UCRT is already installedMike Kaganski2-7/+7
There appears to be common situation that a system has *some* UCRT libraries in System32, that were installed improperly (presumably by some applications using simple copy).In these cases, our installer would detect the presence of ucrtbase.dll, and not try to install UCRT on the system. Unfortunately, it seems that oftentimes such improper UCRT installations miss some parts of UCRT, which leads to LibreOffice failing to start with messages like "The program can't start because api-ms-win-crt-string-l1-1-0.dll is missing from your computer. Try reinstalling the program to fix this problem." (the missing component varies). This patch removes the check for UCRT presence. Installer will try to install UCRT on applicable systems unconditionally. Since the proper outcomes in case of already present UCRT are either WU_S_ALREADY_INSTALLED or WU_E_NOT_APPLICABLE and both are treated as success in inst_msu action (see InstallMSU in setup_native/source/win32/customactions/inst_msu/inst_msu.cxx), this should only make this part more robust, and not bring new problems (yes, I know that actually there will be new problems, as usual). Reviewed-on: https://gerrit.libreoffice.org/60789 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 1882827320ed760de82211cf690b686f8d34ff74) Reviewed-on: https://gerrit.libreoffice.org/61444 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Change-Id: I22a3d357014d31a8e492ff8a15bcb477eeb79735
2019-08-30tdf#118869: mark some properties secure to pass them to elevated installMike Kaganski1-1/+1
See also http://helpnet.flexerasoftware.com/installshield19helplib/helplibrary/ISBP10.htm Change-Id: I217d68f98af8e56874af6c071bb7fa7354b3e4b4 Reviewed-on: https://gerrit.libreoffice.org/58326 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit ec9b18b75c193c914691a29d3eb78bd81961fced) Reviewed-on: https://gerrit.libreoffice.org/58338 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-08-30Install UCRT from MSUs, not using nested VC Redist installMike Kaganski15-22/+807
Using nested install is bad because (1) MS advises against it (though it most possibly doesn't relate to our specific case, when we install the vc redist exe package in UI part, so actually only a single MSI session is active at any time); (2) because it adds some extra interactions (user sees something "unrelated" being installed, which raises concerns; additional admin authentication required); and (3) because it runs in InstallUISequence, thus only installing the UCRT when doing interactive installation (unattended installs, including GPO, need to install UCRT separately). This patch aims to incorporate the original UCRT MSU (Windows Update) packages (https://support.microsoft.com/en-us/help/2999226) available as a zip archive from https://www.microsoft.com/en-us/download/details.aspx?id=48234 - the same as used in VC redists for VS 2015 and 2017. This obsoletes the separate installation of the redist; since we also have the redist as merge module in our MSI, that is enough (and removes redundancy). The MSUs are installed using wusa.exe in a custom action (deferred, non-impersonating). As a small bonus, embedding MSUs instead of redist EXE allows us to shrink the size of installer a little (~10 MB). As deferred custom actions cannot access current installer database, we workaround this by using initial immediate impersonating action to extract the binaries into a temporary location. To ensure that the file gets removed upon completion (both successful and failed), we use an additional cleanup action. Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted. Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd Reviewed-on: https://gerrit.libreoffice.org/52923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-08-30MSVC 14.0: Fix warning C4702: unreachable codeDavid Ostrovsky1-1/+1
Change-Id: I38db92984daae40981f2d3f60c4efa38684d5328 Reviewed-on: https://gerrit.libreoffice.org/34382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 996960f5a25c0833942c03b94356d2137c4d7557)
2019-08-30libpng: upgrade to release 1.6.37Michael Stahl1-2/+2
Fixes CVE-2019-7317. Reviewed-on: https://gerrit.libreoffice.org/71663 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e2abbc0062398ea67cb13cb5b0b7bfdce78e652c) Change-Id: I3374f5cbd6552e2c1569d63ee680d0c1d9389621
2019-08-30Filter out problematic file URLsStephan Bergmann2-0/+153
(cherry picked from commit 7e50e885ebbe130debcd4278a10a4e288655fdfc) Conflicts: shell/source/win32/SysShExec.cxx Reviewed-on: https://gerrit.libreoffice.org/70188 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a35068ba25ed9da37bcb20598c9791b6979cf1ef) Change-Id: I87fd37e56326bef4888354b923407530c6f70760
2019-08-30New o3tl::runtimeToOUString to convert from C++ runtime NTBS to OUStringStephan Bergmann1-0/+48
Change-Id: I613bb70b6828f615fd45af38b2d873ece55ace60 (cherry picked from commit d689ad29c28ad7f077c2239a8fa4c2b6307a6aa1) Reviewed-on: https://gerrit.libreoffice.org/71591 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-30libxslt: add patch for CVE-2019-11068Michael Stahl2-0/+121
Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4 Reviewed-on: https://gerrit.libreoffice.org/70879 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e) Reviewed-on: https://gerrit.libreoffice.org/70894 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)
2019-08-30openssl: remove MinGW patchMichael Stahl2-124/+0
This breaks the OPENSSL_IMPLEMENT_GLOBAL macro quite badly, which is also used on MSVC builds, and MSVC warns about the breakage. Change-Id: I8f4c7c8097e7d737ca32d6a020a569c0a99b92d4
2019-08-30openssl: try to fix build with 7.1A SDKMichael Stahl1-1/+1
Change-Id: Ic4a9e53227e34fe41a69afd52a9e91ef9545f8f9
2019-08-30python3: upgrade to release 3.5.7Michael Stahl4-3/+66
Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647 Reviewed-on: https://gerrit.libreoffice.org/70182 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c) Reviewed-on: https://gerrit.libreoffice.org/70194 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b) Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
2019-08-30upgrade to python 3.5.6Caolán McNamara2-3/+3
Reviewed-on: https://gerrit.libreoffice.org/66519 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 6808e1e5e2361220988dfa81cb35d03fb6e15855) Change-Id: I6cdfc50b2385c426e20ce0e9b216b18c763249b8
2019-08-30configure: try to keep PYTHON_VERSION from going staleMichael Stahl1-0/+3
Since it was set to 3.5.0, the bundled python was upgraded twice, but the directory is still named python-core-3.5.0 :( Reviewed-on: https://gerrit.libreoffice.org/41433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5) Reviewed-on: https://gerrit.libreoffice.org/56683 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a
2019-08-30poppler: upgrade to release 0.74.0Michael Stahl4-8/+36
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f) Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906
2019-08-30openssl: upgrade to release 1.0.2rMichael Stahl1-2/+2
Fixes CVE-2019-1559, plus a couple low-severity CVEs. Reviewed-on: https://gerrit.libreoffice.org/68430 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd) Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b
2019-08-30upgrade to openssl 1.0.2pCaolán McNamara1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/59926 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dd371caa3aff09c80c19772fcf5968cfcf14ff8c) Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b
2019-08-30upload openssl 1.0.2oDavid Tardon1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/52051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b) Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042
2019-08-30upload openssl 1.0.2mDavid Tardon1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/44421 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 899d7139355b8bea4bc1e6f9c05dededdb6f2c39) Change-Id: Iac75c0a2633a11c4ca3f2007c62bf74be2f576ca
2019-08-30upload openssl 1.0.2kDavid Tardon2-3/+3
Reviewed-on: https://gerrit.libreoffice.org/33800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a97371bf4d123ece75f3f9aeef8f3d4abfc6ad9c) Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834
2019-08-30mDNSResponder: upgrade to release 878.200.35Michael Stahl4-108/+2
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). Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e) Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb