diff -pruN 2.8.1-1/debian/changelog 2.8.1-1ubuntu1/debian/changelog
--- 2.8.1-1/debian/changelog	2022-11-23 08:10:41.000000000 +0000
+++ 2.8.1-1ubuntu1/debian/changelog	2023-01-03 21:42:10.000000000 +0000
@@ -1,3 +1,27 @@
+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 <sergio.durigan@canonical.com>  Tue, 03 Jan 2023 16:42:10 -0500
+
 sssd (2.8.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -21,6 +45,41 @@ sssd (2.7.4-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <ginggs@ubuntu.com>  Tue, 27 Dec 2022 03:42:49 +0000
+
+sssd (2.7.3-2ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild against libldap-2
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  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 <sergio.durigan@canonical.com>  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 <sergio.durigan@canonical.com>  Tue, 06 Sep 2022 13:56:06 -0400
+
 sssd (2.7.3-2) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -40,6 +99,15 @@ sssd (2.7.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <sergio.durigan@canonical.com>  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.
@@ -59,6 +127,18 @@ sssd (2.7.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <sergio.durigan@canonical.com>  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
@@ -101,6 +181,31 @@ sssd (2.6.3-2) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <andreas@canonical.com>  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 <andreas@canonical.com>  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 <sergio.durigan@canonical.com>  Mon, 14 Feb 2022 16:21:21 -0500
+
 sssd (2.6.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -112,6 +217,40 @@ sssd (2.6.3-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <ginggs@ubuntu.com>  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 <steve.langasek@ubuntu.com>  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 <steve.langasek@ubuntu.com>  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 <steve.langasek@ubuntu.com>  Fri, 10 Dec 2021 10:29:16 -0800
+
 sssd (2.6.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -128,6 +267,54 @@ sssd (2.5.2-5) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 08 Nov 2021 21:17:29 +0200
 
+sssd (2.5.2-4ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild against libssl3
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  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 <ricotz@ubuntu.com>  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 <ricotz@ubuntu.com>  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 <sergio.durigan@canonical.com>  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.
@@ -170,6 +357,63 @@ sssd (2.5.2-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <marc.deslauriers@ubuntu.com>  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 <marc.deslauriers@ubuntu.com>  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 <sergio.durigan@canonical.com>  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 <sergio.durigan@canonical.com>  Tue, 18 May 2021 17:29:58 -0400
+
 sssd (2.4.1-2) unstable; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
@@ -195,6 +439,59 @@ sssd (2.4.1-1) unstable; urgency=medium
 
  -- Timo Aaltonen <tjaalton@debian.org>  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 <sergio.durigan@canonical.com>  Tue, 11 May 2021 16:22:31 -0400
+
+sssd (2.4.0-1ubuntu6) hirsute; urgency=medium
+
+  * Disable lto, not ready upstream.
+
+ -- Matthias Klose <doko@ubuntu.com>  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 <xnox@ubuntu.com>  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 <valter.jansons@gmail.com>  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 <sergio.durigan@canonical.com>  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 <sergio.durigan@canonical.com>  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 <sergio.durigan@canonical.com>  Thu, 10 Dec 2020 14:20:24 -0500
+
 sssd (2.4.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -1264,3 +1561,4 @@ sssd (0.5.0-0ubuntu1) karmic; urgency=lo
   * Initial release.
 
  -- Mathias Gug <mathiaz@ubuntu.com>  Mon, 24 Aug 2009 16:35:11 -0400
+
diff -pruN 2.8.1-1/debian/control 2.8.1-1ubuntu1/debian/control
--- 2.8.1-1/debian/control	2022-11-23 08:06:36.000000000 +0000
+++ 2.8.1-1ubuntu1/debian/control	2023-01-03 21:42:10.000000000 +0000
@@ -1,7 +1,8 @@
 Source: sssd
 Section: utils
 Priority: optional
-Maintainer: Debian SSSD Team <pkg-sssd-devel@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@alioth-lists.debian.net>
 Uploaders: Timo Aaltonen <tjaalton@debian.org>,
  Dominik George <natureshadow@debian.org>
 Build-Depends:
@@ -27,7 +28,7 @@ Build-Depends:
  libcurl4-openssl-dev,
  libdbus-1-dev,
  libdhash-dev,
- libgdm-dev [!s390x !kfreebsd-any !hurd-any],
+ libgdm-dev [!s390x !kfreebsd-any !hurd-any !i386],
  libglib2.0-dev,
  libini-config-dev,
  libjansson-dev,
@@ -230,7 +231,7 @@ Description: System Security Services Da
  PAM modules to leverage SSSD caching.
 
 Package: sssd-tools
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Depends:
  python3,
  python3-sss,
diff -pruN 2.8.1-1/debian/rules 2.8.1-1ubuntu1/debian/rules
--- 2.8.1-1/debian/rules	2022-11-23 08:06:36.000000000 +0000
+++ 2.8.1-1ubuntu1/debian/rules	2023-01-03 21:42:10.000000000 +0000
@@ -74,7 +74,9 @@ override_dh_install:
 	# remove files we don't want to install
 	find $(CURDIR)/debian/tmp/ -name '*.la' -exec rm '{}' ';'
 	find $(CURDIR)/debian/tmp/ -name '*.pyc' -exec rm '{}' ';'
-	find $(CURDIR)/debian/tmp/ -name '*.egg-info' -exec rm '{}' ';'
+	# We need to use '+' instead of ';' due to the way 'find' and
+	# 'rm' interact with each other.
+	find $(CURDIR)/debian/tmp/ -name '*.egg-info' -exec rm -r '{}' '+'
 	rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/sssd
 
 	# match nn/nn/nnnn, replace with the date from changelog
