Merge version 1:2.3.21+dfsg1-3+rpi1 and 1:2.3.21.1+dfsg1-1 to produce 1:2.3.21.1...

diff --cc debian/changelog
index 45dccb9a1237274d13abf7a4c5cd1c48a812566c,b7ab4746f59e4905ead30c7c74544653dfcb7578..8e619e1fed7a4b1db0b08b09790cec60cf66f82a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,32 @@@
- dovecot (1:2.3.21+dfsg1-3+rpi1) trixie-staging; urgency=medium
++dovecot (1:2.3.21.1+dfsg1-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1:2.3.21+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Jun 2024 17:16:27 +0000]
 +  * Disablte testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Jun 2024 17:16:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Feb 2025 19:06:17 +0000
++
+ dovecot (1:2.3.21.1+dfsg1-1) unstable; urgency=medium
+ 
+   [ Noah Meyerhans ]
+   * [452a10b] Move systemd unit files to /usr (Closes: #1071915)
+ 
+   [ Niels Thykier ]
+   * [a9caf51] Avoid unnecessary implicit requirement for `(fake)root`
+ 
+   [ Christian Göttsche ]
+   * [8c253d1] salsa-ci: enable build_twice job
+   * [47122cd] Bump to standards version 4.7.0 (no further changes)
+   * [4062094] Replace obsolete build-dependency pkg-config with pkgconf
+   * [f1221b8] Split overlong line in changelog
+   * [dd876aa] Annotate Debian patches
+   * [590287e] Fix typos in changelog
+ 
+   [ Noah Meyerhans ]
+   * [a212eb8] New upstream version 2.3.21.1+dfsg1
+     - Fix CVE-2024-23185 (Closes: #1078877)
+     - Fix CVE-2024-23185 (Closes: #1078877)
+ 
+  -- Noah Meyerhans <noahm@debian.org>  Sat, 17 Aug 2024 13:26:24 -0400
  
  dovecot (1:2.3.21+dfsg1-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge