Merge version 2:4.20.1+dfsg-5+rpi1 and 2:4.20.2+dfsg-2 to produce 2:4.20.2+dfsg-2...

diff --cc debian/changelog
index f7e877b694b481b8d0adb46a3047baa0e55b4dad,586859d7329135dc50e0a8e71e7a8c2b96564d5c..5b1a629077940ada637e08149c0e546319cb41e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,61 +1,68 @@@
- samba (2:4.20.1+dfsg-5+rpi1) trixie-staging; urgency=medium
++samba (2:4.20.2+dfsg-2+rpi1) trixie-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>  Fri, 14 Jun 2024 03:43:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 23 Jun 2024 12:45:46 +0000
++
+ samba (2:4.20.2+dfsg-2) unstable; urgency=medium
+ 
+   * tilde-in-version.diff - allow tilde in version string
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Thu, 20 Jun 2024 09:49:50 +0300
+ 
+ samba (2:4.20.2+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream stable/bugfix release:
+    - https://bugzilla.samba.org/show_bug.cgi?id=13019
+      Dynamic DNS updates with the internal DNS are not working
+    - https://bugzilla.samba.org/show_bug.cgi?id=13213
+      Samba build is not reproducible
+    - https://bugzilla.samba.org/show_bug.cgi?id=14981
+      netr_LogonSamLogonEx returns NR_STATUS_ACCESS_DENIED with SysvolReady=0
+    - https://bugzilla.samba.org/show_bug.cgi?id=15412 Anonymous smb3
+      signing/encryption should be allowed (similar to Windows Server 2022)
+    - https://bugzilla.samba.org/show_bug.cgi?id=15435
+      Regression DFS not working with widelinks = true
+    - https://bugzilla.samba.org/show_bug.cgi?id=15569
+      ldb qsort might r/w out of bounds with an intransitive compare function
+    - https://bugzilla.samba.org/show_bug.cgi?id=15573
+      Panic in dreplsrv_op_pull_source_apply_changes_trigger
+    - https://bugzilla.samba.org/show_bug.cgi?id=15620
+      s4:nbt_server: does not provide unexpected handling, so winbindd
+      can't use nmb requests instead cldap
+    - https://bugzilla.samba.org/show_bug.cgi?id=15625
+      Many qsort() comparison functions are non-transitive, which can lead
+      to out-of-bounds access in some circumstances
+    - https://bugzilla.samba.org/show_bug.cgi?id=15633
+      samba-gpupdate - Invalid NtVer in netlogon_samlogon_response
+    - https://bugzilla.samba.org/show_bug.cgi?id=15638
+      Need to change gitlab-ci.yml tags in all branches to avoid CI bill
+    - https://bugzilla.samba.org/show_bug.cgi?id=15642 winbindd,
+      net ads join and other things don't work on an ipv6 only host
+    - https://bugzilla.samba.org/show_bug.cgi?id=15653 idmap_ad creates
+      an incorrect local krb5.conf in case of trusted domain lookups
+    - https://bugzilla.samba.org/show_bug.cgi?id=15654
+      new --vendor-name and --vendor-patch-revision options for ./configure
+    - https://bugzilla.samba.org/show_bug.cgi?id=15659
+      Segmentation fault when deleting files in vfs_recycle
+      Closes: #1073252
+    - https://bugzilla.samba.org/show_bug.cgi?id=15660 The images don't build
+      after the git security release and CentOS 8 Stream is EOL
+    - https://bugzilla.samba.org/show_bug.cgi?id=15662
+      vfs_widelinks with DFS shares breaks case insensitivity
+    - https://bugzilla.samba.org/show_bug.cgi?id=15664
+      Panic in vfs_offload_token_db_fetch_fsp()
+    - https://bugzilla.samba.org/show_bug.cgi?id=15665
+      CTDB RADOS mutex helper misses namespace support
+    - https://bugzilla.samba.org/show_bug.cgi?id=15666 "client use kerberos"
+      and --use-kerberos is ignored for the machine account
+   * d/libldb2.symbols,d.python3-ldb.symbols.in: add new version (2.9.1)
+   * use ./configure --vendor-name= instead of patching ./VERSION
+   * omit samba-ad-dc for i386 ubuntu
+   * samba-ad-dc: usr-move compensation maintscripts: add "set -e"
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Wed, 19 Jun 2024 23:59:36 +0300
  
  samba (2:4.20.1+dfsg-5) unstable; urgency=medium
  

diff --cc debian/rules
index 20e943402670859af7e206a1cbfe26af912064ef,140c7989cc4f26dffd4467b6259b5983dce327e1..dcc96beeaa0c29795cd3440655cb720af522ed09
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -87,10 -88,10 +88,10 @@@ endi
  
  # Ubuntu i386 binary compatibility only effort: Disable some i386 packages and modules
  ifeq (${DEB_VENDOR}-${DEB_HOST_ARCH}, Ubuntu-i386)
- omit-pkgs += ctdb libpam-winbind samba samba-testsuite samba-vfs-modules
+ omit-pkgs += ctdb libpam-winbind samba samba-ad-dc samba-testsuite samba-vfs-modules
  endif
  
 -ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
 +ifneq (,$(filter armel armhf mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
  # on these platforms gcc does not link with -latomic, resulting in
  #   third_party/heimdal/lib/krb5/krcache.c.55.o: in function `krcc_get_principal':