summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a bunch of DLLs to ignorecib-6.1-41distro/cib/libreoffice-6-1Thorsten Behrens2023-02-261-2/+18
| | | | | | Since they're placed in multiple places in work/instdir Change-Id: I34c2378da6b08fc8555288693eb83d39f130ec24
* openssl: upgrade to release 1.1.1tMichael Stahl2023-02-241-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) (cherry picked from commit ba359c09226756865d3813fee08514384257ae58)
* add three static lines beween tarballs to ease cherry-pickingMichael Stahl2023-02-241-0/+330
| | | | Change-Id: I9cf55a9c23e972d5823ef96bd1a7a9e3e05af134
* don't export entries from download.lst - only used by makeChristian Lohmaier2023-02-243-259/+257
| | | | | | | | | | | | | | | | | | | | | | 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. (cherry picked from commit 3766bf622adfc86d4b364ce8a676824f4bda3299) Change-Id: I321fa9075532eef62a7d4e33a08c272276de717e
* python3: upgrade to release 3.8.16Michael Stahl2023-02-242-3/+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) (cherry picked from commit 0e36d99bb8fb04c88b15845b17ee705ed60d66b7) Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
* Python3: update to 3.8.15Taichi Haradaguchi2023-02-2411-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) (cherry picked from commit 9ac10884373aaa810e43187334334236c4e15a75) Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab
* python3: upgrade to release 3.8.13Taichi Haradaguchi2023-02-242-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) (cherry picked from commit 6f3e86ea104fa496e589c4d81f7ccd271c419862) Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee
* external/python3: Silence UBSan errors with --with-pydebugStephan Bergmann2023-02-241-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) (cherry picked from commit 47a13bab80a9742d8751710ecd2f680386ea0c62)
* python3: update to 3.8.10Jan-Marek Glogowski2023-02-242-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) (cherry picked from commit 76b08ddff6fc63f0b3e2f0e0283cd0c98807352f) Change-Id: Ife7d898c913b9b164168b0ef23a055deea55815f
* python3: upgrade to release 3.8.8rc1Michael Stahl2023-02-242-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) (cherry picked from commit 3c28e5a1301104fc5c2150aaa4f81d1fbb12c8a6) Change-Id: Idbe072a9db1faf8363b4f7795b9fde71c26969f0
* python3: update to 3.8.4Jan-Marek Glogowski2023-02-2313-197/+186
| | | | | | | | | | | | | | | | | | | | | | | 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) (cherry picked from commit 86354017a30c08aba8389dbc6c822955c9aab3d5) Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64
* libffi: build DLL on WindowsJan-Marek Glogowski2023-02-235-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) (cherry picked from commit 3ceda619fb8f04161a5924006faac406a79f26f2)
* fix some more python 3.8 deprecation warningsNoel Grandin2023-02-231-2/+2
| | | | | | | | | Change-Id: I8bdbf05f1357aea83a3cdda2f06d63c7d04de8f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94561 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 0a3d414fb0ac27292320d99f802722a8a9670240) (cherry picked from commit 3c35db9b7aa52878bb7739e732bebfb2f580bc29)
* fix python 3.8 deprecation warningsNoel Grandin2023-02-231-4/+4
| | | | | | | | | | | | | | | | | | | the logo changes were caused by > Support of nested sets and set operations as in Unicode Technical Standard > #18 might be added in the future. This would change the syntax, so to facilitate > this change a FutureWarning will be raised in ambiguous cases for the time being. > That includes sets starting with a literal '[' or containing literal character > sequences '--', '&&', '~~', and '||'. > To avoid a warning escape them with a backslash. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94191 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit b5fcdc3c07efb2c1175503b9c70e6d7336aa1452) (cherry picked from commit db4d5b571ca21267d8a534aa959472551ab7e091) Change-Id: I4d48be3df2eaadf03a9d1f5750c0c94b3abbf674
* upgrade to openssl-1.1.1sXisco Fauli2023-02-231-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) (cherry picked from commit 2c06d55c8e43368920780e55c62e1e65fdefba04) Change-Id: Ic0f1fca7ef73b3a443c24d2bcc7f234be331a05b
* upgrade openssl-1.1.1qTaichi Haradaguchi2023-02-231-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) (cherry picked from commit 9da5e4107e74d7590fbf44f5f4f24ed620852f91) Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1
* upgrade to openssl-1.1.1mCaolán McNamara2023-02-231-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) (cherry picked from commit 8cc04821ce091e80dbb430c487340b85da9cd1a4) Change-Id: I7c3e576501b4587a0f6814cdc4895663ef6d3f79
* openssl: upgrade to release 1.1.1lMichael Stahl2023-02-231-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) (cherry picked from commit b0349f8e6752781be18848c6ecb23f117f025341) Change-Id: I98652348977a5a3c728f1d4fdf7293b76a93b630
* upgrade to openssl-1.1.1kCaolán McNamara2023-02-231-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) (cherry picked from commit 442af9c1eaede030139415d1902a7bd8f8ce43d1) Change-Id: Ibd930ab4f97e2f74868b73163d7f2f46fb466749
* openssl: upgrade to release 1.1.1iMichael Stahl2023-02-231-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) (cherry picked from commit ae45fff6f05c1636f23f8dabfc942e32f63a0b01) Change-Id: I405270228682025bf26240e3ea923bfd234068f5
* openssl: remove obsolete 1.0.2 patchesMichael Stahl2023-02-232-634/+0
| | | | | Change-Id: I858998434b3cd1668c6d9522ce6d57f928802a8f (cherry picked from commit ccd7ab5453899aeba46aaa8041712089880f66bb)
* openssl: update to 1.1.1gJan-Marek Glogowski2023-02-2317-388/+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) (cherry picked from commit f3e98f199de288f689bcca21251a4f8d3930a366) Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948
* python3: upgrade to release 3.7.10Michael Stahl2023-02-233-4/+4
| | | | | | | | | | Fixes CVE-2021-3177 plus these less important ones: CVE-2021-23336 CVE-2020-27619 CVE-2020-14422 CVE-2020-26116 CVE-2019-20907 CVE-2020-8492 CVE-2019-18348 (cherry picked from commit 576be77c00bf925b02405da3a13236526a8948b4) Change-Id: I8e83395bd3e871eb2ed030a03827b7d261c96049
* tdf#121384 don't leave a bare trailing : in PYTHONPATHCaolán McNamara2023-02-231-2/+12
| | | | | | | | | | | | and don't insert any empty path entries if that situation was to arise Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96707 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins (cherry picked from commit b72705d5391b849fc70a0a4cac33523c0ea5d054)
* python 3.8--only compile: add tp_print to PyTypeObjectAdministrator2023-02-235-2/+60
| | | | | | | | | | | | | | | | | | This is a backport of four commits to allow Ubuntu 20.04 to compile. 50ccb7e82b7053306721cbe220323be072306a29 d1786724b8e8e474e1f7e39012c1f19611841dc0 893a5249b934f92f072b89b9b558c9de593aa557 23d9966751566028c50ca95ca203d20f36c64f30 Thanks to Stephan and Noel who corrected various portions of my initial patch. Change-Id: I15f016024754165fd093ef95c52d7ba3f6d34397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96521 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e9ec91f32e3320f0d23840fdc95bafbf2255fd9a)
* python3+WIN: don't fail copy of openssl DLLs+PDBsJan-Marek Glogowski2023-02-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LO python3 target fails for me on Windows with: C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5): error MSB3030: Datei "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.dll" konnte nicht kopiert werden, da die Datei nicht gefunden wurde. [C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj] Same for "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.pdb" "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.pdb" "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.dll" Other files were also renamed in a previous hunk of this patch. For other people these failures are silently ignored, but they show up in their python3 build.log. But my msbuild version 15.9.21+g9802d43bc3 from VS2017 fails hard on these errors. So this just adapt the pdb and dll names to match the previous renames, which passes the copy calls, so the build continues. Change-Id: Iffc848c334caec534f6e99f8bf83a42da570bbb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87358 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 4ff12ba6f4639c73587f2bb58afcc3ca6fb30105) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95559 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2786e5a0e79c8e3b30fed02e27cc9973e28cd76c)
* python3: upgrade to release 3.7.7Michael Stahl2023-02-232-3/+3
| | | | | | | | | | | | | | | Fixes CVE-2020-8315; this only affects Windows 7 and is a regression in Python 3.6. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90916 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 74c811da0dedb205976eae69d8589fd91bbaefa2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90824 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 6fa0ff78550cd321116c9d9673cbcf49fc11a547) Change-Id: Ic1706e064a1b03ca1de6361794ed4586a89821d9
* tdf#130404 python3: add new windows .pyd modules for 3.7Michael Stahl2023-02-231-0/+3
| | | | | | | | | | | | | Unfortunately forgot that in b10be5d48433076f0b7238d818020f708553e114 Change-Id: I59043a576c45f9329a3fad9a5d50e7fefa901934 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88977 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit e62b9937ed33388055560ca0710990742b530aec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88950 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit fc464ae2441a17f465682420d969ae59d24eacc0)
* pyuno: remove racy debug checkMichael Stahl2023-02-231-7/+0
| | | | | | | | | | | | | | The use-after-free is easier to trigger than expected; i don't see how it's possible to check this without a race. Change-Id: I4afb7066d1bf6b34f4f56aa0f51be0643ae40a66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86481 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 777ae8101e23a31bdf806c1d09f0c849e47bb8ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86486 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c82311303bd26bffb74159b2d1294630830a615a)
* python3: bundle libffi for GNU/Linux buildsMichael Stahl2023-02-2314-122/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979: Remove bundled copy of libffi" causes a bit of a problem because it turns out that libffi isn't all that stable; there's libffi.so.5 on CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on lo_daily_update_gandalf tinderbox. So we have to bundle it in LO; it's only used on GNU/Linux currently. CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947: Update Windows to the current version of libffi (GH-11797)" also removes the libffi for MSVC, so in a future python upgrade we will have to build libffi for MSVC too. The libffi fork for MacOSX is still in CPython git master. (regression from b10be5d48433076f0b7238d818020f708553e114) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6b5ce621ff2a82d4fa77d7781d1dabd4b14a4c90) Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2
* python3: fix 32-bit x86 buildMichael Stahl2023-02-231-1/+1
| | | | | | | | | | | | | The reinvented wheel needs another subst. Change-Id: I5bc01b0213f00d383cf971d34f0dc2a9e6817ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86480 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit db75ec187051090e2eb1b13745fe11a2a5bb1dd0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86485 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 87932b78d7e0d46c7e921a8b3149d67fbefeea0a)
* python3: remove _uuid moduleMichael Stahl2023-02-231-1/+0
| | | | | | | | | | | | | | | | | | Of course the autotetection in setup.py strikes again, the build will fail if the user doesn't have libuuid-devel installed; we'd need to add a check to LO's configure.ac for libuuid. Let's just not ship it, not sure if anybody needs it. Change-Id: I9079309da7d9c16e666fbab30542365124f97860 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86433 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ebb6c2576af8d883ddf8eb09e3969c50d9ac07c9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86448 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 5a8b378129feb725d4d3e48cd20b493688226eaa)
* pyuno: fix build against system-python-3.6Miklos Vajna2023-02-231-0/+2
| | | | | | | | | | | | | | | pyuno/source/module/pyuno_runtime.cxx:984:57: error: use of undeclared identifier 'PyThread_get_thread_ident' It's only an assert, so simply do it only for >=3.7. Change-Id: Ia3fffc7a9af30780adff9bc7dbabe1727c1f8f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86410 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit fb4e15a89d8d8f081c0c152e5047bc0e76870b39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86421 Tested-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 46b469d58a0e6b8fbe5888045c272159154a0705)
* python3: remove obsolete python 3.5 backport patchesMichael Stahl2023-02-232-234/+0
| | | | Change-Id: I763938e826ca58ed5325ef46f815d48ad0f90fdd
* python3: upgrade to release 3.7.6Michael Stahl2023-02-2321-483/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * external/python3/python-3.3.3-aix.patch.1: most of it doesn't apply and AIX port isn't maintained anyway so remove it for now * external/python3/ubsan.patch.0: apparently one of the files was removed * 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1: fixed upstream * python3-osx-avoid-new-10.13.patch.1: replace with simply passing ac_cv_func_utimensat=no to configure * external/python3/python-3.5.4-ssl.patch.1: project files to build OpenSSL removed upstream * There have been changes to how python locates OpenSSL; new variables OPENSSL_INCLUDES etc; it turns out that you have to pass one directory to --with-openssl, as the variables cannot be passed * libuuid.so.1 is a new dependency of the _uuid module * libffi.so.6 is a new dependency of the _ctypes module (the bundled copy of libffi for non-Darwin platforms was removed) * python-3.3.0-pythreadstate.patch.1: the PyThreadState functions have been changed such that CppunitTest_services asserts when there is a PyThreadAttach on top of PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per thread (PyGILState_Check() fails). Instead of patching in additional workarounds, change PyThreadAttach so that it re-uses an existing PyThreadState if one exists for the thread. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b10be5d48433076f0b7238d818020f708553e114) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86398 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 853cc90f49d59a94242494c4aee2479de0865486) Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9
* Adapt to upcoming Python 3.8Stephan Bergmann2023-02-225-6/+48
| | | | | | | | | | | | | ...which changed PyTypeObject in <https://github.com/python/cpython/commit/ aacc77fbd77640a8f03638216fa09372cc21673d> "bpo-36974: implement PEP 590 (GH-13185)". Change-Id: I687ec38aeda05d0747b9ed08221db75a758bed51 Reviewed-on: https://gerrit.libreoffice.org/73664 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2bd585f31d7abb066e3f53d9b29c822af20aea69)
* fix pyuno compile on Fedora29Noel Grandin2023-02-221-0/+4
| | | | | | | | | | 'PyUnicode_GetSize' is deprecated [-Werror,-Wdeprecated-declarations] Change-Id: Id298d6a2b0af9ce418f9124c9addda55fcdc0318 Reviewed-on: https://gerrit.libreoffice.org/62687 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 485ec8e14306352f44056bcb644bb4cacdb6490a)
* define PURIFY for openssl for dbgutil to silence valgrind spewCaolán McNamara2023-02-221-0/+1
| | | | | | | | | Change-Id: I318ca368f26e42038a043b1e264a619795a9515e Reviewed-on: https://gerrit.libreoffice.org/59945 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6666b31829c93d8ae45bdda52155021d44b91b73)
* try building python in parallel on windowsNoel Grandin2023-02-221-0/+1
| | | | | | | | Change-Id: Ib920ae6d6a3ced06ffe9f1fc4adba67d95f99a17 Reviewed-on: https://gerrit.libreoffice.org/55207 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 92c745f95e2105104da7f0749d72e6cf761c1b58)
* Revert "openssl: upgrade to release 1.1.1t"Michael Stahl2023-02-221-2/+2
| | | | This reverts commit b6dacd48dfd05310ec01e8be4c0da47777be2eaf.
* Stack check safety belt before fishing in muddy watersEike Rathke2023-02-222-2/+14
| | | | | | | | | | | | | | Have it hit hard in debug builds. Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147245 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 166a07062dd4ffedca6106f439a6fcddaeee5eb5) (cherry picked from commit 23d78df0ce97cb97f358e7407e8b40fe7a020761)
* Bump version to 6.1.7.41Thorsten Behrens2023-02-221-1/+1
| | | | Change-Id: I577f2de33498de66b83c8b8a1aa6bfbb37e1c67b
* nss: upgrade to release 3.88.1Thorsten Behrens2023-02-221-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)
* Obtain actual 0-parameter count for OR(), AND() and 1-parameter functionsEike Rathke2023-02-222-9/+14
| | | | | | | | | | | | | | | | | | | | | OR and AND for legacy infix notation are classified as binary operators but in fact are functions with parameter count. In case no argument is supplied, GetByte() returns 0 and for that case the implicit binary operator 2 parameters were wrongly assumed. Similar for functions expecting 1 parameter, without argument 1 was assumed. For "real" unary and binary operators the compiler already checks parameters. Omit OR and AND and 1-parameter functions from this implicit assumption and return the actual 0 count. Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d6599a2af131994487d2d9223a4fd32a8c3ddc49)
* Silence -fsanitize=implicit-signed-integer-truncationStephan Bergmann2023-02-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...as happens during CppunitTest_sc_logical_functions_test (see below), by not relying on wrap-around of nStackBase = sp - pCur->GetParamCount(); during underflow. (Though I have no idea whether the excited "underflow?!?" comment means that underflow is indeed expected and harmless, or rather indicates a severe problem elsewhere; at least, it does happen during CppunitTest_sc_logical_functions_test as shown below). > sc/source/core/tool/interpr4.cxx:3965:34: runtime error: implicit conversion from type 'int' of value -2 (32-bit, signed) to type 'sal_uInt16' (aka 'unsigned short') changed the value to 65534 (16-bit, unsigned) > #0 in ScInterpreter::Interpret() at sc/source/core/tool/interpr4.cxx:3965:34 (instdir/program/libsclo.so +0xab8f35e) > #1 in ScFormulaCell::InterpretTail(ScInterpreterContext&, ScFormulaCell::ScInterpretTailParameter) at sc/source/core/data/formulacell.cxx:1866:23 (instdir/program/libsclo.so +0x9bce713) > #2 in ScFormulaCell::Interpret() at sc/source/core/data/formulacell.cxx:1577:13 (instdir/program/libsclo.so +0x9bc4611) > #3 in ScFormulaCell::MaybeInterpret() at sc/source/core/data/formulacell.cxx:2673:9 (instdir/program/libsclo.so +0x9bb04f0) > #4 in ScFormulaCell::GetErrCode() at sc/source/core/data/formulacell.cxx:2912:5 (instdir/program/libsclo.so +0x9beab05) > #5 in ScCellFormat::GetString(ScRefCellValue&, unsigned int, rtl::OUString&, Color**, SvNumberFormatter&, ScDocument const*, bool, bool, bool) at sc/source/core/tool/cellform.cxx:79:59 (instdir/program/libsclo.so +0xa42272b) > #6 in ScColumn::UpdateScriptType(sc::CellTextAttr&, int, mdds::detail::mtv::iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait, mdds::detail::mtv::private_data_forward_update<mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block> > >&) at sc/source/core/data/column3.cxx:534:5 (instdir/program/libsclo.so +0x8b81f94) > #7 in ScColumn::GetRangeScriptType(mdds::detail::mtv::iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func1<mdds::mtv::default_element_block<51, sc::CellTextAttr> >, mdds::detail::mtv::event_func>::iterator_trait, mdds::detail::mtv::private_data_forward_update<mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block> > >&, int, int, mdds::detail::mtv::iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait, mdds::detail::mtv::private_data_forward_update<mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block> > > const&) at sc/source/core/data/column2.cxx:2010:17 (instdir/program/libsclo.so +0x8aa4973) > #8 in (anonymous namespace)::FindEditCellsHandler::operator()(unsigned long, ScFormulaCell const*) at sc/source/core/data/column.cxx:3036:46 (instdir/program/libsclo.so +0x8873d9b) > #9 in std::pair<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::const_iterator, unsigned long> sc::CheckElem<mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell>, mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>, (anonymous namespace)::FindEditCellsHandler>(mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent> const&, mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::const_iterator const&, unsigned long, unsigned long, (anonymous namespace)::FindEditCellsHandler&) at sc/inc/mtvfunctions.hxx:139:13 (instdir/program/libsclo.so +0x8872c89) > #10 in std::pair<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::const_iterator, mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::size_type> sc::FindElement2<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell>, (anonymous namespace)::FindEditCellsHandler, (anonymous namespace)::FindEditCellsHandler>(mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent> const&, mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::size_type, mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::size_type, (anonymous namespace)::FindEditCellsHandler&, (anonymous namespace)::FindEditCellsHandler&) at sc/inc/mtvfunctions.hxx:464:37 (instdir/program/libsclo.so +0x88710f5) > #11 in std::pair<mdds::detail::mtv::const_iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::const_iterator_trait, mdds::detail::mtv::private_data_forward_update<mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block> >, mdds::detail::mtv::iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait, mdds::detail::mtv::private_data_forward_update<mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block> > > >, unsigned long> sc::FindFormulaEditText<(anonymous namespace)::FindEditCellsHandler>(mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent> const&, int, int, (anonymous namespace)::FindEditCellsHandler&) at sc/inc/mtvcellfunc.hxx:139:12 (instdir/program/libsclo.so +0x8827df0) > #12 in ScColumn::HasEditCells(int, int, int&) at sc/source/core/data/column.cxx:3510:9 (instdir/program/libsclo.so +0x88275b3) > #13 in ScColumn::GetOptimalHeight(sc::RowHeightContext&, int, int, unsigned short, int) at sc/source/core/data/column2.cxx:823:38 (instdir/program/libsclo.so +0x8aa0056) > #14 in (anonymous namespace)::GetOptimalHeightsInColumn(sc::RowHeightContext&, ScColContainer&, int, int, ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:115:20 (instdir/program/libsclo.so +0x9fb52dd) > #15 in ScTable::SetOptimalHeight(sc::RowHeightContext&, int, int, ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:474:5 (instdir/program/libsclo.so +0x9fb4073) > #16 in ScDocRowHeightUpdater::update() at sc/source/core/data/dociter.cxx:2576:33 (instdir/program/libsclo.so +0x8f17a78) > #17 in ScXMLImport::endDocument() at sc/source/filter/xml/xmlimprt.cxx:1806:22 (instdir/program/libsclo.so +0xbd59796) > #18 in sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) at sax/source/fastparser/fastparser.cxx:876:36 (instdir/program/libexpwraplo.so +0x237ebc) > #19 in sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) at sax/source/fastparser/fastparser.cxx:1377:13 (instdir/program/libexpwraplo.so +0x2528ab) > #20 in SvXMLImport::parseStream(com::sun::star::xml::sax::InputSource const&) at xmloff/source/core/xmlimp.cxx:484:15 (instdir/program/libxolo.so +0x261ef9d) > #21 in filter::odfflatxml::OdfFlatXml::importer(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Sequence<rtl::OUString> const&) at filter/source/odfflatxml/OdfFlatXml.cxx:151:26 (instdir/program/libodfflatxmllo.so +0x218fa) > #22 in XmlFilterAdaptor::importImpl(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx:180:26 (instdir/program/libxmlfalo.so +0x3ee1f) > #23 in XmlFilterAdaptor::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx:316:67 (instdir/program/libxmlfalo.so +0x44f0a) > #24 in SfxObjectShell::ImportFrom(SfxMedium&, com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sfx2/source/doc/objstor.cxx:2251:34 (instdir/program/libsfxlo.so +0x38d597f) > #25 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:772:23 (instdir/program/libsfxlo.so +0x389eaf9) > #26 in ScBootstrapFixture::load(bool, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned long, rtl::OUString const*) at sc/qa/unit/helper/qahelper.cxx:582:21 (workdir/LinkTarget/CppunitTest/../Library/libscqahelper.so +0x869b5) > #27 in ScBootstrapFixture::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned long, rtl::OUString const*) at sc/qa/unit/helper/qahelper.cxx:597:12 (workdir/LinkTarget/CppunitTest/../Library/libscqahelper.so +0x86fa6) > #28 in FunctionsTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at sc/qa/unit/functions_test.cxx:35:51 (workdir/LinkTarget/CppunitTest/../Library/libscqahelper.so +0xe4e95) > #29 in non-virtual thunk to FunctionsTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at sc/qa/unit/functions_test.cxx (workdir/LinkTarget/CppunitTest/../Library/libscqahelper.so +0xe59db) > #30 in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:130:20 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x7526d) > #31 in LogicalFunctionsTest::testLogicalFormulasFODS() at sc/qa/unit/functions_logical.cxx:19:5 (workdir/LinkTarget/CppunitTest/libtest_sc_logical_functions_test.so +0x1fd60) [...] Change-Id: Icccfb37c33885d72bff1003b3a8f8505850eb184 Reviewed-on: https://gerrit.libreoffice.org/63302 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* disable script dumpCaolán McNamara2023-02-223-0/+46
| | | | | | | | | Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146986 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147051 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* openssl: upgrade to release 1.1.1tThorsten Behrens2023-02-221-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)
* Bump version to 6.1.7.40cib-6.1-40Thorsten Behrens2022-12-101-1/+1
| | | | Change-Id: If9eb83e027ccebb38d9bc5b4fc13cb0d44200499
* upgrade Expat to 2.5.0Taichi Haradaguchi2022-11-072-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
* curl: upgrade to release 7.86.0Michael Stahl2022-10-264-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
generated by cgit (git 2.34.1) at 2024-04-26 05:04:06 +0000