Merge version 1:20230101~dfsg-1+rpi1 and 1:20230101~dfsg-1.1~deb12u1 to produce 1...

diff --cc debian/changelog
index 9622518ea543059132f5a93e409a7ef5bf8635d8,26d4ea5b93c28677817aa15448d1ff2e2b43135b..f86c2c70a1f7f72ddd820d9703ecdd5e530a34b7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,19 +1,28 @@@
- fontforge (1:20230101~dfsg-1+rpi1) bookworm-staging; urgency=medium
++fontforge (1:20230101~dfsg-1.1~deb12u1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:20190801~dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 01 Apr 2020 17:53:42 +0000]
 +  * Disable call to SplineFontFree in _MergeFont to work around use after
 +    free bug (see debian bug 948876).
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Jan 2023 05:17:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 04 Apr 2024 19:16:10 +0000
++
+ fontforge (1:20230101~dfsg-1.1~deb12u1) bookworm-security; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rebuild for bookworm-security.
+ 
+  -- Adrian Bunk <bunk@debian.org>  Fri, 15 Mar 2024 22:41:07 +0200
+ 
+ fontforge (1:20230101~dfsg-1.1) unstable; urgency=high
+ 
+   * Non-maintainer upload.
+   * CVE-2024-25081: Spline Font command injection via crafted filenames
+   * CVE-2024-25082: Spline Font command injection via crafted archives
+     or compressed files
+   * Closes: #1064967
+ 
+  -- Adrian Bunk <bunk@debian.org>  Fri, 08 Mar 2024 01:15:58 +0200
  
  fontforge (1:20230101~dfsg-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 68dba9d9298922838e319cfe2a2e5dfe8dcc40a2,625a055424d265e827b21677f3c6795df24f6b8e..243eeed5b3bb760ad4670ce3597da905a4e3f2e0
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@
  0003-use-local-libjs-mathjax.patch
  2003_avoid_privacy_breach.patch
  2004-fix-privacy-breach-logo.patch
+ 0001-fix-splinefont-shell-command-injection-5367.patch
 +4000-use-after-free-hack.patch