From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 19 May 2026 09:09:07 +0000 (+0100)
Subject: Merge version 4:7.4.7-1+rpi1+deb12u10 and 4:7.4.7-1+deb12u12 to produce 4:7.4.7-1... 
X-Git-Tag: archive/raspbian/4%7.4.7-1+rpi1+deb12u12^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c8226ac4fc9832aa95de9dfa04d4315d0f71f9b0;p=libreoffice.git

Merge version 4:7.4.7-1+rpi1+deb12u10 and 4:7.4.7-1+deb12u12 to produce 4:7.4.7-1+rpi1+deb12u12
---

c8226ac4fc9832aa95de9dfa04d4315d0f71f9b0
diff --cc debian/changelog
index da648d07f04,e3f43b03e88..a63402cd944
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,16 +1,29 @@@
- libreoffice (4:7.4.7-1+rpi1+deb12u10) bookworm-staging; urgency=medium
++libreoffice (4:7.4.7-1+rpi1+deb12u12) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 11 Jan 2026 02:38:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 May 2026 09:09:05 +0000
++
+ libreoffice (4:7.4.7-1+deb12u12) bookworm; urgency=medium
+ 
+   * debian/patches/Fix-check-for-further-exotic-protocols.diff: add missing
+     patch for CVE-2024-12426, thanks Caolan McNamara
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 07 May 2026 21:49:15 +0200
+ 
+ libreoffice (4:7.4.7-1+deb12u11) bookworm-security; urgency=medium
+ 
+   * debian/patches/Conform-AlignEngine-parsing-to-spec.diff: as name says;
+     from libreoffice-26-2 branch; fixes CVE-2026-4430
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 19 Mar 2026 21:25:21 +0100
  
  libreoffice (4:7.4.7-1+deb12u10) bookworm; urgency=medium