From b1840ad144f5334c7390b90e5ae7c3f6a010e8db7b75702e7cdd03a3d8801c26 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 15 Oct 2022 06:26:12 +0000 Subject: [PATCH] Accepting request 1010509 from LibreOffice:7.4 OBS-URL: https://build.opensuse.org/request/show/1010509 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1041 --- libreoffice-7.4.1.2.tar.xz | 3 -- libreoffice-7.4.1.2.tar.xz.asc | 16 ------- libreoffice-7.4.2.3.tar.xz | 3 ++ libreoffice-7.4.2.3.tar.xz.asc | 16 +++++++ libreoffice-help-7.4.1.2.tar.xz | 3 -- libreoffice-help-7.4.1.2.tar.xz.asc | 16 ------- libreoffice-help-7.4.2.3.tar.xz | 3 ++ libreoffice-help-7.4.2.3.tar.xz.asc | 16 +++++++ libreoffice-translations-7.4.1.2.tar.xz | 3 -- libreoffice-translations-7.4.1.2.tar.xz.asc | 16 ------- libreoffice-translations-7.4.2.3.tar.xz | 3 ++ libreoffice-translations-7.4.2.3.tar.xz.asc | 16 +++++++ libreoffice.changes | 16 +++++++ libreoffice.spec | 10 +---- poppler-22.09.0.patch | 46 --------------------- 15 files changed, 74 insertions(+), 112 deletions(-) delete mode 100644 libreoffice-7.4.1.2.tar.xz delete mode 100644 libreoffice-7.4.1.2.tar.xz.asc create mode 100644 libreoffice-7.4.2.3.tar.xz create mode 100644 libreoffice-7.4.2.3.tar.xz.asc delete mode 100644 libreoffice-help-7.4.1.2.tar.xz delete mode 100644 libreoffice-help-7.4.1.2.tar.xz.asc create mode 100644 libreoffice-help-7.4.2.3.tar.xz create mode 100644 libreoffice-help-7.4.2.3.tar.xz.asc delete mode 100644 libreoffice-translations-7.4.1.2.tar.xz delete mode 100644 libreoffice-translations-7.4.1.2.tar.xz.asc create mode 100644 libreoffice-translations-7.4.2.3.tar.xz create mode 100644 libreoffice-translations-7.4.2.3.tar.xz.asc delete mode 100644 poppler-22.09.0.patch diff --git a/libreoffice-7.4.1.2.tar.xz b/libreoffice-7.4.1.2.tar.xz deleted file mode 100644 index eab54d1..0000000 --- a/libreoffice-7.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92f78421bb3ffa6723f8e14c0dab5ee7bc68939fad8ff9f146ccecac02d2de84 -size 263306664 diff --git a/libreoffice-7.4.1.2.tar.xz.asc b/libreoffice-7.4.1.2.tar.xz.asc deleted file mode 100644 index 989eb9a..0000000 --- a/libreoffice-7.4.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjn0ACgkQ9DSh76/u -rqNOdw//fd7+HxL62Nt5oZaKCM++E1fucqnQxU19TIyyq+mBZXwnjnuFvj6Yi8nS -gQCqNWDlTuZ+ZGkh4Av5IwU+k804jggT+PbiTDs6HxXtZt+hZJK+UHHn2jqagOli -vTE8RcHuY/mAb0VPhjp/AEb48QqPvV/eOn+zfcugmq3tj/0eBbtRgv8Nc7YGvOxj -WTRmk29+Jjw09cNMEV8iZxqi6rXOmab75PNcghGjVqYKI1d5/Vw/OFF007SQLN1Z -OQfCZ4+Eh9wpl0zhTcYvBJL93wlBpjFeRsq9y/NyMb0jeQJXlCwdpUsRDKUaeIYd -hRfEndSngO8KamKRPCxg9BmgDIrUqaQre/0gXRdSKxCJBSRSCzKXThid2z3AI9Iu -Q6UxjqAut4Kb3u9ukWa525Q6wLeRCjvvGT5m4EGpyi/bnfyrADLcbv2zXNmW7uvL -x9vCoqJoDn8ShKqXqHavFr6F6lnxwvH9cPKKqEKQnSm6oz5QNOPP+IIvFkhwULS/ -vrLUjNsQJN2TVvEek/8W7C2bGBqW8zjSU2eFO5/ptRJKuvXThGYl/AG1C4mk9r5X -UhNrwDcIR/1b3BuU4tC2ujtfrviNUfxG72z/n4j585GZHi0MBQBSfo3bcfR+u6HJ -G8hlHRjzglvz2YGdJ/uEWKBm8ugwCAbM+2CZ2HgknGbkLWFSp0k= -=h7wY ------END PGP SIGNATURE----- diff --git a/libreoffice-7.4.2.3.tar.xz b/libreoffice-7.4.2.3.tar.xz new file mode 100644 index 0000000..3146fa6 --- /dev/null +++ b/libreoffice-7.4.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a +size 263628084 diff --git a/libreoffice-7.4.2.3.tar.xz.asc b/libreoffice-7.4.2.3.tar.xz.asc new file mode 100644 index 0000000..a3e2d1b --- /dev/null +++ b/libreoffice-7.4.2.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+YACgkQ9DSh76/u +rqNfFxAAyQN5OODyj5Hjzh7qMHEwIykYvhAlTl8w8m586d2dB4EtEZRdUy/aJOob +9jLImkNUTbVuBRiTyNp++OEbkV/oGQvOK9cuRLvouxnuW5oOn//QWWYicPxd8LA7 +c6TpmD7UDx6NP1LGEMriSjMDk+tEbr3jeXXiMjkhKveIFnx5FbZTdgCEsZ8eurBv +Q4Pq7kJ17QQM/YzWzzTve0/VlyQsCZMpDCJeBzCSPyIvXEQe/Q7GgnH0JSsZe76v +13hGwMNMVhQLbP5O9RDIVY1Sp8vJ15fkQOVTW/E//zuVCEgHqxpBNg0x6GUyLcPU +bury0/yjdJ3I3DovlYvSw6qUshUruj+MyDDEkWuXf8zGYkYWTN/liMTGkxmOvfDE +3uBsI5j49KMegP/NlOreNNRPoQKO7/ii7nDaUw9Np/IkaQ+4wHbiEdK5XZSNVNQp +zwYfwJu2Emp4Gb4D8CxDaF5PBWozZxb92/bPzqfw1cTAJilHyKyja/kbEM0WjuRZ +QqqEBtNeN+wlGd0Av0EOBu6Z/4M62dLVsAknc7v/A4GR4hwH0HAc+V5VjypTRkB9 +9dhdFO3CVGsKixVvfwNwsNv8iEtkrKLbNhm9aZ7/Mf7i+fAM43zN0pAH5Obq9y18 +mj6/ceBbjZ8DsGEmbf1tVuWgSsk8YcREpKOKY9Fw1Ot98dd3EO8= +=ldZl +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.1.2.tar.xz b/libreoffice-help-7.4.1.2.tar.xz deleted file mode 100644 index 0de1c2f..0000000 --- a/libreoffice-help-7.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:842b24e72345aeed8305342003a4bbc6346173ea9457b38950b3b6ab89e2d89f -size 112592980 diff --git a/libreoffice-help-7.4.1.2.tar.xz.asc b/libreoffice-help-7.4.1.2.tar.xz.asc deleted file mode 100644 index ddb749e..0000000 --- a/libreoffice-help-7.4.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u -rqPpaQ//X3HqXHAyB4taKdADam0rqqLt3mB0I6V+SNrstV/82orsPnvoUA+Ahrly -vmVmGgdPTg3gdAMxPTRWGaZUxWPx7lXh0ULlk4xkYcNyK14j9A+bUhtWnNwZThh+ -uvQWumIfKQLOJzRlP8QG0eN8b0oPmSbGZUHixCzOcAOvBi5Iw2YKNTWnnkZFY502 -SDCpduUenwAED5S+gHJBm4bOHbgIGNpJConYzjTBs2gp0faZQOm0UB401P+Qk7w4 -YxOB6hwxy6E/PLZhnGm1v7xW3GYUuoM8j0VDYEGrYcdD2rho+jO4KmDx4vAjFXMS -b+a5jeh6scVS1X/NuppHA+uxqWF95b0q4zXI3J1JU03FFyoUCivpx6nb91Vi3kf5 -NAQMaGLKrH1P++eCXnz17lkgAvfyLuKAA0vIOMQqJHe1dRzEB1CpHYIO8flMlZzm -zEntxgddGE2JiPYtQ9spfpu1Mv0E3oQBjcl0XYKDfmepGmn3bP3xPW1mRQL+eFT0 -8QY6swHQL21Pns4nTBhZfVrwmLh1RqVum79U0Ed/W9hPKyNWYcr3RQg6NZI2ggMa -iFhqzqauBtCYpUTqnwQ8PjtpdxOgD6r6IL7ZtL+GcfnBcodW2P7PJbmPxsWYYwoP -6m95LrwJ9yVzv3dy8yCDxSLmO+1U/d/EthnboCgVH0p+PtkFuqY= -=Ye92 ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.2.3.tar.xz b/libreoffice-help-7.4.2.3.tar.xz new file mode 100644 index 0000000..8d8b3fb --- /dev/null +++ b/libreoffice-help-7.4.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f9ed5dd9d8b394be442ddb86f57cb78746282d886e0dc35add36e8b34170f5c +size 112593884 diff --git a/libreoffice-help-7.4.2.3.tar.xz.asc b/libreoffice-help-7.4.2.3.tar.xz.asc new file mode 100644 index 0000000..234f097 --- /dev/null +++ b/libreoffice-help-7.4.2.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+kACgkQ9DSh76/u +rqNFMBAAgWQs73s1crrZ44aXzcnom25r21Oq1Y6xhwr8Fzq/G92IFRMWPMBXPOBT +v7d9SZeJGy7pZnFNMJZ3lEJ/liG5NTpogaJ/kixCYQ3VeMe0pGyISO72U9vaX4Yq +BnACS0I62sWmPhrYUIM08XtvH1J4CPF8gQIXJZub+BYaHYgo+hdAGlSVBrHQP/GU +wbpayJlrPxv7SyOTOE3EuUkgt8d0bo9WQ0ldgJ+TvaTSSvclatQph7NddIVNGkOo +K0s/tR/DjD6cR9rDwNxDbbZqcQd7Wms48O2rkhM77SUgbTTISaCZ5Vi6yZZ9nmye +Um4rDsV7q0Pi6dKZx0g8HbkM/YlfQ5K96ZunBl7LvaDY1+g8hbS+fTRsx9gj7Yg5 +Pk/Hz7pN7OGetQ2V0knTtnSZti/+zK2FXWO8KbPbpupgY8cbsKJSDu4t/WIazLcu +IBbBAYXNZqeHgLpIqeoJaxi0elkzQXRxC+NJOGCPMWIhL+hedOjoUV11lwGwF7qO +K6QUR6j4lGqneHzV18kuW3XJxny7AYxIw8vxS5yb7ZLsq4x1MRd4dQQDlUUHN5dx +l0eh8nEdMBFoeJjymPS9gsyDw41K1yTV3LROWEWSOxmt4r8zd7THz2P1k2ZZ8WXv +Xugim16jSyP/pyZc9vML8wssowyVaYxL+p9zPT1lGGRkFmDCgFY= +=GGg8 +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.1.2.tar.xz b/libreoffice-translations-7.4.1.2.tar.xz deleted file mode 100644 index 445fe9e..0000000 --- a/libreoffice-translations-7.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f77a382d562b6bcebaec69321de4b6ab6daec0240216d314d0c8c6fee4c32fae -size 199194804 diff --git a/libreoffice-translations-7.4.1.2.tar.xz.asc b/libreoffice-translations-7.4.1.2.tar.xz.asc deleted file mode 100644 index 145f6d4..0000000 --- a/libreoffice-translations-7.4.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u -rqORwQ/+PtY6ixz/N9bdVUe8eeGHdsW8IpPZ279zqqx1ApqnysJM2QvjEMV8b1Pc -4IrV2kVWA9XAaiQMCUtauOCO+av3/nO8vUj8Y4XHf0Z785D21bsIiB5yG/7xEx4H -FL2r3LSeCRYkDqNMiEi6WsB5jIEuKeGSkHooq6rT4MeZvDnEqE5aKqt5tBnvZnRl -ZnsXOmH/yH04PeKtG8DQ0JePuaBt1zhyQRt/G1FIn48zKL01wA7ogNyAfOZArh2j -9yHSjPe+7lTuFlc5P7T0PiUOa6qq6yeTN5pEnSJ57D8cBDxHHTD2vOL7xCKo21pn -n8w9ga6VDOeqq2ziqg8zox50TZDW9rNRl1U4haGLaolxbq/oTYAQn/ZcAUo9XDtL -saP/4I1/02k04fGFqbMGYGkTF5brlq1VU2+HYdYrvqZO7GLGw6qjKeADAlezUx65 -611I4/yYZeeNPMcOmzu6FrzySgHCJocdatq/tbMTaIkOWagosjdqMa5R4FPV0dDK -lkhepL1FwU6rFJxly+O+18pgkzmXyU5bwqMaiyuCAoTpq/HLmJP2PUxsqxbMgCfu -Tha4qXetcK5MQQC/WHXMV94dunz5+nAe9WDS9is3C3i3XINARWgznDKn9tg5XUEZ -LQ5KKRIKIYI/5c/clu1qOSOC7CQ9pVaORaEXZP0DeDwFLTK3FFc= -=Qbaa ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.2.3.tar.xz b/libreoffice-translations-7.4.2.3.tar.xz new file mode 100644 index 0000000..2147961 --- /dev/null +++ b/libreoffice-translations-7.4.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1 +size 199319988 diff --git a/libreoffice-translations-7.4.2.3.tar.xz.asc b/libreoffice-translations-7.4.2.3.tar.xz.asc new file mode 100644 index 0000000..0b0d16e --- /dev/null +++ b/libreoffice-translations-7.4.2.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+sACgkQ9DSh76/u +rqM0Vw//aPxr8xOwFl4sZOzFZoODWJ/T0nO+6NzPJBPAIEW0zaEcrrVAHpRQ2mY7 ++IzDT3a3BYxR7MoOxuIjI5uuUqz+m7htcQ7pwsZtvMEzE+gQ7/b0vIan/qOBRYS9 +CQgnvQEObgu2oVigh7FQjbtwERCQmMdR6hVw9gA5kl/dN09OoGY3PfStZkS0oY1E +ikVLomBFsKBAyMcZwr7FdiAa2fV/jQcuGFahqom3x1gE/urJTaxiasCkVnaiiIaS +/Kb2e6YbQyg1tTDvbRLjVk+pmz5HNOpv74c60zy9o0I+sF2o3ok+JbR50QUxBWOT +ibGbay3FYf4miTR2hDMxoihE9EbmMYiMca1xz7ys5G6ynltr/9e3lmjM24ITrw+S +6qvMScWs1NlNRLQ+Yx/n0Lh1rxCOjCQiX01vgztP7R84s9MnFyYcGLRuRzcxqBre +VI95+rtaxPD4lqo1eeceMyEXgK42P8VB4hPGsj855V75lleuHn0RMtLRnlCTHYxX +Lhxbe9JRoyQhq1BgR8hIx8FvDZF6vJfLBQCXPtLtggXXzPElCVahE0TZrLFsVS2q +Zf3x/t0cjw+15K0KOSn49D7WFA01olizNpjESB6acyYKZmLIIAqe1KylT9XvUME6 +6C2FDqEsNcUl2wz4XuBWPXma/dDN0OTcG8mU4ftVtUPg6p7oLus= +=nxfg +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 9f86791..b4b8f79 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 13 10:07:43 UTC 2022 - Danilo Spinella + +- Update to 7.4.2.3: + https://wiki.documentfoundation.org/Releases/7.4.2/RC3 + https://wiki.documentfoundation.org/Releases/7.4.2/RC2 + https://wiki.documentfoundation.org/Releases/7.4.2/RC1 +- Remove upstreamed patches: + * poppler-22.09.0.patch + * bsc1203502.patch + ------------------------------------------------------------------- Tue Sep 27 19:27:10 UTC 2022 - Andreas Stieger @@ -29,6 +40,8 @@ Wed Aug 31 07:45:42 UTC 2022 - Danilo Spinella - Update to 7.4.1.1: https://wiki.documentfoundation.org/Releases/7.4.1/RC1 + * provides fixes for the following security vulnerabilities: + CVE-2022-3140, bsc#1203209 ------------------------------------------------------------------- Tue Aug 23 13:46:00 UTC 2022 - Danilo Spinella @@ -121,6 +134,9 @@ Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella You can find the complete release notes here: https://wiki.documentfoundation.org/Releases/7.3.3/RC1 * Fixes bsc#1196499 + * provides fixes for the following security vulnerabilities: + CVE-2022-26305, bsc#1201868 + CVE-2022-26307, bsc#1201872 - Remove upstreamed patches: * bsc1195881.patch * bsc1196212.patch diff --git a/libreoffice.spec b/libreoffice.spec index dd4b241..49a2fbb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.4.1.2 +Version: 7.4.2.3 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -107,10 +107,6 @@ Patch3: mediawiki-no-broken-help.diff Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch -Patch11: poppler-22.09.0.patch -# PATCH-FIX-UPSTREAM revert changes that cause problems with the libreoffice window -# in KDE, bsc#1203502 -Patch12: bsc1203502.patch # PATCH-FIX-UPSTREAM remove egrep/fgrep calls Patch13: libreoffice-7.4.1.2-grep.patch # Build with java 8 @@ -1032,10 +1028,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch10 -p1 %patch101 -p1 %endif -%if 0%{?suse_version} > 1550 -%patch11 -p1 -%endif -%patch12 -p1 %patch13 -p1 %patch990 -p1 %patch991 -p1 diff --git a/poppler-22.09.0.patch b/poppler-22.09.0.patch deleted file mode 100644 index 2dfd600..0000000 --- a/poppler-22.09.0.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://gerrit.libreoffice.org/c/core/+/139249 - -From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 2 Sep 2022 04:31:18 +0100 -Subject: [PATCH] Fix build with Poppler 22.09.0 - -With Poppler 22.09.0, LO fails to build with: -``` -/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments - state->getLineDash(&dashArray, &arrayLen, &startOffset); - ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here - const std::vector &getLineDash(double *start) - ^ -1 error generated. -``` - -Poppler changed the getLineDash interface: -``` -- void getLineDash(double **dash, int *length, double *start) -+ const std::vector &getLineDash(double *start) -``` - -Signed-off-by: Sam James -Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state) - return; - assert(state); - -- double* dashArray; int arrayLen; double startOffset; -+ int arrayLen; double startOffset; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double* dashArray; -+ const std::vector &dash = state->getLineDash(&startOffset); -+ dashArray = dash.data(); -+ arrayLen = dash.size(); -+#else -+ double* dashArray; - state->getLineDash(&dashArray, &arrayLen, &startOffset); -+#endif - - printf( "updateLineDash" ); - if( arrayLen && dashArray )