summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-08-07expand pyuno path separatorsdistro/lhm/libreoffice-4-1-6+backportsCaolá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)
2019-08-07Properly obtain locationStephan Bergmann2-11/+19
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) Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8
2019-08-07keep 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)
2019-08-05Makefile.fetch: fix libpng download, it has MD5SUM variableMichael Stahl1-1/+1
Change-Id: I2938d4b92f64f991887cacb490f6b5cb3407212e
2019-08-05decode 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> (cherry picked from commit 9323b4ff84ffcd33ced656d5277982add00a9b17)
2019-08-05expand 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> (cherry picked from commit 20465aeb082ea239239f598d42041c35b55598d6)
2019-08-05explictly 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) Reviewed-on: https://gerrit.libreoffice.org/74282 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 17046049d5028ab6ef3e0d3bddf18d49e6213126)
2019-08-05sanitize 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) Reviewed-on: https://gerrit.libreoffice.org/74281 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3b490c0f22f06911c17589ff0bf17b4dfbf41726)
2019-06-18mailmerge.py: Use strip in server nameXisco Fauli1-2/+2
Using spaces in the dialog might lead to incorrect server name Reviewed-on: https://gerrit.libreoffice.org/44052 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8) Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92 Reviewed-on: https://gerrit.libreoffice.org/74187 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 6a3c5250066188f127c5445ae1224e19e20ce33a)
2019-06-18tdf#103363: add unicodedata and import idna encoding for mailmergeJulien Nabet2-0/+2
Thank you Moggi for your help on how to add unicodedata module to Python! Reviewed-on: https://gerrit.libreoffice.org/32140 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64) Reviewed-on: https://gerrit.libreoffice.org/74186 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f) Conflicts: external/python3/ExternalPackage_python3.mk Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535
2019-02-07curl: add patches for CVE-2018-16890 and CVE-2019-3822Michael Stahl3-0/+68
The third one (CVE-2019-3823) isn't relevant because SMTP is disabled. Reviewed-on: https://gerrit.libreoffice.org/67445 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9f755aed82154abe29c40899882b3a383aa6f475) Change-Id: I2383c1a7b0c67c586402d4098092cee565edcdda Reviewed-on: https://gerrit.libreoffice.org/67509 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-24Resolves: tdf#92993 access violation on particular .docx on glyph layoutCaolán McNamara1-2/+5
(cherry picked from commit ae850353151cd6a79f7b4a012d0a411013c841a4) Change-Id: I69dfd6747e37ddb1727dd41b99d1b70eaed83425 Reviewed-on: https://gerrit.libreoffice.org/66857 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-10scp2: package new Linux-only libfreeblpriv3.soMichael Stahl2-0/+6
This was added in NSS 3.24 in 488aed9f7c13b04813c3336379f06417f4cde8ab and added to the ExternalPackage but in the 4.1 branch, that is not sufficient, because that is not yet used for installation sets, it needs to be added in scp2 explicitly. Change-Id: I6134952bce4efe243305c156c738605cb296f5dc Reviewed-on: https://gerrit.libreoffice.org/66091 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-22keep pyuno script processing below base uriCaolán McNamara1-2/+28
Conflicts: scripting/source/pyprov/pythonscript.py Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7 Reviewed-on: https://gerrit.libreoffice.org/62174 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-11nss: fix initialisation order, and system zlibThorsten Behrens2-68/+45
Change-Id: Ia2d01d384b13c3b293599a186899d8e5bb381064 Reviewed-on: https://gerrit.libreoffice.org/61679 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-10xmlsecurity: nsscrypto_initialize: try to avoid profile migrationMichael Stahl1-0/+14
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes NSS 3.35 and later will automatically migrate migrate profiles from the old "dbm:" BDB format to the new "sql:" SQLite format. The new format can be read by NSS 3.12 and later, which is old enough that it can be assumed to be available. However LibreOffice still shouldn't migrate the profile on its own: LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is a system Firefox with system NSS libraries, then it's probably a bad idea for LO to migrate the profile under Firefox's nose, particularly considering the "partial migration" scenario if the profile is password-protected. Try to avoid this by checking if the profile is the old format and explicitly using the "dbm:" prefix to prevent the migration. Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82 Reviewed-on: https://gerrit.libreoffice.org/58756 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27)
2018-10-09liborcus: more backport fixes from upstreamThorsten Behrens1-1/+1
Fixup 77102df29789993bad01392e4b285fed865e98be with one extra commit from upstream liborcus (95b06f91d08b827080f472aefab4399a085feda2). Change-Id: I5b3a47706fd7dfc90f969cce1d483365e0e30c29
2018-10-09nss: add glibc2.5 supportThorsten Behrens2-0/+54
htole32 and friends were only added in glibc 2.9 or something Change-Id: I902d5d7ab3be959e8a3aeb18ba3ce1bd519219a8
2018-10-08nss: fix build for LinuxThorsten Behrens1-1/+1
Change-Id: I144609e303b49d2dacd96274c3ec0976822b1dfa
2018-09-22curl: fix CVE-2018-14618Thorsten Behrens2-0/+35
* don't upgrade to new release, just use the patch from git Change-Id: I1f2af0cb388c6a94a817b765d0a1eff9990f1661
2018-09-22nss: upgrade to 3.38Thorsten Behrens5-159/+2560
Fixes CVE-2018-0495 and "the ASN.1 code". (cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef) Change-Id: I0544d31b6338403a75bd35e0de9d72ca6a8086b6
2018-08-19Go back to .bz2 - CentOS5 untar does not know .xz yetThorsten Behrens1-4/+4
This affects zlib and Python backports Change-Id: I5d9c83f663b7d65bd045ac453e0571e53c482058
2018-08-19set Referer on link mediadescriptorCaolán McNamara1-3/+8
to allow determining if the source document is from a trusted/untrusted location Reviewed-on: https://gerrit.libreoffice.org/53693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926) Reviewed-on: https://gerrit.libreoffice.org/53803 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04) Conflicts: sw/source/filter/xml/xmltexti.cxx (cherry picked from commit d7b0063c32502f01fcec72492d131760f4fda990) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
2018-08-19add ww6 test dir and fix a crashCaolán McNamara1-13/+16
Change-Id: Id08176640672095c03e0b124cd65a9dce26ac2db
2018-08-19fix crash on loading certain pptsCaolán McNamara2-7/+9
Change-Id: I544a67e3706c7d12414cc075118ef2f0f5ddd0f6
2018-08-19ofz#372 check if ImplSplit succeededCaolán McNamara2-5/+10
(cherry picked from commit 62a97e6a561ce65e88d4c537a1b82c336f012722) (cherry picked from commit 6431e2bff67e81b4aff4e3b52e67903e1cd566f3) Reviewed-on: https://gerrit.libreoffice.org/32640 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Change-Id: I1e34295fe3ee5f77e787f583616d52fa92a0eca4
2018-08-19disable generation of ole previews in ODF format until after loadCaolán McNamara13-79/+103
so the user update links dialog can control their generation SdrEmbedObjectLink becomes exposed to calc so it can detect if the link dialog needs to be used to update ole links. Reviewed-on: https://gerrit.libreoffice.org/28879 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3) detangle gadzillion checks into something readable no logic change intended (cherry picked from commit fad9786b06d188ba6e354620f57176f3d94a6637) Unmodified default SdrOle2Obj size is 101x101 svx/source/unodraw/unoshape.cxx sets a css::awt::Size maSize to 100, 100 svx/source/unodraw/unopage.cxx increases that by 1, 1 awt::Size aSize = xShape->getSize(); aSize.Width += 1; aSize.Height += 1; to call SdrObjFactory::MakeNewObject with 101, 101 so default size is 101x101 (getWidth() vs GetWidth() confusion ?) Reviewed-on: https://gerrit.libreoffice.org/28895 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7f0a219c9ad38ae33b51ff69d545f69659691c1e) Reviewed-on: https://gerrit.libreoffice.org/28926 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Change-Id: Id1dd7ea17342140eab9307d546528747e3a98090 b6af93afc1f80b7fc36239c96d5e0a71fcbcb789 4d4375dff64d7b8e236d1a24322e749e04ee530f
2018-08-19[PATCH] guard against corrupt m_nNumTabsCaolán McNamara5-10/+22
Includes: - guard against corrupt LwpTocSuperLayout - guard against corrupt SilverBullet - guard against corrupt ObjIndexData Change-Id: I41b8514a127d463ac951e5855f09416fa0456b1b
2018-08-19use correct sizeDavid Tardon2-0/+29
(cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9) Reviewed-on: https://gerrit.libreoffice.org/38827 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 54e7b46718bf2f47c7f55a93cfbb23681429ffc6) Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0
2018-08-19liborcus: backport fixes from upstreamThorsten Behrens4-0/+97
Since we're stuck functionally to the 0.5.x version here, backport relevant fixes from the upstream project Change-Id: I1531682ec3ec7a22d4cf721fc7bf85a57073ca8e
2018-08-19python3: fix misc platform issuesThorsten Behrens5-2/+63
- fix msbuild files for vs2012 - fix micro version - deliver versioned libpython3.3m.so.1.0 Change-Id: I41846893443e48f3859c78f09cdae4b5a6d0975a
2018-08-19python3: Check & prevent integer overflow in PyString_DecodeEscapeThorsten Behrens2-0/+20
Backport from upstream 3.4 / bpo-30657: Fix CVE-2017-1000158 Change-Id: Ic978f7623231ec7e7ca5de992762b17b597ee675
2018-08-19python3: update various patchesThorsten Behrens5-36/+239
- take python-3.3.3-msvc2012-winxp.patch.1 from 6.0 - take python-msvc-disable-sse2.patch.1 from 6.0 - take ubsan.patch.0 from 6.0 - longobject.c and listobject.c bits apparently fixed upstream already - update python-3.3.3-py17797.patch.1 from 6.0 Plus remove obsolete VS2008 support, this is cherry-picked from 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae Change-Id: I1a37e92e9e06a9e66efe6d39234fbe19c2c0c2c6
2018-08-19python3: remove obsolete MSVC2008 patchesMichael Stahl4-355/+0
Change-Id: Ie514017dc186fea4c3f2699e92bfe46706eb6413 (cherry picked from commit 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae)
2018-08-19python3: upgrade to 3.3.7Thorsten Behrens8-298/+14
- update to latest stable from 3.3 branch, with some security fixes - adjust patches - python-3.3.0-implicit-int.patch.1 now upstream - drop patches for unsupported platforms Change-Id: I3aac4f1a702ba7239830c4ebf887bc66afedf9cb
2018-08-19oox: make linking work with TLS = opensslThorsten Behrens1-0/+6
Change-Id: I54b114235dbac276778776f5e08636c39ba3d0fb
2018-08-19openssl: fix WNT buildMichael Stahl1-0/+2
For reasons beyond human understanding, the many-tentacled horror that openssl calls its build system puts headers in "inc32" directory on Windows and "include" on other platforms in 1.0.2g. (cherry picked from commit a420a4346ec21ea561f1321767d6a5eed98df02b) Conflicts: external/openssl/ExternalProject_openssl.mk Change-Id: If03c80f5a31bb6e378cd187051b020579af7f7bd
2018-08-19fixup openssl build - no werror please for vs2012Thorsten Behrens1-0/+11
Change-Id: If166da8874188218e7c055b6258f58f162a80bb0
2018-08-19update openssl to 1.0.2oThorsten Behrens2-2/+3
Change-Id: I6f7308e60ba74bbcec1719c9aeec8e6c21d24ecc
2018-08-19openssl: fix MSVC 64-bit buildMichael Stahl3-13/+26
For whatever reason OpenSSL wants to use "masm" (ml.exe) on 32-bit builds but "nasm" on 64-bit builds - this despite INSTALL.W32 claiming that only nasm is "supported". But /safeseh doesn't make sense on 64-bit anyway because there is no "unsafe" SEH there, so just apply the patch only for 32-bit. Change-Id: Ie32b17dfeeaf11c49ee29c3181021ffa5bd99091
2018-08-19upload openssl 1.0.2kDavid Tardon1-1/+1
Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834 Reviewed-on: https://gerrit.libreoffice.org/33800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-08-19openssl: MSVC build: link and run MSASM with /SAFESEHMichael Stahl1-2/+13
Actually the assembler requires lowercase /safeseh, oddly enough. Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
2018-08-19upgrade openssl to 1.0.2gCaolán McNamara5-60/+69
We can't "break symlinks after extracting tarball" because they populate that dir during the build now. So instead cripple mklink.pl to copy instead of link. (Configure no-symlinks simply skips the symlink step instead of copying, so that appears useless) Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e Reviewed-on: https://gerrit.libreoffice.org/21880 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-19upgrade to openssl-1.0.2aCaolán McNamara6-223/+107
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-19win64: make openssl workThomas Arnhold2-0/+49
fix windows style path separator to unix style, needed for cygwin. Change-Id: I4de78d6901378644857c28a59467b59ef886f47b Reviewed-on: https://gerrit.libreoffice.org/10855 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2018-08-19openssl: stop (ab)using fix_end_of_line to break symlinksMichael Stahl1-54/+9
Win32 make has problems because the command line gets too long. Change-Id: I157b7b2b61353b158b1a3f412331e54aafec206c
2018-08-19openssl: fix WNT patch to applyMichael Stahl1-4/+5
Change-Id: I31494d4314557672b7e3c2ff6846663fb9ed981a
2018-08-19CVE-2014-3566 (etc)Caolán McNamara11-0/+1222
i.e. sync with fedora 20 openssl-1.0.1e security backports Change-Id: I9e07d3aad7f0c7a3fd684d4e52b3b952cfb2f82d Reviewed-on: https://gerrit.libreoffice.org/12003 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-08-19various recent openssl CVEsCaolán McNamara10-0/+464
Change-Id: Ib8989682690a73e5d09fb06617ad9d0938d76ccc Reviewed-on: https://gerrit.libreoffice.org/9666 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-08-19CVE-2014-0160 heartbeatCaolán McNamara2-0/+109
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8 (cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 21:33:42 +0000