Merge branch 'next'

diff --cc config/rootfiles/packages/aarch64/samba
index a0aab25c004cdb18052398ba12bc84cbba5e84b0,88b7905ce3d7806acdec63e4ef54e3c7f6d215ee..ddc964c5c8a6703366687b475d727dff1cac610b
--- 1/config/rootfiles/packages/aarch64/samba
--- 2/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@@ -688,9 -701,9 +701,13 @@@ usr/lib/samba/libposix-eadb-samba4.s
  usr/lib/samba/libprinter-driver-samba4.so
  usr/lib/samba/libprinting-migrate-samba4.so
  usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2
++<<<<<<< HEAD
 +usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1
++=======
+ usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.3.0
++>>>>>>> next
  usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2
- usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1
+ usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.2
  usr/lib/samba/libregistry-samba4.so
  usr/lib/samba/libreplace-samba4.so
  usr/lib/samba/libroken-samba4.so.19

diff --cc config/rootfiles/packages/i586/samba
index b28a4d8949ca530dc70ab28633d6d22c32828e38,6b43544f1155bbd280549f22c13e8a83d1df94bd..d302dd7030075b4a9a6c3d1c9e88ed47d5e305c1
--- 1/config/rootfiles/packages/i586/samba
--- 2/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@@ -688,9 -701,9 +701,13 @@@ usr/lib/samba/libposix-eadb-samba4.s
  usr/lib/samba/libprinter-driver-samba4.so
  usr/lib/samba/libprinting-migrate-samba4.so
  usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2
++<<<<<<< HEAD
 +usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1
++=======
+ usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.3.0
++>>>>>>> next
  usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2
- usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1
+ usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.2
  usr/lib/samba/libregistry-samba4.so
  usr/lib/samba/libreplace-samba4.so
  usr/lib/samba/libroken-samba4.so.19