Merge ~sergiodj/ubuntu/+source/sssd:merge-2.9.1-2-mantic into ubuntu/+source/sssd:debian/sid

[Sergio Durigan Junior]

This is the merge of sssd 2.9.1-2 from Debian unstable.

This is a very trivial merge: it contains the fix for bug #2028084, and that's it.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/sssd-merge

I'll post the dep8 results soon.

[Sergio Durigan Junior (sergiodj)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-sergiodj-sssd-merge/?format=plain)
  sssd @ amd64:
    27.07.23 17:16:52 ✅ Triggers: sssd/2.9.1-2ubuntu1~ppa1
  sssd @ arm64:
    27.07.23 16:47:21 ✅ Triggers: sssd/2.9.1-2ubuntu1~ppa1
  sssd @ armhf:
    27.07.23 16:49:43 ✅ Triggers: sssd/2.9.1-2ubuntu1~ppa1
  sssd @ ppc64el:
    27.07.23 16:44:15 ✅ Triggers: sssd/2.9.1-2ubuntu1~ppa1
  sssd @ s390x:
    27.07.23 16:45:04 ✅ Triggers: sssd/2.9.1-2ubuntu1~ppa1

[Miriam España Acebal (mirespace)]

I'll review this tomorrow (my) morning.

[Miriam España Acebal (mirespace)]

Hi Sergio!

Thanks for this MP. I see that sssd was merged already by you recently, but this one is for incorporating the fix for the tests that was proposed by you to Debian and accepted (congrats!!).

I know then that this merge is very trivial, but as I'm not used to doing many (merge) reviews, please forgive me in advance for following the review process more strictly than this MP deserves.

I checked that:

 - the changelog is OK (version and series, format, bug reference).
 - update-maintainers have been run.
 - the "delta" commits remain split and referenced in the changelog in the appropriate section.
 - Nothing needs to be dropped, as the delta doesn't imply Debian nor upstream (not need to be forwarded then).
 - No new patches added.
 - Building, testing, upgrading, removing and installing package works OK.

The only thing I missed was some tags (logical, split, reconstruct), but I understand that they help in the review process and have no strict impact on the package itself .. and that this merge has a mere change and the review process should not be a problem (but I had fun playing with the diff-ranges and diff between tags, branches, commits to check results ... always learning, you know).

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, mirespace
Uploaders: sergiodj
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Friday, July 28 2023, Miriam España Acebal wrote:

> Hi Sergio!

Hey Miriam,

Thanks a lot for the review!

> I know then that this merge is very trivial, but as I'm not used to
> doing many (merge) reviews, please forgive me in advance for following
> the review process more strictly than this MP deserves.

You did great :-).

> The only thing I missed was some tags (logical, split, reconstruct),
> but I understand that they help in the review process and have no
> strict impact on the package itself .. and that this merge has a mere
> change and the review process should not be a problem (but I had fun
> playing with the diff-ranges and diff between tags, branches, commits
> to check results ... always learning, you know).

Hm, how did you fetch my branch for review? I'm asking because I did
push the split/logical/reconstruct tags, so it's strange that you could
not find them:

  https://git.launchpad.net/~sergiodj/ubuntu/+source/sssd?h=merge-2.9.1-2-mantic

Either way, as you said, the merge is trivial and it's possible to
review it without the tags :-).

Thank you again for your review.

Uploaded (using "-v" so that all bugs are properly closed):

$ dput sssd_2.9.1-2ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/sssd/sssd_2.9.1-2ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/sssd/sssd_2.9.1-2ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading sssd_2.9.1-2ubuntu1.dsc: done.
  Uploading sssd_2.9.1-2ubuntu1.debian.tar.xz: done.
  Uploading sssd_2.9.1-2ubuntu1_source.buildinfo: done.
  Uploading sssd_2.9.1-2ubuntu1_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Miriam España Acebal (mirespace)]

Sergio, you were right (as ever)... I can see them in the link, and if I clone isolated your sssd repo... sorry for the noise!

Nevertheless, I checked what I did browsing the history to figure out this 'X file' for me, as I added your repo as a remote to my local sssd repo:

❯ git remote -v
mirespace https://git.launchpad.net/~mirespace/ubuntu/+source/sssd (fetch)
mirespace ssh://<email address hidden>/~mirespace/ubuntu/+source/sssd (push)
pkg https://git.launchpad.net/ubuntu/+source/sssd (fetch)
pkg ssh://<email address hidden>/ubuntu/+source/sssd (push)
sergiodj https://git.launchpad.net/~sergiodj/ubuntu/+source/sssd (fetch)
sergiodj https://git.launchpad.net/~sergiodj/ubuntu/+source/sssd (push)

It seems a "fetch --all" failed (failed on mirespace, shame on me!) and then sergiodj remote wasn't processed well, because if I do

❯ git fetch -t --dry-run sergiodj

I could see them there

remote: Enumerating objects: 489, done.
remote: Counting objects: 100% (458/458), done.
remote: Compressing objects: 100% (215/215), done.
remote: Total 399 (delta 290), reused 245 (delta 184)
Receiving objects: 100% (399/399), 58.83 KiB | 5.88 MiB/s, done.
Resolving deltas: 100% (290/290), completed with 31 local objects.
From https://git.launchpad.net/~sergiodj/ubuntu/+source/sssd
 * [new tag] logical/2.4.0-1ubuntu7 -> logical/2.4.0-1ubuntu7
 * [new tag] logical/2.4.1-2ubuntu4 -> logical/2.4.1-2ubuntu4
 * [new tag] logical/2.6.1-1ubuntu4 -> logical/2.6.1-1ubuntu4
 * [new tag] logical/2.6.3-1ubuntu3 -> logical/2.6.3-1ubuntu3
 * [new tag] logical/2.7.1-2ubuntu1 -> logical/2.7.1-2ubuntu1
 * [new tag] logical/2.7.2-3ubuntu1 -> logical/2.7.2-3ubuntu1
 * [new tag] logical/2.7.3-2ubuntu4 -> logical/2.7.3-2ubuntu4
 * [new tag] logical/2.8.1-1ubuntu1 -> logical/2.8.1-1ubuntu1
 * [new tag] logical/2.9.1-1ubuntu1 -> logical/2.9.1-1ubuntu1
 * [new tag] reconstruct/2.4.0-1ubuntu7 -> reconstruct/2.4.0-1ubuntu7
 * [new tag] reconstruct/2.4.1-2ubuntu4 -> reconstruct/2.4.1-2ubuntu4
 * [new tag] reconstruct/2.6.1-1ubuntu4 -> reconstruct/2.6.1-1ubuntu4
 * [new tag] reconstruct/2.6.3-1ubuntu3 -> reconstruct/2.6.3-1ubuntu3
 * [new tag] reconstruct/2.7.1-2ubuntu1 -> reconstruct/2.7.1-2ubuntu1
 * [new tag] reconstruct/2.7.2-3ubuntu1 -> reconstruct/2.7.2-3ubuntu1
 * [new tag] reconstruct/2.7.3-2ubuntu4 -> reconstruct/2.7.3-2ubuntu4
 * [new tag] reconstruct/2.8.1-1ubuntu1 -> reconstruct/2.8.1-1ubuntu1
 * [new tag] reconstruct/2.9.1-1ubuntu1 -> reconstruct/2.9.1-1ubuntu1
 * [new tag] split/2.4.0-1ubuntu7 -> split/2.4.0-1ubuntu7
 * [new tag] split/2.4.1-2ubuntu4 -> split/2.4.1-2ubuntu4
 * [new tag] split/2.6.1-1ubuntu4 -> split/2.6.1-1ubuntu4
 * [new tag] split/2.6.3-1ubuntu3 -> split/2.6.3-1ubuntu3
 * [new tag] split/2.7.1-2ubuntu1 -> split/2.7.1-2ubuntu1
 * [new tag] split/2.7.2-3ubuntu1 -> split/2.7.2-3ubuntu1
 * [new tag] split/2.7.3-2ubuntu4 ->...

diff --git a/debian/changelog b/debian/changelog
index 0add2de..1989a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sssd (2.9.1-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2028722). Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 26 Jul 2023 16:04:29 -0400
+
 sssd (2.9.1-2) unstable; urgency=medium
 
   [ Sergio Durigan Junior ]
@@ -11,6 +20,19 @@ sssd (2.9.1-2) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Tue, 25 Jul 2023 15:01:14 +0300
 
+sssd (2.9.1-1ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018112). Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+  * Drop change:
+    - d/rules: Fix 'find' syntax to remove '*.egg-info'
+      files/directories.
+      [ Incorporated by Debian. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 11 Jul 2023 14:48:14 -0400
+
 sssd (2.9.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -64,6 +86,30 @@ sssd (2.8.1-2) unstable; urgency=medium
 
  -- Sergio Durigan Junior <[e-mail]>  Tue, 03 Jan 2023 16:36:00 -0500
 
+sssd (2.8.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993448). Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+  * Drop changes:
+    - Revert dh_nss usage; the feature is still being polished.
+      + d/control: Don't Build-Depend on dh-sequence-installnss.
+      + d/libnss-sss.nss: Remove file.
+      + d/libnss-sss.postinst: Revert changes to use dh-nss.
+      + d/libnss-sss.postrm: Likewise.
+      [ Fixed in Debian. ]
+    - d/p/initialize-uid-gid-main-functions.patch: Initialize UID/GID
+      variables in "main" functions, preventing inadvertent changes in
+      p11_child.log file permissions. (LP #1989356)
+      [ Incorporated by upstream. ]
+  * Add changes:
+    - d/rules: Fix 'find' syntax to remove '*.egg-info'
+      files/directories.
+      [ Submitted to Debian. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 03 Jan 2023 16:42:10 -0500
+
 sssd (2.8.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -87,6 +133,41 @@ sssd (2.7.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Thu, 22 Sep 2022 15:34:06 +0300
 
+sssd (2.7.3-2ubuntu4) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as default
+
+ -- Graham Inggs <[e-mail]>  Tue, 27 Dec 2022 03:42:49 +0000
+
+sssd (2.7.3-2ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild against libldap-2
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Dec 2022 19:56:34 +0000
+
+sssd (2.7.3-2ubuntu2) kinetic; urgency=medium
+
+  * d/p/initialize-uid-gid-main-functions.patch: Initialize UID/GID
+    variables in "main" functions, preventing inadvertent changes in
+    p11_child.log file permissions. (LP: #1989356)
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 04 Oct 2022 19:00:49 -0400
+
+sssd (2.7.3-2ubuntu1) kinetic; urgency=medium
+    
+  * Merge with Debian unstable (LP: #1987348, #1988615). Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+  * Add changes:
+    - Revert dh_nss usage; the feature is still being polished.
+      + d/control: Don't Build-Depend on dh-sequence-installnss.
+      + d/libnss-sss.nss: Remove file.
+      + d/libnss-sss.postinst: Revert changes to use dh-nss.
+      + d/libnss-sss.postrm: Likewise.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 06 Sep 2022 13:56:06 -0400
+
 sssd (2.7.3-2) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -106,6 +187,15 @@ sssd (2.7.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Wed, 06 Jul 2022 08:52:58 +0300
 
+sssd (2.7.2-3ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 23 Jun 2022 14:03:54 -0400
+
 sssd (2.7.2-3) unstable; urgency=medium
 
   * d/p/fix-shebang-on-sss_analyze.patch: Fix shebang on sss_analyze.
@@ -125,6 +215,18 @@ sssd (2.7.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Wed, 22 Jun 2022 13:19:27 +0300
 
+sssd (2.7.1-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971327, #1934997). Remaining changes:
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+  * Dropped changes:
+    - d/rules: Disable lto, not ready upstream.
+    [ Incorporated by Debian ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 14 Jun 2022 16:59:20 -0400
+
 sssd (2.7.1-2) unstable; urgency=medium
 
   * pac-relax-default-for-pac_check-option.diff: Drop pac_present from
@@ -167,6 +269,31 @@ sssd (2.6.3-2) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Tue, 29 Mar 2022 10:04:50 +0300
 
+sssd (2.6.3-1ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild with new samba 4.15.5
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 24 Feb 2022 08:55:08 -0300
+
+sssd (2.6.3-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild with new libnfsidmap from src:nfs-utils
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 17 Feb 2022 10:57:41 -0300
+
+sssd (2.6.3-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946904). Remaining changes:
+    - d/rules: Disable lto, not ready upstream.
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/control: Don't build sssd-tools on i386, now uninstallable due
+      to added python3-{click,systemd} dependencies.
+  * Dropped changes, picked by Debian:
+    - Remove RANDFILE from the config template. It's no longer necessary and
+      breaks with openssl 3.0.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 14 Feb 2022 16:21:21 -0500
+
 sssd (2.6.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -178,6 +305,40 @@ sssd (2.6.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Fri, 11 Feb 2022 09:35:43 +0200
 
+sssd (2.6.1-1ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <[e-mail]>  Sun, 16 Jan 2022 15:13:06 +0000
+
+sssd (2.6.1-1ubuntu3) jammy; urgency=medium
+
+  * Remember how architecture lists in debian/control work.
+
+ -- Steve Langasek <[e-mail]>  Fri, 17 Dec 2021 23:12:51 +0000
+
+sssd (2.6.1-1ubuntu2) jammy; urgency=medium
+
+  * Don't build sssd-tools on i386, now uninstallable due to added
+    python3-{click,systemd} dependencies.
+
+ -- Steve Langasek <[e-mail]>  Fri, 17 Dec 2021 21:50:00 +0000
+
+sssd (2.6.1-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable lto, not ready upstream.
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - Remove RANDFILE from the config template. It's no longer necessary and
+      breaks with openssl 3.0.
+  * Dropped changes, included upstream:
+    - d/p/fix-python-tests.patch: Fix Python tests by making them
+      assert Python module paths by using full pathnames.
+  * Dropped changes, included in Debian:
+    - debian/control: Switch to libsemanage-dev from libsemanage1-dev
+
+ -- Steve Langasek <[e-mail]>  Fri, 10 Dec 2021 10:29:16 -0800
+
 sssd (2.6.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -194,6 +355,54 @@ sssd (2.5.2-5) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Mon, 08 Nov 2021 21:17:29 +0200
 
+sssd (2.5.2-4ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild against libssl3
+
+ -- Steve Langasek <[e-mail]>  Thu, 09 Dec 2021 00:19:23 +0000
+
+sssd (2.5.2-4ubuntu3) jammy; urgency=medium
+
+  * Remove RANDFILE from the config template. It's no longer necessary and
+    breaks with openssl 3.0.
+
+ -- Rico Tzschichholz <[e-mail]>  Tue, 23 Nov 2021 20:19:07 +0100
+
+sssd (2.5.2-4ubuntu2) jammy; urgency=medium
+
+  * debian/control: Switch to libsemanage-dev from libsemanage1-dev
+
+ -- Rico Tzschichholz <[e-mail]>  Mon, 22 Nov 2021 20:51:36 +0100
+
+sssd (2.5.2-4ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946904). Remaining changes:
+    - Disable lto, not ready upstream.
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+    - d/p/fix-python-tests.patch: Fix Python tests by making them
+      assert Python module paths by using full pathnames.
+  * Dropped changes:
+    - d/apparmor-profile: Update profile. (LP #1910611)
+      + Extend read permissions to /etc/sssd/** and /etc/gss/**.
+      + Add read/execute permission to /usr/libexec/sssd/*.
+      [ Incorporated by Debian.  ]
+    - Fix FTBFS with newer autoconf
+      + debian/patches/fix_newer_autoconf.patch: do not unset PYTHON_PREFIX
+        and PYTHON_EXEC_PREFIX in src/external/python.m4.
+      [ Incorporated by Debian. ]
+    - SECURITY UPDATE: shell command injection in sssctl comment
+      + debian/patches/CVE-2021-3621.patch: replace system() with execvp() to
+        avoid execution of user supplied command in
+        src/tools/sssctl/sssctl.c, src/tools/sssctl/sssctl.h,
+        src/tools/sssctl/sssctl_data.c, src/tools/sssctl/sssctl_logs.c.
+      + CVE-2021-3621
+      [ Incorporated by Debian. ]
+    - d/p/disable-fail_over-tests.patch: Disable fail_over-tests,
+      which is failing when running inside sbuild.
+      [ Not needed anymore; issue does not reproduce on Jammy. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 27 Oct 2021 20:16:31 -0400
+
 sssd (2.5.2-4) unstable; urgency=medium
 
   * control: Promote libnss-sss and libpam-sss to sssd-common Depends.
@@ -236,6 +445,63 @@ sssd (2.5.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Thu, 16 Sep 2021 14:51:42 +0300
 
+sssd (2.4.1-2ubuntu4) impish; urgency=medium
+
+  * Fix FTBFS with newer autoconf
+    - debian/patches/fix_newer_autoconf.patch: do not unset PYTHON_PREFIX
+      and PYTHON_EXEC_PREFIX in src/external/python.m4.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 08 Sep 2021 11:39:53 -0400
+
+sssd (2.4.1-2ubuntu3) impish; urgency=medium
+
+  * SECURITY UPDATE: shell command injection in sssctl comment
+    - debian/patches/CVE-2021-3621.patch: replace system() with execvp() to
+      avoid execution of user supplied command in
+      src/tools/sssctl/sssctl.c, src/tools/sssctl/sssctl.h,
+      src/tools/sssctl/sssctl_data.c, src/tools/sssctl/sssctl_logs.c.
+    - CVE-2021-3621
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 18 Aug 2021 08:13:38 -0400
+
+sssd (2.4.1-2ubuntu2) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 18:09:16 -0400
+
+sssd (2.4.1-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/apparmor-profile: Update profile. (LP #1910611)
+      + Extend read permissions to /etc/sssd/** and /etc/gss/**.
+      + Add read/execute permission to /usr/libexec/sssd/*.
+    - Disable lto, not ready upstream.
+    - d/control: Drop libgdm-dev Build-Depend on i386.
+  * Dropped changes:
+    - d/p/condition-path-exists-sssd-conf.patch: Only start
+      sssd.service if there is a configuration file present.
+      (LP: #1900642)
+      [ Included in 2.4.1-2 ]
+    - d/p/0003-Only-start-sssd.service-if-there-s-a-configuration-f.patch:
+      Upstream patch to make sssd.service only able to start when there
+      is a configuration file present.  (LP #1900642)
+    - d/p/condition-path-exists-sssd-conf.patch: Remove.
+      [ Included in 2.4.1-2 ]
+    - Avoid sending malformed SYSLOG_IDENTIFIER to journald (LP #1908065):
+      + d/p/lp-1908065-01-syslog_identifier-format.patch:
+        Upstream patch to include "sssd[]" identifier in program names.
+      + d/p/lp-1908065-02-remove-syslog_identifier.patch:
+        Upstream patch to remove custom SYSLOG_IDENTIFIER from Journald.
+      [ Included in 2.4.1-2 ]
+  * Added changes:
+    - d/p/fix-python-tests.patch: Fix Python tests by making them
+      assert Python module paths by using full pathnames.
+    - d/p/disable-fail_over-tests.patch: Disable fail_over-tests,
+      which is failing when running inside sbuild.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 18 May 2021 17:29:58 -0400
+
 sssd (2.4.1-2) unstable; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
@@ -261,6 +527,59 @@ sssd (2.4.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <[e-mail]>  Wed, 10 Feb 2021 11:32:35 +0200
 
+sssd (2.4.0-1ubuntu7) impish; urgency=medium
+
+  * d/control: Drop libgdm-dev Build-Depend on i386.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 11 May 2021 16:22:31 -0400
+
+sssd (2.4.0-1ubuntu6) hirsute; urgency=medium
+
+  * Disable lto, not ready upstream.
+
+ -- Matthias Klose <[e-mail]>  Tue, 23 Mar 2021 13:18:53 +0100
+
+sssd (2.4.0-1ubuntu5) hirsute; urgency=medium
+
+  * No change rebuild with fixed ownership.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 16 Feb 2021 15:22:14 +0000
+
+sssd (2.4.0-1ubuntu4) hirsute; urgency=medium
+
+  * Avoid sending malformed SYSLOG_IDENTIFIER to journald (LP: #1908065):
+    - d/p/lp-1908065-01-syslog_identifier-format.patch:
+      Upstream patch to include "sssd[]" identifier in program names.
+    - d/p/lp-1908065-02-remove-syslog_identifier.patch:
+      Upstream patch to remove custom SYSLOG_IDENTIFIER from Journald.
+
+ -- Valters Jansons <[e-mail]>  Fri, 05 Feb 2021 20:51:32 +0000
+
+sssd (2.4.0-1ubuntu3) hirsute; urgency=medium
+
+  * d/apparmor-profile: Update profile. (LP: #1910611)
+    - Extend read permissions to /etc/sssd/conf.d/* and /etc/gss/mech.d/*.
+    - Add read/execute permission to /usr/libexec/sssd/*.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 18 Jan 2021 16:57:21 -0500
+
+sssd (2.4.0-1ubuntu2) hirsute; urgency=medium
+
+  * d/p/0003-Only-start-sssd.service-if-there-s-a-configuration-f.patch:
+    Upstream patch to make sssd.service only able to start when there
+    is a configuration file present.  (LP: #1900642)
+  * d/p/condition-path-exists-sssd-conf.patch: Remove.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 12 Jan 2021 16:17:38 -0500
+
+sssd (2.4.0-1ubuntu1) hirsute; urgency=medium
+
+  * d/p/condition-path-exists-sssd-conf.patch: Only start
+    sssd.service if there is a configuration file present.
+    (LP: #1900642)
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 10 Dec 2020 14:20:24 -0500
+
 sssd (2.4.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1330,3 +1649,4 @@ sssd (0.5.0-0ubuntu1) karmic; urgency=low
   * Initial release.
 
  -- Mathias Gug <[e-mail]>  Mon, 24 Aug 2009 16:35:11 -0400
+
diff --git a/debian/control b/debian/control
index 9f2301c..eca0e61 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sssd
 Section: utils
 Priority: optional
-Maintainer: Debian SSSD Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian SSSD Team <[e-mail]>
 Uploaders: Timo Aaltonen <[e-mail]>,
  Dominik George <[e-mail]>
 Build-Depends:
@@ -28,7 +29,7 @@ Build-Depends:
  libdbus-1-dev,
  libdhash-dev,
  libfido2-dev,
- libgdm-dev [!s390x !kfreebsd-any !hurd-any],
+ libgdm-dev [!s390x !kfreebsd-any !hurd-any !i386],
  libglib2.0-dev,
  libini-config-dev,
  libjansson-dev,
@@ -239,7 +240,7 @@ Description: System Security Services Daemon -- proxy back end
  PAM modules to leverage SSSD caching.
 
 Package: sssd-tools
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Depends:
  python3,
  python3-sss,