summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
27 hoursadd notify for script usedistro/mimo/mimo-7-0Caolán McNamara1-0/+3
Change-Id: I84af197cec7755f6803a578e1e21c03966ad5f3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165410 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit a4a5c6b63599bca1f084bb90875f6fd8e15184ac) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167420 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-12-08Bump version to 7.0.7.0.M14mimo-7.0.7.0.M14Aron Budea1-1/+1
Change-Id: Ibc8d81e161e68022077c191eb6567451cdc83221
2023-11-29reuse AllowedLinkProtocolFromDocument in impress/drawCaolán McNamara1-11/+18
Change-Id: I73ca4f087946a45dbf92d69a0dc1e769de9b5690 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159843 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit f0942eed2eb328b04856f20613f5226d66b66a20) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159759 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159884 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 569fa7f755718a06f23d25b2132bf0400cec7a0f) (cherry picked from commit b60bd2dddc4b9d6d60615d61051a9f9ee5410851) (cherry picked from commit 8b244a0ce8a9170a1fd61e19a0c943230a741fbe) (cherry picked from commit 87535988868baac08173fc826dbb6c6cbdf91dd4) (cherry picked from commit fd809982a280218046ab7e6e6d24492420143e6c) (cherry picked from commit 56dd18f55d14939a1d5697e8580efd580bae0da7) (cherry picked from commit 5aa0ae5fffe3a6f98e2ae4a677a20a8f95d3eed3)
2023-11-29reuse AllowedLinkProtocolFromDocument in writerCaolán McNamara6-52/+62
reorg calc hyperlink check to reuse elsewhere Change-Id: I20ae3c5df15502c3a0a366fb4a2924c06ffac3d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159487 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit e6a7537762e19fde446441edd10d301f9b37ce75) reuse AllowedLinkProtocolFromDocument in writer Change-Id: Iacf5e313fc6ca5f7d69ca6986a036f0e1ab1f2a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159488 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 32535dfa82200b54296838b52285c054fbe5e51d) combine these hyperlink dispatchers into one call Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb) we can have just one LoadURL for writer Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159858 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e32b8601dbd63cf01497889601d6c9c1241106d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159883 (cherry picked from commit 6d29ee15039a567ad5f70a3e51289fea93c1f64e) (cherry picked from commit 6708272c15941d94ab828a188e06a0addca1dd15) (cherry picked from commit 8423af18d7b8b82d106acede33720457071e79e9) (cherry picked from commit 6aa0be1d2905b77e567ca32446b61ab2e9bef0b1) (cherry picked from commit 583a30728042993d7fcacccf49c8e338150f2f44) (cherry picked from commit dd7e7a8b0004dc24c9880cc91368ed8512c35f01) (cherry picked from commit 782f9422888322f9ec54d98b6f31b5f372170ff7)
2023-11-29default to ignoring libreoffice special-purpose protocols in calc hyperlinkCaolán McNamara8-7/+58
Change-Id: Ib9f62be3acc05f24ca234dec0fec21e24579e9de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158911 Tested-by: Jenkins Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit b6062623b4d69c79e90e9365ac7c5e7f11986793) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159046 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit cfe5672c069d6ed3a62dfc3370fdfbc80b6de434) (cherry picked from commit 5109649b65206ca6abd823fe2ccf07925e36d71b) (cherry picked from commit 01e7c1682b544266f7b85d58127e878484ea46b0) (cherry picked from commit ee4849d06b7db4dbb0bed9696c548ace8f8d8313) (cherry picked from commit 1b0c07506acadd615c560cbaa67f4bcb17132c24) (cherry picked from commit 1a30b62ac7c23dd12aee88f0b90d8a715c652475)
2023-11-29warn about exotic protocols as wellCaolán McNamara4-4/+5
Change-Id: I50dcf4f36cd20d75f5ad3876353143268740a50f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158902 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit aafe05584e601236e84a165f2816b187189cfb77) (cherry picked from commit 799f0225d7171e6c04324ace1f31c7fe976662a4) (cherry picked from commit ae06669597e5a485676ba4394822cba8bb88d394) (cherry picked from commit a7138808fbb8eb263af436ee4227cbe9c829b676) (cherry picked from commit 19316aacbb9f1774565a157d21e70c88c490cef6) (cherry picked from commit 13c0bdee068ad4af1f4e03461580ec7bddeb0d63)
2023-11-29add some protocols that don't make sense as floating frame targetsCaolán McNamara3-1/+19
Change-Id: Id900a5eef248731d1184c1df501a2cf7a2de7eb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158910 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 11ebdfef16501c6d35c3e3d0d62507f706557c71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158901 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 73e90d15c48a8f148e4e8f024cdf1b397efbcc53) (cherry picked from commit b35aa37a5d1f32a419e7f311e415615808731acd) (cherry picked from commit 421be99a6b101ac4ec91ad95b48c50fa17e47d36) (cherry picked from commit fa390145228c9b9a044698fe4b7636c05210fda3) (cherry picked from commit e549b65636b31971d8fb7fafc92e683bdef35cb6) (cherry picked from commit eb42c9ad6473fb84fb5c02e522efe01e68e3ce43)
2023-11-29escape url passed to gstreamerCaolán McNamara1-5/+9
Change-Id: I3c93ee34800cc8563370f75ef3ef6f8a9220e6ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158895 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 2ee1167da1952b133280db2ae26eed6bf0303bc2) (cherry picked from commit a77d9c151f043f070512488d84f0b839f4ed4553) (cherry picked from commit 2b896a0ba8818804b89735bd7c8991fa8eb3d7b5) (cherry picked from commit 0f14350fe70907d4466bcef15bfe05865b37babd) (cherry picked from commit 9b7df77e3491add0919d8de993df0f40d7c58a70) (cherry picked from commit 714e464631533901314f3189ce293dca47bec20e)
2023-11-29fix build for recent gccCaolán McNamara25-2/+79
Change-Id: I0da00c17ca5959d6845b5d006fec17fe16b17cfe (cherry picked from commit 579215d60f5e721837f7ba0ac43686b0592e0e1f)
2023-05-24Bump version to 7.0.7.0.M13mimo-7.0.7.0.M13Andras Timar1-1/+1
Change-Id: I007eb67802b639de42572ce9ea2faf3644127d65
2023-05-23assume IFrame script/macro support isn't neededCaolán McNamara1-8/+4
seems undocumented at least Change-Id: I316e4f4f25ddb7cf6b7bac4d856a721b987207a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151020 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152153 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-23put floating frames under managed links controlCaolán McNamara15-86/+331
like we do for sections and ole objects that link to their content individual commits in trunk are: extract a OCommonEmbeddedObject::SetInplaceActiveState for reuse no behaviour change intended Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150341 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 183e34a3f8c429c0698951e24c17844e416a3825) use parent window as dialog parent it makes no odds, but is more convenient for upcoming modification Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150342 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f93edf343658abd489bde3639d2ffaefd50c0f99) adjust IFrameObject so it could reuse mxFrame for a reload of content Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150343 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3a727d26fd9eb6fa140bc3f5cadf3db079d42206) query getUserAllowsLinkUpdate for the case of content in a floating frame similarly to how it works for the more common "normal" embedded objects Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149971 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 52aa46468531918eabfa2031dedf50377ae72cf7) add a route to get writer Floating Frame links under 'manage links' Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150349 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8b8a2844addbd262befb1a2d193dfb590dfa20be) allow SvxOle2Shape::resetModifiedState to survive having no SdrObject Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150538 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 02379929bd0e1d1676635f0ca1920422702ebb7c) create the FloatingFrameShape in a separate step to inserting it this is derived from the path taken by the AddShape(const OUString&) function for this case. No change in behavior is intended. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150526 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit bafec47847a0b9697b3bbe9358e53f8118af3024) add a route to get calc Floating Frame links under 'manage links' much harder than writer because the organization and ordering of properties and object activation etc is different. This ended up ugly, but functions. We set FrameURL before AddShape, we have to do it again later because it gets cleared when the SdrOle2Obj is attached to the XShape. But we want FrameURL to exist when AddShape triggers SetPersistName which itself triggers SdrOle2Obj::CheckFileLink_Impl and at that point we want to know what URL will end up being used. So bodge this by setting FrameURL to the temp pre-SdrOle2Obj attached properties and we can smuggle it eventually into SdrOle2Obj::SetPersistName at the right point after PersistName is set but before SdrOle2Obj::CheckFileLink_Impl is called in order to inform the link manager that this is an IFrame that links to a URL Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150539 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 07179a5a5bd00f34acfa8a3f260dd834ae003c63) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150755 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> bc5333b137d2da089b3b701ff615c6ddf43063d0 7eec3132a23faafd9a2878215a0a117a67bc9bf2 83e38dfa2f84907c2de9680e91f779d34864a9ad f90ff71d6a96342574799312f764badaf97980eb ea059262c124e3f44249e49b4189732310d28156 d09ae0c65a55a37743ad7c184070fb8dd97d8a7f 67fc199fef9e67fa12ca7873f0fe12137aa16d8f Change-Id: Ia1d12aa5c9afdc1347f6d4364bc6a0b7f41ee168 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152142 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-23set Referer on loading IFramesCaolán McNamara1-7/+14
so tools, options, security, options, "block any links from document not..." applies to their contents. Change-Id: I04839aea6b07a4a76ac147a85045939ccd9c3c79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150221 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150751 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit acff9ca0579333b45d10ae5f8cd48172f563dddd) (cherry picked from commit 04c8176fb40d2eb983aa0bd0a6ce65804d3f6ecd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152113 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-04-02Bump version to 7.0.7.0.M12mimo-7.0.7.0.M12Andras Timar1-1/+1
Change-Id: Ie2b76242f6d09a7b39f763ebab074b31fc2c66c2
2023-04-02curl: upgrade to release 8.0.0Michael Stahl1-2/+2
Fixes CVE-2023-27535. Also hopefully fixes excessive storage consumption during build: o build: drop the use of XC_AMEND_DISTCLEAN [62] Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bbe0d0534abe6480c4502ce8fb543a736d3399d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149105 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 38b54a4d86e05bbbbdbf2a38771395579d1b005a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149108 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 383128f262ea7fef7b6e372dc364a32d6cb0a7da) curl: upgrade to release 8.0.1 Apparently 8.0.0 had a serious regression. Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149204 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e5005c76bd60a004f6025728e794ba3e4d0dfff1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149112 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f2d935242665774f080bb13a2814988ad615f6e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149321 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02curl: upgrade to release 7.88.1Taichi Haradaguchi3-7/+8
Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO. Reference: https://curl.se/docs/security.html Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147977 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6074d16b8c631e679a67364837d4ca9799731152) Change-Id: If9b3fc7c5ce66bfe1027caff39ea2c1cf55df7ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148044 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02curl: upgrade to release 7.87.0Taichi Haradaguchi5-12/+12
Fixes CVE-2022-43551 and CVE-2022-43552. https://curl.se/docs/CVE-2022-43551.html https://curl.se/docs/CVE-2022-43552.html Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145116 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 181806115a694ade32c7bba1abd9aa931b1a93b9) Change-Id: I979ed11c212aef226ad9f26420462e5f9dbe15e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148043 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02postgresql: upgrade to release 13.10Taichi Haradaguchi1-2/+2
Fixes CVE-2022-41862 Reference: https://www.postgresql.org/support/security/CVE-2022-41862/ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147834 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit efff34d7bdccf210a5e878bd9bc4d35ec72b71ab) Change-Id: I6075838972fec1c091f3150b19c5da4dc80ad6d3
2023-04-02nss: upgrade to release 3.88.1Michael Stahl1-2/+2
Fixes CVE-2023-0767 CVE-2022-3479 Change-Id: I688dc7d0785ed3344c33e331c7e9ef37baa720ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147387 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 538975a0e511ad79a7dd3c71300b993d1554cd03)
2023-04-02nss: upgrade to release 3.86.0Taichi Haradaguchi18-90/+38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a2969884af71e88d2541bd2bfdebea222876fef4) Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68
2023-04-02nss: update to release 3.83Taichi Haradaguchi3-11/+11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140231 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 06c9e1d27093ca7bbe38a1eb93fbb85b80f75f75) Change-Id: Ic1cb36b3a56cde40296fd46ef356dea286932692
2023-04-02openssl: upgrade to release 1.1.1tMichael Stahl1-2/+2
Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146660 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02add three static lines beween tarballs to ease cherry-pickingMichael Stahl1-1/+347
Change-Id: Ieb79d58796e38c5ba67ee0c7ae4e1edeafef3345 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146659 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02don't export entries from download.lst - only used by makeChristian Lohmaier3-269/+267
no need to plant that into the environment of every recipe. some Jenkins Windows builders already run into "environment is too large for exec" issue just by attempting a "xargs --show-limits </dev/null" from a dummy rule within the make environment Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144217 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ec4409a911fd4a67eb1bc74aae33081ae8510339) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144325 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 70f0cf457bdd36e914f3e98cf027ee25a75df448) Cherry-pick part of commit d9617d5529e0da23bd8602d07ce459cc42746e02 to fix make module.clean. Change-Id: I321fa9075532eef62a7d4e33a08c272276de717e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146658 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02python3: upgrade to release 3.8.16Michael Stahl3-4/+3
Fixes CVE-2022-37454 and a few other ones that look less relevant including CVE-2022-45061 and CVE-2015-20107. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 05f55b3898407828bb24347be56247f58803f7bb) Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
2023-04-02Python3: update to 3.8.15Taichi Haradaguchi11-22/+22
* Fixes CVE-2022-40674 * Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 as fixed upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ea5843b67f1c2006aa1f68f2d00a991e1d463262) Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab
2023-04-02external/python3: Silence UBSan errors with --with-pydebugStephan Bergmann1-0/+23
...that happen when building ExternalProject_python3 itself after 12142490cd43f8568ab29e0ddfa75b334d6d39d5 "Enable Python Py_DEBUG setting when built with --enable-dbgutil on Linux": For one, silence > Modules/posixmodule.c:14395:9: runtime error: left shift of 34 by 26 places cannot be represented in type 'int' > #0 in all_ins at workdir/UnpackedTarball/python3/./Modules/posixmodule.c:14395:9 where at least my kernel-headers-5.9.9-200.fc33.x86_64 /usr/include/linux/memfd.h has > #define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB and /usr/include/asm-generic/hugetlb_encode.h has > #define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT) For another (and as predicted in 29d47d22c43e6adc1850b7db5880028dcd07d1b3 "Fix passing --disable-optimized into external/python3": "in a Linux UBsan build, making ExternalProject_python3 would have started to cause some 'applying zero offset to null pointer' failures, but which would have been easy to fix"), silence > Objects/listobject.c:551:24: runtime error: applying zero offset to null pointer > #0 in list_concat at workdir/UnpackedTarball/python3/Objects/listobject.c:551:24 Change-Id: I0523cd35e393000c8e67629a0522b2db1d8c16f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106984 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 1657639d5e405c6e1e988d51a1f267c378c74b53)
2023-04-02python3: upgrade to release 3.8.13Taichi Haradaguchi2-3/+3
Remove some code in external/python3/darwin.patch.0 as it was fixed upstream(https://bugs.python.org/issue45405). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139493 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c8fd50f9ec02a131fd4c99e80f7252b49015653a) Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee
2023-04-02python3: update to 3.8.10Jan-Marek Glogowski2-3/+3
So we don't build 3.8.8rc1 anymore. I didn't look into 3.9. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117757 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit c22fc8e1f60bb98a87d22e7ff9bd3290dbb9fe02) Change-Id: Ife7d898c913b9b164168b0ef23a055deea55815f
2023-04-02python3: upgrade to release 3.8.8rc1Michael Stahl2-3/+3
Fixes CVE-2021-3177 plus these less important ones: CVE-2021-23336 CVE-2020-27619 CVE-2020-26116 CVE-2019-20907 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111208 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a0c8dc42335764d07c16a017c6b00486ec17ae53) Change-Id: Idbe072a9db1faf8363b4f7795b9fde71c26969f0
2023-04-02python3: update to 3.8.4Jan-Marek Glogowski13-197/+187
With all the prerequisites in place, LO can be updated to the current Python release. Interestingly I found that Cygwin always seems to use LC_COLLATE=C, probably because the default collation rules are missing. Then there are the changes introduced in "PEP 587 -- Python Initialization Configuration", which appearingly have modified the DLL search path behaviour on Windows, so the OpenSLL DLLs aren't found anymore in the program directory. As a workaround, the OpenSLL and libffi DLLs are now (also) installed into the Python lib dir on Windows. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit b4dfba947768834ffecc09056992019878711c8b) Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64
2023-04-02libffi: build DLL on WindowsJan-Marek Glogowski5-8/+46
The build setup is rather horrible, with some minimal gcc MSVC wrapper. But the DLL is a prerequisite for the Python 3.8 build, which dropped the internal libffi. It's also possible to build it statically, but then you have to patch the Python 3 _ctypes msbuild properties. This also defaults to explicit --build and --host settings, even without a cross build, because the predicted name would otherwise differ (*-unknown-* instead of *-pc-*). Additionally a "make install" also fails... Change-Id: Ifb7dac840e23efffb9a5e342560aef9e11e0db79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98436 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 883068462fe5bcbb01a8e14736fc06d0c3695c62)
2023-04-02upgrade to openssl-1.1.1sXisco Fauli1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142184 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 23e6227ab347a00b235fb00892b379ef4e3a0d35) Change-Id: Ic0f1fca7ef73b3a443c24d2bcc7f234be331a05b
2023-04-02upgrade openssl-1.1.1qTaichi Haradaguchi1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139463 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 96db5e3d610ede2ed82f1ab7673ac6d1c69fd588) Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1
2023-04-02upgrade to openssl-1.1.1mCaolán McNamara1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128769 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0f2b8305ed31746cd4dca33aa080adb220109353) Change-Id: I7c3e576501b4587a0f6814cdc4895663ef6d3f79
2023-04-02openssl: upgrade to release 1.1.1lMichael Stahl1-2/+2
Fixes CVE-2021-3712, CVE-2021-3711 (not obvious if any of them affect LO) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121026 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5c391f4346e86bd5d7528fbb42a3af64f98a03d3) Change-Id: I98652348977a5a3c728f1d4fdf7293b76a93b630
2023-04-02upgrade to openssl-1.1.1kCaolán McNamara1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120490 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c6604b69cf7f84146cae541366c023eaff4c59b6) Change-Id: Ibd930ab4f97e2f74868b73163d7f2f46fb466749
2023-04-02openssl: upgrade to release 1.1.1iMichael Stahl1-2/+2
Fixes CVE-2020-1971 * openssl-macos-arm64.patch.1: remove, was fixed upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108804 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit adfceaf32651f6ef17a9b63906366818b667d6b5) Change-Id: I405270228682025bf26240e3ea923bfd234068f5
2023-04-02configure: OpenSSL needs perl-FindBin to buildMichael Stahl1-0/+4
Change-Id: Idcea17d2418a2e847a5713293d7a225ed86bd305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105435 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 03a9a80125cf887d26348486b71d78d80c99344d)
2023-04-02openssl: remove obsolete 1.0.2 patchesMichael Stahl2-634/+0
Change-Id: I858998434b3cd1668c6d9522ce6d57f928802a8f
2023-04-02openssl: update to 1.1.1gJan-Marek Glogowski17-389/+63
The OpenSSL 1.1.1 release is currently the only supported version and it already has the Windows Arm64 support I was looking for. This change also explicitly enables thread support, which Python depends on since release 3.7, which removed the --without-threads build option. But the explicit OPENSSL_THREADS was just added in 3.8.4, so the old no-threads build fails now and was wrong since probably much longer. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98435 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 0911b0a26356aa53bb94a1d2171f36e6c2e28749) Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948
2023-04-02upgrade Expat to 2.5.0Taichi Haradaguchi2-8/+9
Fixes CVE-2022-43680 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142205 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74eea44c685e108fab44c85ce81609091c7be1ec) Change-Id: I5bf8d1ab0ac352833c76a7edfc1d8eb78dd03e10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142390 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02curl: upgrade to release 7.86.0Michael Stahl4-8/+13
Fixes CVE-2022-32221 which could affect libcmis, CVE-2022-42915, and 2 more CVEs that probably don't affect LO. * remove --without-ssl: On the one hand, on GNU/Linux this now results in: configure: error: --without-ssl has been set together with an explicit option to use an ssl library On the other hand, using the more obvious --without-openssl yields a link failure on Android on the nss check in configure: configure:28220: checking for SSL_VersionRangeSet in -lnss /home/cl/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/aarch64-linux-android/4.9.x/../../../../aarch64-linux-android/bin/ld: warning: liblog.so, needed by /home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnss3.so, not found (try using -rpath or -rpath-link) /home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnspr4.so: undefined reference to `__android_log_write' /home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnspr4.so: undefined reference to `__android_log_assert' ... so add the -llog for android in curl-nss.patch.1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141866 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a76a88203d8508f38b10d9bbb94c3bba2485fcaf) Change-Id: I3931a1eec2d681c2ce0e5695039492772e9fcc81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141885 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02curl: upgrade to release 7.85.0Taichi Haradaguchi6-14/+14
Fixes CVE-2022-35252 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140411 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 31a8de10e8f60d79d6eb588a049567b89a48f0b1) Change-Id: I549240f6ae31ae94f925422517cd03ef2e3b5732 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141884 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02zlib: upgrade to release 1.2.13Taichi Haradaguchi4-69/+3
Fixes CVE-2022-37434 Removed two patches as fixed upstream. Change-Id: I10465b7eafc4952cf8dc64e6d7a77f5e5255a386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141757 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b2d6ad64473527f88dfb7088376ccf1242d97666) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141881 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02libxml2: upgrade to release 2.10.3Michael Stahl1-2/+2
Fixes CVE-2022-40304 and CVE-2022-40303. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141448 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 39b5701976ff3d489c3212d6e2a116d6244c8ad1) Change-Id: I5be3fd20ccf57596808a26b742aca325ac16f29b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141467 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02update expat to 2.4.9Taichi Haradaguchi1-2/+2
Fixes CVE-2022-40674 (https://github.com/libexpat/libexpat/blob/R_2_4_9/expat/Changes) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140173 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1bff2caff1bbb39fe431c455aeab1f0234200d8d) Change-Id: I459cf5f5de31e7cf5420d3df6b11893d5c4ca4dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140339 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-02poppler: upgrade to release 22.09.0Michael Stahl6-17/+109
Fixes CVE-2022-38784 Add external/poppler/disable-freetype.patch.1 to get rid of some new code that unconditionally requires freetype, to avoid building that on WNT/MACOSX. Change-Id: I854d1865286b6fb4112cdf37898cda0203c52f2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139941 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 8fce9a0a41b1bbebd325fc9d98a79d8decd3950c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139967 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit bdbb450ed0ded86fb50d6b19a2cce0f11ca74b07) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140012 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-04-02tdf#78427 sdext.pdfimport: No need to read a font file for the purpose of...Kevin Suo2-60/+10
...determining the bold/italic/underline etc. The purpose for reading a font file is that in case the font attributes determined by the xpdfimport process is not enough, then we use the lo core font classes which read in the font file and then determine whether it is bold, italic etc. However, while this works in some cases, it does not work in many cases when the font file was actually a subset and a toUnicode map is followed in the PDF, see tdf#78427. In addition, in case the information collected from the xpdfimport process is enough, there is no need to read the font file. This commit removes the read of font file part. Also, this commit uses gfxFont->getNameWithoutSubsetTag() to get the font name with the subset tags removed, thus simplified the code in wrapper.cxx while also improves performace as the remove of subset tags is only run when the font is a subset (the previous code did this for all the font names). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118733 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins (cherry picked from commit da59686672fd2bc98f8cb28d5f04dc978b50ac13) restore compatibility with older popplers with poppler 20.09: /home/rene/LibreOffice/git/libreoffice-7-2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx: In member function 'int pdfi::PDFOutDev::parseFont(long long int, GfxFont*, GfxState*) const': /home/rene/LibreOffice/git/libreoffice-7-2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:438:39: error: 'class GfxFont' has no member named 'getNameWithoutSubsetTag' https://www.google.com/search?q=getNameWithoutSubsetTag&oq=getNameWithoutSubsetTag&aqs=chrome..69i57.784j0j7&sourceid=chrome&ie=UTF-8 suggests it was added in 20.12 Change-Id: I4eacd2d740cb689ff9b3c6cab59376e01b1ba162 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118977 Tested-by: René Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 07087041610ca8351d764c838ae07fa58f3bdf9e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140010 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-04-02upgrade poppler to 22.01.0Caolán McNamara2-4/+5
and popppler-data to 0.4.11 Change-Id: Ibd8c28f36408a670b5853f1b266c6b8c36916a61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128398 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9dbfda4cea569459e42203771754b902c1a09759) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139966 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 486a1004982b4072b488e8c42a7e09afd8043c2e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140011 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-11 12:16:19 +0000