New branch 'feature/cib_contract57d+hotfix' available with the following commits: commit 3c84cb2bb91edc505d6a80002f980aacb827e0be Author: Michael Stahl <michael.st...@allotropia.de> Date: Mon Oct 17 11:33:50 2022 +0200
libxml2: upgrade to release 2.10.3 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.st...@allotropia.de> (cherry picked from commit 39b5701976ff3d489c3212d6e2a116d6244c8ad1) Change-Id: I5be3fd20ccf57596808a26b742aca325ac16f29b commit c9fe4f6177de1858076023478c8991fc5e0c08a0 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> Date: Wed Sep 21 16:43:27 2022 +0900 update expat to 2.4.9 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.st...@allotropia.de> (cherry picked from commit 1bff2caff1bbb39fe431c455aeab1f0234200d8d) Change-Id: I459cf5f5de31e7cf5420d3df6b11893d5c4ca4dd commit b7d73ca36d88a3a93014958469cb89653dee1dd1 Author: Michael Stahl <michael.st...@allotropia.de> Date: Wed Sep 14 11:10:57 2022 +0200 zlib: add patch for CVE-2022-37434 Change-Id: If09c419ba00fc9be021249e4d4da27d1650b9080 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139913 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit 521e920dda79f44a0ad637b6062f3dcb574f884b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139849 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> (cherry picked from commit 832e2a266005d8ef5f9bcc7f51b545d5dc4ce165) commit 3c89c6811dc4a7bc3383fec6161edd3decb30ce2 Author: Michael Stahl <michael.st...@allotropia.de> Date: Wed Sep 14 10:27:02 2022 +0200 libxml2: upgrade to release 2.10.2 Fixes CVE-2022-2309 Change-Id: I180218be275d3b6d38f8f74aa51c57e50d2734ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139911 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit d621a8839cebf96fe3ac374026f344f8e68bf011) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139954 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Conflicts: test/source/xmltesttools.cxx commit 8b0f80f125a581a52eb66ede662da5afbd1403a9 Author: Michael Stahl <michael.st...@allotropia.de> Date: Wed May 4 10:42:36 2022 +0200 libxml2: upgrade to release 2.9.14 Fixes CVE-2022-29824. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit f670422a01e7336ba8a554331f3781ec7f5c4e8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133831 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit e2104950ccd738cde5865ace63af5b3501df7362) Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df commit dedfd421b1278278797ba41de94fd8dc68a6dfd1 Author: Michael Stahl <michael.st...@allotropia.de> Date: Thu Mar 31 20:33:02 2022 +0200 nss: build with zlib module on WNT Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a) Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 Conflicts: external/nss/ExternalProject_nss.mk commit faa790b46bd6d51118e7f6b7861bcf9b01b8861a Author: Michael Stahl <michael.st...@allotropia.de> Date: Thu Mar 31 12:13:23 2022 +0200 zlib: upgrade to release 1.2.12 Fixes CVE-2018-25032 external/zlib/ubsan.patch: remove, fixed upstream Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> (cherry picked from commit b91ebecaaa1582a7cbeda519eb6097a6a866135f) commit 2d7a4908082d62fd509febce53907e8896391cc9 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Sep 6 11:38:55 2022 +0100 check impress/calc IFrame "FrameURL" target similar to commit c7450d0b9d02c64ae3da467d329040787039767e Date: Tue Aug 30 17:01:08 2022 +0100 check IFrame "FrameURL" target Conflicts: xmloff/source/draw/ximpshap.cxx Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139524 Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> commit 3d92a4f19f7eeffbbe710e040e35a40996458962 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Sep 1 17:33:51 2022 +0200 Filter out unwanted command URIs Conflicts: desktop/source/app/cmdlineargs.cxx Change-Id: I0b7e5329af8cc053d14d5c60ec14fe7f364ef993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139225 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139247 Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> commit 7834193d628cdb34fa2357643c95880c773d6165 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Aug 30 17:01:08 2022 +0100 check IFrame "FrameURL" target similiar to commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 Date: Wed Aug 7 17:37:11 2019 +0100 warn on load when a document binds an event to a macro Conflicts: sfx2/source/doc/iframe.cxx sw/source/filter/html/htmlplug.cxx sw/source/filter/xml/xmltexti.cxx Change-Id: Iea888b1c083d2dc69ec322309ac9ae8c5e5eb315 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139059 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139246 Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> commit 24baf7b1174e4967dcc30d60c1ce04041fe043c4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Aug 30 14:04:52 2022 +0200 These commands are always URLs already Conflicts: wizards/source/scriptforge/SF_Session.xba Change-Id: I5083765c879689d7f933bbe00ad70bb68e635a21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139042 Tested-by: Jean-Pierre Ledure <j...@ledure.be> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139245 Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>