Merge version 2:4.24.6+dfsg-1+rpi1 and 2:4.25.0+dfsg-1 to produce 2:4.25.0+dfsg-1...

diff --cc debian/changelog
index 4612331c1ec9e5e91f98464679a077cd1fb21a74,4838cf3d403773f4e18aa2f0f20fc105e6af9d9b..97755ef77be18162953a866060a69f5a3c5dfd7f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,50 @@@
- samba (2:4.24.6+dfsg-1+rpi1) forky-staging; urgency=medium
++samba (2:4.25.0+dfsg-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 2:4.19.1+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Oct 2023 15:37:21 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 07 Sep 2026 21:45:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 05 Oct 2026 16:24:10 +0000
++
+ samba (2:4.25.0+dfsg-1) unstable; urgency=medium
+ 
+   * gbp.conf, watch: 4.25.x
+   * new upstream release (4.25.0). See WHATSNEW.txt for more details.
+   * rules: bump upstream versions of talloc & tevent
+   * libtalloc*.symbols, libtevent*.symbols: update
+   * d/rules, d/patches/ctdb-create-piddir.patch: refresh,
+     use doc/examples/ctdb.init
+   * d/patches/: refresh
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Fri, 25 Sep 2026 12:44:12 +0300
+ 
+ samba (2:4.24.7+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream stable.bugfix release:
+    - https://bugzilla.samba.org/show_bug.cgi?id=15988:
+      Samba internal DNS service doesn't handle switch from UDP to TCP
+      when packet is larger than 4k
+    - https://bugzilla.samba.org/show_bug.cgi?id=16082:
+      An inactive node can run recovery resulting in inconsistent databases
+    - https://bugzilla.samba.org/show_bug.cgi?id=16097:
+      POSIX ACL backend silently discards erros when processing NT ACLs
+      with non-canonical ordering
+    - https://bugzilla.samba.org/show_bug.cgi?id=16144:
+      Incorrect behavior on stream create-disposition
+      when prior handle is closed
+    - https://bugzilla.samba.org/show_bug.cgi?id=16194:
+      autobuild failures need to be reported in a more verbose way
+    - https://bugzilla.samba.org/show_bug.cgi?id=16223:
+      DNS scavenging happens even if fAging is FALSE
+    - https://bugzilla.samba.org/show_bug.cgi?id=16225:
+      dns client problems related to EDNS usage
+    - https://bugzilla.samba.org/show_bug.cgi?id=16226:
+      samba-tool dns zoneoptions $DC_SERVER_IP _msdcs.addom.samba.example.com
+      -P --aging=1 gives WERR_INTERNAL_DB_ERROR
+   * cmocka: it is only used (if at all) in unit tests, not shipped -
+     drop build-dep and ignore generated one
+   * asn1util-deps.diff: another library missing private deps
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Thu, 10 Sep 2026 00:23:20 +0300
  
  samba (2:4.24.6+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge