Merge ~ahasenack/ubuntu/+source/samba:kinetic-samba-416-merge into ubuntu/+source/samba:ubuntu/devel

[Andreas Hasenack]

Dummy MP for bug #1976112

diff --git a/debian/changelog b/debian/changelog
index 57bf61f..0346481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,216 +1,98 @@
 <<<<<<< debian/changelog
-samba (2:4.15.5~dfsg-0ubuntu6) kinetic; urgency=medium
-
-  * No-change rebuild against libicu71
-
- -- Steve Langasek <[e-mail]>  Sat, 30 Apr 2022 02:14:39 +0000
-
-samba (2:4.15.5~dfsg-0ubuntu5) jammy; urgency=medium
-
-  * Enable glusterfs support (LP: #1894618):
-    - d/control: revert disabling of glusterfs, since it's in main now
-    - d/rules: in Ubuntu, glusterfs is not built for i386, so don't
-      enable the samba glusterfs vfs mofule in that case
-    - d/control: build-depend on libglusterfs-dev only on !i386 arches
-
- -- Andreas Hasenack <[e-mail]>  Wed, 09 Mar 2022 17:31:25 -0300
-
-samba (2:4.15.5~dfsg-0ubuntu4) jammy; urgency=medium
-
-  * Build dlz module for bind 9.18.x (LP: #1964032)
-    - d/p/add-support-for-bind-918.patch: build a dlz module for
-      bind 9.18.x
-    - d/samba-libs.install: remove fixme comment
-    - d/p/add-support-for-bind-918-2.patch: also update the provisioning
-      tool and template config file
-
- -- Andreas Hasenack <[e-mail]>  Fri, 25 Mar 2022 14:53:19 -0300
-
-samba (2:4.15.5~dfsg-0ubuntu3) jammy; urgency=medium
-
-  * Update nfs scripts for new nfs.conf config (LP: #1961840):
-    - d/p/fix-nfs-service-name-to-nfs-kernel-server.patch: updated to use
-      nfsconf(8) if it's available, instead of parsing the old config
-      files in /etc/default/nfs-*
-    - d/ctdb.example.nfs.conf: /etc/nfs.conf to be used by the example
-      enable-nfs.sh example script
-    - d/ctdb.example.quota: quota config file to be used by the example
-      enable-nfs.sh script
-    - d/ctdb.example.nfs-{common,kernel-server}: obsolete, replaced by
-      nfs.conf
-    - d/ctdb.example.enable.nfs.sh: handle new nfs.conf and other
-      changes in the new nfs server packages
-    - d/rules: install the new/changed ctdb example nfs files
-
- -- Andreas Hasenack <[e-mail]>  Mon, 21 Mar 2022 11:55:54 -0300
-
-samba (2:4.15.5~dfsg-0ubuntu2) jammy; urgency=medium
-
-  * d/p/lp-1951490-fix-printing-KB5006743.patch: Fix printing after
-    Windows 2021-10 Monthly Rollup patch (LP: #1951490)
-
- -- Andreas Hasenack <[e-mail]>  Thu, 10 Mar 2022 10:32:59 -0300
-
-samba (2:4.15.5~dfsg-0ubuntu1) jammy; urgency=medium
-
-  * d/{gpb.conf,watch,README.source}: update for 4.15
-  * New upstream release: 4.15.5 (LP: #1946839)
-  * d/p/Rename-mdfind-to-mdsearch.patch: removed, applied usptream
-  * d/rules: remove --with-dnsupdate, it was merged with
-    --with-ads in samba 4.15.0
-  * d/control: bump required build-depends
-  * d/rules: drop removal of ctdb tests, they are no longer installed
-  * Remove findsmb, no longer installed:
-    - d/smbclient.install: remove findsmb
-    - d/rules: drop fixing of findsmb shebang
-  * d/ctdb.install: remove ctdb_local_daemons, part of ctdb tests,
-    no longer installed
-  * d/samba-libs.install: update list of installed libraries and
-    modules/plugins
-  * d/ctdb.install: add tdb_mutex_check
-  * d/winbind.install: add async_dns_krb5_locator
-  * d/samba.install: install samba-bgqd and its manpage
-  * d/{libsmbclient,libwbclient0}.symbols: symbols updates
-  * d/control: add python3-markdown to build-depends
-  * d/watch: updated to handle ~dfsg versioning, thanks to
-    Sergio Durigan Junior <[e-mail]>
-
- -- Andreas Hasenack <[e-mail]>  Tue, 22 Feb 2022 17:59:22 -0300
-
-samba (2:4.13.17~dfsg-0ubuntu1) jammy; urgency=medium
-
-  * Update to 4.13.17 as a security update
-    - CVE-2021-43566, CVE-2021-44142, CVE-2022-0336
-  * Removed patches included in new version:
-    - debian/patches/trusted_domain_regression_fix.patch
-    - debian/patches/bug14901-*.patch
-    - debian/patches/bug14922.patch
-
- -- Marc Deslauriers <[e-mail]>  Mon, 14 Feb 2022 10:19:08 -0500
-
-samba (2:4.13.14+dfsg-0ubuntu5) jammy; urgency=medium
-
-  * No-change rebuild for icu soname change
-
- -- William 'jawn-smith' Wilson <[e-mail]>  Fri, 11 Feb 2022 11:36:14 -0600
-
-samba (2:4.13.14+dfsg-0ubuntu4) jammy; urgency=medium
-
-  * d/t/util: fix setting the password of the smb test user
-    (LP: #1955851)
-
- -- Andreas Hasenack <[e-mail]>  Thu, 20 Jan 2022 17:06:13 -0300
-
-samba (2:4.13.14+dfsg-0ubuntu3) jammy; urgency=medium
-
-  * No-change rebuild with Python 3.10 as default version
-
- -- Graham Inggs <[e-mail]>  Sun, 16 Jan 2022 07:01:34 +0000
-
-samba (2:4.13.14+dfsg-0ubuntu2) jammy; urgency=medium
-
-  * SECURITY REGRESSION: Kerberos authentication on standalone server in
-    MIT realm broken
-    - debian/patches/bug14922.patch: fix MIT Realm regression in
-      source3/auth/user_krb5.c.
-
- -- Marc Deslauriers <[e-mail]>  Mon, 13 Dec 2021 07:09:36 -0500
-
-samba (2:4.13.14+dfsg-0ubuntu1) jammy; urgency=medium
-
-  * Update to 4.13.14 as a security update (LP: #1950363)
-    - debian/patches/CVE-2021-20254.patch: removed, included in new
-      version.
-    - debian/control: bump ldb Build-Depends to 2.2.3.
-    - debian/samba-libs.install: added libdcerpc-pkt-auth.so.0.
-    - debian/patches/trusted_domain_regression_fix.patch: fix regression
-      introduced in 4.13.14.
-    - debian/patches/bug14901-*.patch: upstream patches to fix some
-      mapping issues.
-    - debian/patches/bug14918-*.patch: upstream patches to properly handle
-      dangling symlinks.
-    - CVE-2016-2124, CVE-2020-25717, CVE-2020-25718, CVE-2020-25719,
-      CVE-2020-25721, CVE-2020-25722, CVE-2021-3738, CVE-2021-23192
-
- -- Marc Deslauriers <[e-mail]>  Tue, 09 Nov 2021 14:52:07 -0500
-
-samba (2:4.13.5+dfsg-2ubuntu4) jammy; urgency=medium
-
-  * No-change rebuild against liburing2
-
- -- Paride Legovini <[e-mail]>  Mon, 22 Nov 2021 18:08:34 +0100
-
-samba (2:4.13.5+dfsg-2ubuntu3) impish; urgency=medium
-
-  * d/samba.postinst: do not populate sambashare from the admin group
-    (Debian packaging cherry-pick. LP: #1942195)
-
- -- Paride Legovini <[e-mail]>  Wed, 06 Oct 2021 10:31:14 +0200
-
-samba (2:4.13.5+dfsg-2ubuntu2) impish; urgency=medium
-
-  * No-change rebuild due to OpenLDAP soname bump.
-
- -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 18:08:36 -0400
-
-samba (2:4.13.5+dfsg-2ubuntu1) impish; urgency=medium
+=======
+samba (2:4.16.1+dfsg-8ubuntu1) kinetic; urgency=medium
 
-  * Merge with Debian unstable. Remaining changes:
+  * Merge with Debian unstable (LP: #1971256, LP: #1846947). Remaining
+    changes:
     - d/p/VERSION.patch: Update vendor string to "Ubuntu".
     - debian/smb.conf;
       + Add "(Samba, Ubuntu)" to server string.
       + Comment out the default [homes] share, and add a comment about
         "valid users = %s" to show users how to restrict access to
         \\server\username to only username.
-    - d/control: Disable glusterfs support because it's not in main.
-      MIR bug is https://launchpad.net/bugs/1274247
     - debian/control: Ubuntu i386 binary compatibility:
       + drop ceph support
-    - d/control: add a versioned libgnutls28-dev build-depends to reduce
-      the amount of in-tree crypto code that is built
     - d/control: enable the liburing vfs module, except on i386 where
       liburing is not available
     - d/t/{cifs-share-access-uring,smbclient-share-access-uring}:
       Skip running the tests if on i386 platform, because the uring
       package is not available there.
-  * Dropped changes:
-    - debian/samba-common.config:
-      + Do not change priority to high if dhclient3 is installed.
-      [Included in 2:4.13.4+dfsg-1]
-    - d/p/fix-nfs-service-name-to-nfs-kernel-server.patch:
-      change nfs service name from nfs to nfs-kernel-server
-      (LP #722201)
-      [Included in 2:4.13.4+dfsg-1]
-    - d/p/ctdb-config-enable-syslog-by-default.patch:
-      enable syslog and systemd journal by default
-      [Included in 2:4.13.4+dfsg-1]
-    - debian/rules: Ubuntu i386 binary compatibility:
-      + drop ceph support
-      + disable the following binary packages:
-        - ctdb
-        - libnss-winbind
-        - libpam-winbind
-        - python3-samba
-        - samba
-        - samba-common-bin
-        - samba-testsuite
-        - winbind
-      [Included in 2:4.13.4+dfsg-1]
-    - debian/rules: Ubuntu i386 binary compatibility:
-      + re-enable the following binary packages:
-        - libnss-winbind
-        - samba-common-bin
-        - python3-samba
-        - winbind
-      [Included in 2:4.13.4+dfsg-1]
-    - SECURITY UPDATE: wrong group entries via negative idmap cache entries
-      + debian/patches/CVE-2021-20254.patch: Simplify sids_to_unixids() in
-        source3/passdb/lookup_sid.c.
-      + CVE-2021-20254
-      [Included in 2:4.13.5+dfsg-2]
+    - d/t/util: fix setting the password of the smb test user
+      (LP #1955851)
+    - Update nfs scripts for new nfs.conf config (LP #1961840):
+      + d/p/fix-nfs-service-name-to-nfs-kernel-server.patch: updated to use
+        nfsconf(8) if it's available, instead of parsing the old config
+        files in /etc/default/nfs-*
+      + d/ctdb.example/nfs-kernel-server/nfs.conf: /etc/nfs.conf to be
+        used by the example enable-nfs.sh example script
+      + d/ctdb.example/nfs-kernel-server/ctdb.example.quota: quota
+        config file to be used by the example enable-nfs.sh script
+      + d/ctdb.example/nfs-kernel-server/nfs-{common,kernel-server}:
+        obsolete, replaced by nfs.conf
+      + d/ctdb.example/nfs-kernel-server/enable-nfs.sh: handle new
+        nfs.conf and other changes in the new nfs server packages
+    - Build dlz module for bind 9.18.x (LP #1964032)
+      + d/p/add-support-for-bind-918.patch: build a dlz module for
+        bind 9.18.x
+      + d/p/add-support-for-bind-918-2.patch: also update the
+        provisioning tool and template config file
+    - d/rules: in Ubuntu, glusterfs is not built for i386, so don't
+      enable the samba glusterfs vfs mofule in that case
+    - d/control: build-depend on libglusterfs-dev only on !i386 arches
+  * Dropped:
+    - d/control: add a versioned libgnutls28-dev build-depends to reduce
+      the amount of in-tree crypto code that is built
+      [superfluous, the version in the archive is recent enough]
+    - d/samba.postinst: do not populate sambashare from the Ubuntu admin group (LP 1942195)
+      [Included in 2:4.13.13+dfsg-1]
+    - d/control: bump required build-depends
+      [Included in Debian]
+    - d/samba-libs.install: update list of installed libraries and
+      modules/plugins
+      [Done in Debian]
+    - debian/patches/CVE-2021-20254.patch: removed, applied upstream
+      [Applied upstream, Debian didn't have this patch]
+    - d/p/Rename-mdfind-to-mdsearch.patch: removed, applied usptream
+      [Applied usptream, Debian did not have it]
+    - d/{gpb.conf,watch,README.source}: update for 4.15
+      [Debian updated it for 4.16]
+    - d/rules: remove --with-dnsupdate, it was merged with
+      --with-ads in samba 4.15.0
+      [Included in 2:4.16.0+dfsg-1]
+    - d/rules: drop removal of ctdb tests, they are no longer installed
+      [Included in 2:4.16.0+dfsg-1]
+    - Remove findsmb, no longer installed:
+      + d/smbclient.install: remove findsmb
+      + d/rules: drop fixing of findsmb shebang
+      [Included in 2:4.16.0+dfsg-1]
+    - d/ctdb.install: remove ctdb_local_daemons, part of ctdb tests,
+      no longer installed
+      [Included in 2:4.16.0+dfsg-1]
+    - d/ctdb.install: add tdb_mutex_check
+      [Included in 2:4.16.0+dfsg-1]
+    - d/winbind.install: add async_dns_krb5_locator
+      [Included in 2:4.16.0+dfsg-1]
+    - d/samba.install: install samba-bgqd and its manpage
+      [Included in 2:4.16.0+dfsg-1]
+    - d/{libsmbclient,libwbclient0}.symbols: symbols updates
+      [Obsolete, these were for 4.15.5]
+    - d/rules: drop dh_perl override, unneeded
+      [Included in 2:4.16.0+dfsg-1]
+    - d/p/lp-1951490-fix-printing-KB5006743.patch: Fix printing after
+      Windows 2021-10 Monthly Rollup patch (LP #1951490)
+      [Included upstream in 4.16.0rc2]
+    - d/rules: install the new/changed ctdb example nfs files
+      [Installed via ctdb.examples]
+  * Added:
+    - rename ctdb example files nfs.conf and quota, to match what the
+      enable-nfs.sh script expects
+    - enable-nfs.sh ctdb example: use debian's filename for the
+      static port sysctl configuration
+    - enable-nfs.sh: in ctdb 4.16, the "recovery lock" config option was
+      renamed to "cluster lock"
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 08 Jun 2022 11:02:29 -0300
 
- -- Athos Ribeiro <[e-mail]>  Mon, 17 May 2021 11:51:54 -0300
-=======
 samba (2:4.16.1+dfsg-8) unstable; urgency=medium
 
   * fix the Breaks/Replaces versions in the previous upload for moving
@@ -507,6 +389,98 @@ samba (2:4.16.0+dfsg-1) experimental; urgency=medium
 
  -- Michael Tokarev <[e-mail]>  Tue, 05 Apr 2022 16:01:25 +0300
 
+>>>>>>> debian/changelog
+samba (2:4.15.5~dfsg-0ubuntu6) kinetic; urgency=medium
+
+  * No-change rebuild against libicu71
+
+ -- Steve Langasek <[e-mail]>  Sat, 30 Apr 2022 02:14:39 +0000
+
+samba (2:4.15.5~dfsg-0ubuntu5) jammy; urgency=medium
+
+  * Enable glusterfs support (LP: #1894618):
+    - d/control: revert disabling of glusterfs, since it's in main now
+    - d/rules: in Ubuntu, glusterfs is not built for i386, so don't
+      enable the samba glusterfs vfs mofule in that case
+    - d/control: build-depend on libglusterfs-dev only on !i386 arches
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 09 Mar 2022 17:31:25 -0300
+
+samba (2:4.15.5~dfsg-0ubuntu4) jammy; urgency=medium
+
+  * Build dlz module for bind 9.18.x (LP: #1964032)
+    - d/p/add-support-for-bind-918.patch: build a dlz module for
+      bind 9.18.x
+    - d/samba-libs.install: remove fixme comment
+    - d/p/add-support-for-bind-918-2.patch: also update the provisioning
+      tool and template config file
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 25 Mar 2022 14:53:19 -0300
+
+samba (2:4.15.5~dfsg-0ubuntu3) jammy; urgency=medium
+
+  * Update nfs scripts for new nfs.conf config (LP: #1961840):
+    - d/p/fix-nfs-service-name-to-nfs-kernel-server.patch: updated to use
+      nfsconf(8) if it's available, instead of parsing the old config
+      files in /etc/default/nfs-*
+    - d/ctdb.example.nfs.conf: /etc/nfs.conf to be used by the example
+      enable-nfs.sh example script
+    - d/ctdb.example.quota: quota config file to be used by the example
+      enable-nfs.sh script
+    - d/ctdb.example.nfs-{common,kernel-server}: obsolete, replaced by
+      nfs.conf
+    - d/ctdb.example.enable.nfs.sh: handle new nfs.conf and other
+      changes in the new nfs server packages
+    - d/rules: install the new/changed ctdb example nfs files
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 21 Mar 2022 11:55:54 -0300
+
+samba (2:4.15.5~dfsg-0ubuntu2) jammy; urgency=medium
+
+  * d/p/lp-1951490-fix-printing-KB5006743.patch: Fix printing after
+    Windows 2021-10 Monthly Rollup patch (LP: #1951490)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 10 Mar 2022 10:32:59 -0300
+
+samba (2:4.15.5~dfsg-0ubuntu1) jammy; urgency=medium
+
+  * d/{gpb.conf,watch,README.source}: update for 4.15
+  * New upstream release: 4.15.5 (LP: #1946839)
+  * d/p/Rename-mdfind-to-mdsearch.patch: removed, applied usptream
+  * d/rules: remove --with-dnsupdate, it was merged with
+    --with-ads in samba 4.15.0
+  * d/control: bump required build-depends
+  * d/rules: drop removal of ctdb tests, they are no longer installed
+  * Remove findsmb, no longer installed:
+    - d/smbclient.install: remove findsmb
+    - d/rules: drop fixing of findsmb shebang
+  * d/ctdb.install: remove ctdb_local_daemons, part of ctdb tests,
+    no longer installed
+  * d/samba-libs.install: update list of installed libraries and
+    modules/plugins
+  * d/ctdb.install: add tdb_mutex_check
+  * d/winbind.install: add async_dns_krb5_locator
+  * d/samba.install: install samba-bgqd and its manpage
+  * d/{libsmbclient,libwbclient0}.symbols: symbols updates
+  * d/control: add python3-markdown to build-depends
+  * d/watch: updated to handle ~dfsg versioning, thanks to
+    Sergio Durigan Junior <[e-mail]>
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 22 Feb 2022 17:59:22 -0300
+
+samba (2:4.13.17~dfsg-0ubuntu1) jammy; urgency=medium
+
+  * Update to 4.13.17 as a security update
+    - CVE-2021-43566, CVE-2021-44142, CVE-2022-0336
+  * Removed patches included in new version:
+    - debian/patches/trusted_domain_regression_fix.patch
+    - debian/patches/bug14901-*.patch
+    - debian/patches/bug14922.patch
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 14 Feb 2022 10:19:08 -0500
+
+<<<<<<< debian/changelog
+=======
 samba (2:4.13.14+dfsg-1) unstable; urgency=high
 
   * New upstream security release in order to address the following defects:
@@ -533,6 +507,55 @@ samba (2:4.13.14+dfsg-1) unstable; urgency=high
 
  -- Mathieu Parent <[e-mail]>  Tue, 09 Nov 2021 20:53:03 +0100
 
+>>>>>>> debian/changelog
+samba (2:4.13.14+dfsg-0ubuntu5) jammy; urgency=medium
+
+  * No-change rebuild for icu soname change
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Fri, 11 Feb 2022 11:36:14 -0600
+
+samba (2:4.13.14+dfsg-0ubuntu4) jammy; urgency=medium
+
+  * d/t/util: fix setting the password of the smb test user
+    (LP: #1955851)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 20 Jan 2022 17:06:13 -0300
+
+samba (2:4.13.14+dfsg-0ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <[e-mail]>  Sun, 16 Jan 2022 07:01:34 +0000
+
+samba (2:4.13.14+dfsg-0ubuntu2) jammy; urgency=medium
+
+  * SECURITY REGRESSION: Kerberos authentication on standalone server in
+    MIT realm broken
+    - debian/patches/bug14922.patch: fix MIT Realm regression in
+      source3/auth/user_krb5.c.
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 13 Dec 2021 07:09:36 -0500
+
+samba (2:4.13.14+dfsg-0ubuntu1) jammy; urgency=medium
+
+  * Update to 4.13.14 as a security update (LP: #1950363)
+    - debian/patches/CVE-2021-20254.patch: removed, included in new
+      version.
+    - debian/control: bump ldb Build-Depends to 2.2.3.
+    - debian/samba-libs.install: added libdcerpc-pkt-auth.so.0.
+    - debian/patches/trusted_domain_regression_fix.patch: fix regression
+      introduced in 4.13.14.
+    - debian/patches/bug14901-*.patch: upstream patches to fix some
+      mapping issues.
+    - debian/patches/bug14918-*.patch: upstream patches to properly handle
+      dangling symlinks.
+    - CVE-2016-2124, CVE-2020-25717, CVE-2020-25718, CVE-2020-25719,
+      CVE-2020-25721, CVE-2020-25722, CVE-2021-3738, CVE-2021-23192
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 09 Nov 2021 14:52:07 -0500
+
+<<<<<<< debian/changelog
+=======
 samba (2:4.13.13+dfsg-1) unstable; urgency=high
 
   [ Athos Ribeiro ]
@@ -553,7 +576,84 @@ samba (2:4.13.13+dfsg-1) unstable; urgency=high
     (Closes: #988170)
 
  -- Mathieu Parent <[e-mail]>  Mon, 01 Nov 2021 08:59:20 +0100
+
 >>>>>>> debian/changelog
+samba (2:4.13.5+dfsg-2ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild against liburing2
+
+ -- Paride Legovini <[e-mail]>  Mon, 22 Nov 2021 18:08:34 +0100
+
+samba (2:4.13.5+dfsg-2ubuntu3) impish; urgency=medium
+
+  * d/samba.postinst: do not populate sambashare from the admin group
+    (Debian packaging cherry-pick. LP: #1942195)
+
+ -- Paride Legovini <[e-mail]>  Wed, 06 Oct 2021 10:31:14 +0200
+
+samba (2:4.13.5+dfsg-2ubuntu2) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 18:08:36 -0400
+
+samba (2:4.13.5+dfsg-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/VERSION.patch: Update vendor string to "Ubuntu".
+    - debian/smb.conf;
+      + Add "(Samba, Ubuntu)" to server string.
+      + Comment out the default [homes] share, and add a comment about
+        "valid users = %s" to show users how to restrict access to
+        \\server\username to only username.
+    - d/control: Disable glusterfs support because it's not in main.
+      MIR bug is https://launchpad.net/bugs/1274247
+    - debian/control: Ubuntu i386 binary compatibility:
+      + drop ceph support
+    - d/control: add a versioned libgnutls28-dev build-depends to reduce
+      the amount of in-tree crypto code that is built
+    - d/control: enable the liburing vfs module, except on i386 where
+      liburing is not available
+    - d/t/{cifs-share-access-uring,smbclient-share-access-uring}:
+      Skip running the tests if on i386 platform, because the uring
+      package is not available there.
+  * Dropped changes:
+    - debian/samba-common.config:
+      + Do not change priority to high if dhclient3 is installed.
+      [Included in 2:4.13.4+dfsg-1]
+    - d/p/fix-nfs-service-name-to-nfs-kernel-server.patch:
+      change nfs service name from nfs to nfs-kernel-server
+      (LP #722201)
+      [Included in 2:4.13.4+dfsg-1]
+    - d/p/ctdb-config-enable-syslog-by-default.patch:
+      enable syslog and systemd journal by default
+      [Included in 2:4.13.4+dfsg-1]
+    - debian/rules: Ubuntu i386 binary compatibility:
+      + drop ceph support
+      + disable the following binary packages:
+        - ctdb
+        - libnss-winbind
+        - libpam-winbind
+        - python3-samba
+        - samba
+        - samba-common-bin
+        - samba-testsuite
+        - winbind
+      [Included in 2:4.13.4+dfsg-1]
+    - debian/rules: Ubuntu i386 binary compatibility:
+      + re-enable the following binary packages:
+        - libnss-winbind
+        - samba-common-bin
+        - python3-samba
+        - winbind
+      [Included in 2:4.13.4+dfsg-1]
+    - SECURITY UPDATE: wrong group entries via negative idmap cache entries
+      + debian/patches/CVE-2021-20254.patch: Simplify sids_to_unixids() in
+        source3/passdb/lookup_sid.c.
+      + CVE-2021-20254
+      [Included in 2:4.13.5+dfsg-2]
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 17 May 2021 11:51:54 -0300
 
 samba (2:4.13.5+dfsg-2) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index a394787..86f01ca 100644
--- a/debian/control
+++ b/debian/control
@@ -100,11 +100,11 @@ Build-Depends-Arch:
 	libblkid-dev,
 	libbsd-dev,
 	libcap-dev [linux-any],
-	libcephfs-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
+	libcephfs-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el ppc64 s390x x32],
 	libcmocka-dev (>= 1.1.3),
 	libcups2-dev,
 	libdbus-1-dev,
-	libglusterfs-dev [linux-any],
+	libglusterfs-dev [!i386],
 	libgnutls28-dev,
 	libgpgme11-dev,
 	libicu-dev,
@@ -117,12 +117,12 @@ Build-Depends-Arch:
 	libparse-yapp-perl,
 	libpcap-dev [hurd-i386 kfreebsd-any],
 	libpopt-dev,
-	librados-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
+	librados-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el ppc64 s390x x32],
 	libreadline-dev,
 	libsystemd-dev [linux-any],
 	libtasn1-6-dev (>= 3.8),
 	libtasn1-bin,
-	liburing-dev [linux-any],
+	liburing-dev [!i386],
 	xfslibs-dev [linux-any],
 	zlib1g-dev (>= 1:1.2.3),
 # python:
diff --git a/debian/ctdb.example.enable.nfs.sh b/debian/ctdb.example.enable.nfs.sh
new file mode 100755
index 0000000..ac50a3e
--- /dev/null
+++ b/debian/ctdb.example.enable.nfs.sh
@@ -0,0 +1,189 @@
+<<<<<<< debian/ctdb.example.enable.nfs.sh
+#!/bin/bash -e
+
+base="/usr/share/doc/ctdb/examples/nfs-kernel-server/"
+logfile="/tmp/enable-ctdb-nfs.$$.log" ; touch $logfile ;
+ghostname=""
+
+# functions ---------
+
+die() { echo error: $@; echo ; exit 1; };
+getout() { echo exit: $@; echo ; exit 0; };
+stopservice() { echo stopping $1... ; systemctl stop $1 2>&1 >> $logfile 2>&1; }
+disableservice() { echo disabling $1... ; systemctl disable $1 2>&1 >> $logfile 2>&1; }
+startservice() { echo starting $1... ; systemctl start $1 2>&1 >> $logfile 2>&1; }
+sysctlrefresh() { echo refreshing sysctl... ; sysctl --system 2>&1 >> $logfile 2>&1; }
+
+backupfile() {
+    echo backing up $1
+    [ -f $1.prvctdb ] && die "backup file $1 already exists!"
+    [ -f $1 ] && cp $1 $1.prvctdb || true
+}
+
+renamefiles() {
+    for f; do
+        [ -f "$f" ] || continue
+        echo "Renaming $f to $f.prvctdb"
+        mv "$f" "$f".prvctdb
+    done
+}
+
+checkservice() {
+    (systemctl list-unit-files | grep -q $1.service) || die "service $1 not found"
+}
+
+replacefile() {
+
+    origfile=$1
+    replfile=$2
+
+
+    [ ! -f $base/$origfile ] && die "coult not find $base/$origfile"
+
+    echo replacing $replfile...
+    cp $base/$origfile $replfile
+}
+
+appendfile() {
+
+    origfile=$1
+    replfile=$2
+
+    [ ! -f $base/$origfile ] && die "coult not find $base/$origfile"
+
+    echo appending $base/$origfile to $replfile...
+    cat $base/$origfile >> $replfile
+}
+
+execnfsenv() {
+
+    file=$1 ; [ -f $file ] || due "inexistent file $file";
+
+    echo executing $file...
+
+    $file 2>&1 >> $logfile 2>&1;
+}
+
+fixnfshostname() {
+
+    type nfsconf > /dev/null 2>&1 || die "nfsconf(8) not found"
+
+    if [ "$ghostname" == "" ]; then
+        echo "What is the FQDN for the public IP address of this host ?"
+        echo -n "> "
+        read ghostname
+    fi
+
+    echo "Setting $ghostname in nfs.conf..."
+    nfsconf --set statd name "$ghostname"
+}
+
+# end of functions --
+
+[ $UID != 0 ] && die "you need root privileges"
+
+echo """
+This script will enable CTDB NFS HA by changing the following files:
+
+(1) /etc/nfs.conf                             ( replace )
+(2) /etc/nfs.conf.d/*.conf                    ( rename  )
+(3) /etc/services                             ( append  )
+(4) /etc/sysctl.d/99-nfs-static-ports.conf    ( create  )
+(5) /etc/default/quota                        ( replace )
+
+and disabling the following services, as they will be managed
+by ctdb:
+
+(1) rpcbind
+(2) nfs-kernel-server
+(3) rpc.rquotad
+
+Obs:
+  - replaced files keep previous versions as "file".prevctdb
+  - dependant services will also be stopped
+"""
+
+while true; do
+    echo -n "Do you agree with this change ? (N/y) => "
+    read answer
+    [ "$answer" == "n" ] && getout "exiting without any changes"
+    [ "$answer" == "y" ] && break
+done
+
+
+echo "checking requirements..."
+
+checkservice nfs-kernel-server
+checkservice quota
+checkservice rpcbind
+
+echo "requirements okay!"
+echo
+
+backupfile /etc/nfs.conf
+renamefiles /etc/nfs.conf.d/*.conf
+backupfile /etc/services
+backupfile /etc/default/quota
+echo
+
+set +e
+
+stopservice ctdb.service
+stopservice quota.service
+stopservice nfs-kernel-server.service
+stopservice rpcbind.service
+stopservice rpcbind.socket
+stopservice rpcbind.target
+echo
+
+disableservice ctdb.service
+disableservice quota.service
+disableservice nfs-kernel-server.service
+disableservice rpcbind.service
+disableservice rpcbind.socket
+disableservice rpcbind.target
+echo
+
+set -e
+
+replacefile nfs.conf /etc/nfs.conf
+replacefile 99-nfs-static-ports.conf /etc/sysctl.d/99-nfs-static-ports.conf
+replacefile quota /etc/default/quota
+echo
+
+appendfile services /etc/services
+echo
+
+fixnfshostname
+echo
+
+sysctlrefresh
+echo
+
+echo """Finished! Make sure to configure properly:
+
+    - /etc/exports (containing the clustered fs to be exported)
+    - /etc/ctdb/nodes (containing all your node private IPs)
+    - /etc/ctdb/public_addressess (containing public addresses)
+
+A log file can be found at:
+
+    - /tmp/enable-ctdb-nfs.$$.log
+
+Remember:
+
+    - to place a recovery lock in /etc/ctdb/ctdb.conf:
+        ...
+        [cluster]
+        recovery lock = /clustered.filesystem/.reclock
+        ...
+
+And, make sure you enable ctdb service again:
+
+    - systemctl enable ctdb.service
+    - systemctl start ctdb.service
+
+Enjoy!
+"""
+=======
+>>>>>>> debian/ctdb.example.enable.nfs.sh
diff --git a/debian/ctdb.example/nfs-kernel-server/enable-nfs.sh b/debian/ctdb.example/nfs-kernel-server/enable-nfs.sh
index f719e63..2346601 100755
--- a/debian/ctdb.example/nfs-kernel-server/enable-nfs.sh
+++ b/debian/ctdb.example/nfs-kernel-server/enable-nfs.sh
@@ -87,7 +87,7 @@ This script will enable CTDB NFS HA by changing the following files:
 (1) /etc/nfs.conf                             ( replace )
 (2) /etc/nfs.conf.d/*.conf                    ( rename  )
 (3) /etc/services                             ( append  )
-(4) /etc/sysctl.d/99-nfs-static-ports.conf    ( create  )
+(4) /etc/sysctl.d/98-nfs-static-ports.conf    ( create  )
 (5) /etc/default/quota                        ( replace )
 
 and disabling the following services, as they will be managed
@@ -146,7 +146,7 @@ echo
 set -e
 
 replacefile nfs.conf /etc/nfs.conf
-replacefile 99-nfs-static-ports.conf /etc/sysctl.d/99-nfs-static-ports.conf
+replacefile 98-nfs-static-ports.conf /etc/sysctl.d/98-nfs-static-ports.conf
 replacefile quota /etc/default/quota
 echo
 
@@ -171,10 +171,10 @@ A log file can be found at:
 
 Remember:
 
-    - to place a recovery lock in /etc/ctdb/ctdb.conf:
+    - to place a cluster lock in /etc/ctdb/ctdb.conf:
         ...
         [cluster]
-        recovery lock = /clustered.filesystem/.reclock
+        cluster lock = /clustered.filesystem/.reclock
         ...
 
 And, make sure you enable ctdb service again:
diff --git a/debian/ctdb.example/nfs-kernel-server/nfs-common b/debian/ctdb.example/nfs-kernel-server/nfs-common
deleted file mode 100644
index 9d4f22c..0000000
--- a/debian/ctdb.example/nfs-kernel-server/nfs-common
+++ /dev/null
@@ -1,19 +0,0 @@
-# CTDB: /etc/default/nfs-common for clustering
-
-NFS_HOSTNAME="PLACE_HOSTNAME_HERE"
-
-# rpc.statd - daemon listening for reboot notifications (locks related)
-NEED_STATD="yes"
-STATDOPTS="-n ${NFS_HOSTNAME} -p 32765 -o 32766 -H /etc/ctdb/statd-callout -T 32768 -U 32768"
-STATD_HOSTNAME="$NFS_HOSTNAME"
-
-# rpc.gssd - security context for rpc connections
-NEED_GSSD="no"
-
-# rpc.idmapd - NFSv4 <-> name mapping daemon (fallback nowadays)
-# recent kernels use nfsidmap(8) instead
-NEED_IDMAPD="no"
-
-# rpc.quota - usage quota
-RPCRQUOTADOPTS="-p 32769"
-
diff --git a/debian/ctdb.example/nfs-kernel-server/nfs-kernel-server b/debian/ctdb.example/nfs-kernel-server/nfs-kernel-server
deleted file mode 100644
index 6aa5df9..0000000
--- a/debian/ctdb.example/nfs-kernel-server/nfs-kernel-server
+++ /dev/null
@@ -1,16 +0,0 @@
-# CTDB: /etc/default/nfs-kernel-server for clustering
-
-NFS_HOSTNAME="PLACE_HOSTNAME_HERE"
-
-# rpc.nfsd - user level part of nfs service (kernel: nfsd module)
-RPCNFSDPRIORITY=0
-RPCNFSDCOUNT=8
-RPCNFSDOPTS="-N 4"
-
-# rpc.mountd - server side of nfs mount protocol
-RPCMOUNTDOPTS="-p 32767 --manage-gids --no-nfs-version 4"
-
-# rpc.svcgssd - userspace daemon to handle sec context for kernel rpcsec_gss
-NEED_SVCGSSD="no"
-RPCSVCGSSDOPTS=""
-
diff --git a/debian/ctdb.example/nfs-kernel-server/nfs.conf b/debian/ctdb.example/nfs-kernel-server/nfs.conf
new file mode 100644
index 0000000..5cfa13a
--- /dev/null
+++ b/debian/ctdb.example/nfs-kernel-server/nfs.conf
@@ -0,0 +1,20 @@
+[general]
+pipefs-directory = /run/rpc_pipefs
+
+[lockd]
+port = 32768
+udp-port = 32768
+
+[mountd]
+manage-gids = 1
+port = 32767
+
+[nfsd]
+threads = 8
+vers4 = n
+
+[statd]
+ha-callout = /etc/ctdb/statd-callout
+name = @NFS_HOSTNAME@
+outgoing-port = 32766
+port = 32765
diff --git a/debian/ctdb.example/nfs-kernel-server/quota b/debian/ctdb.example/nfs-kernel-server/quota
new file mode 100644
index 0000000..00eab66
--- /dev/null
+++ b/debian/ctdb.example/nfs-kernel-server/quota
@@ -0,0 +1,5 @@
+# Set to "true" if warnquota should be run in cron.daily
+run_warnquota=
+
+# Add options to rpc.rquotad here
+RPCRQUOTADOPTS="-p 32769"
diff --git a/debian/patches/series b/debian/patches/series
index f3bc643..abe6ace 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,8 +10,6 @@ fix-nfs-service-name-to-nfs-kernel-server.patch
 ctdb-config-enable-syslog-by-default.patch
 <<<<<<< debian/patches/series
 lp-1951490-fix-printing-KB5006743.patch
-add-support-for-bind-918.patch
-add-support-for-bind-918-2.patch
 =======
 Force-LDB-as-standalone.patch
 use-bzero-instead-of-memset_s.diff
@@ -27,3 +25,5 @@ testparm-do-not-fail-if-pid-dir-does-not-exist.patch
 add-missing-libs-deps.diff
 fix-samba-tool-domain-join-segfault.patch
 >>>>>>> debian/patches/series
+add-support-for-bind-918.patch
+add-support-for-bind-918-2.patch
diff --git a/debian/rules b/debian/rules
index 687ad4c..09e7642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,11 +124,11 @@ conf_args += $(if ${WITH_CEPH},\
 WITH_GLUSTERFS = yes
 # GlusterFS is linux-only
 ifneq ($(DEB_HOST_ARCH_OS), linux)
-<<<<<<< debian/rules
-    WITH_CEPH = no
+    WITH_GLUSTERFS =
 endif
 # GlusterFS is not built for i386 on Ubuntu
 ifeq ($(DEB_VENDOR) $(DEB_HOST_ARCH), Ubuntu i386)
+<<<<<<< debian/rules
     WITH_GLUSTERFS = no
 =======
     WITH_GLUSTERFS =