Merge version 1:2.4.1+dfsg1-5+rpi1 and 1:2.4.1+dfsg1-6 to produce 1:2.4.1+dfsg1-6...

diff --cc debian/changelog
index e454ff61ac61e7cc7587b510d64de72824e4c419,bbf26d160cb8857f074793f10c8079678ef88f2a..bba9da9e699fef8733915a2fdeecac6a3fb740f1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- dovecot (1:2.4.1+dfsg1-5+rpi1) trixie-staging; urgency=medium
++dovecot (1:2.4.1+dfsg1-6+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jun 2025 11:02:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Jul 2025 10:39:42 +0000
++
+ dovecot (1:2.4.1+dfsg1-6) unstable; urgency=medium
+ 
+   * [8c6ba88] Fix LDAP SASL auth support (Closes: #1106784)
+   * [fac9131] Avoid -fstack-clash-protection on hppa architecture
+     (Closes: #1107609)
+   * [071beb5] d/control: update Uploaders to reflect the current reality
+ 
+  -- Noah Meyerhans <noahm@debian.org>  Wed, 18 Jun 2025 10:01:58 -0400
  
  dovecot (1:2.4.1+dfsg1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge