Merge ~sergiodj/ubuntu/+source/sssd:merge-2.4.1-2-impish into ubuntu/+source/sssd:debian/sid

Proposed by Sergio Durigan Junior
Status: Approved
Approved by: Sergio Durigan Junior
Approved revision: 0ad309fe1b1a981a05823ac2d405d8487aed3f20
Proposed branch: ~sergiodj/ubuntu/+source/sssd:merge-2.4.1-2-impish
Merge into: ubuntu/+source/sssd:debian/sid
Diff against target: 315 lines (+236/-2)
7 files modified
debian/apparmor-profile (+5/-0)
debian/changelog (+85/-0)
debian/control (+3/-2)
debian/patches/disable-fail_over-tests.patch (+56/-0)
debian/patches/fix-python-tests.patch (+83/-0)
debian/patches/series (+2/-0)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Canonical Server Core Reviewers Pending
Review via email: mp+402945@code.staging.launchpad.net

Description of the change

This is the merge of sssd 2.4.1-2 from Debian.

First, the good news. Upstream and Debian have both adopted a change that I proposed during last cycle, which means that we're now able to drop some of our delta.

Here's a rundown of what we're dropping:

- d/p/condition-path-exists-sssd-conf.patch and d/p/0003-Only-start-sssd.service-if-there-s-a-configuration-f.patch: Used to make sssd.service start only if there is a configuration file present. I submitted an upstream patch which was accepted.

- d/p/lp-1908065-01-syslog_identifier-format.patch and d/p/lp-1908065-02-remove-syslog_identifier.patch: Used to remove custom SYSLOG_IDENTIFIER from journald, which was cluttering the logs and making them hard to read. This was a backport from upstream, which is now not needed.

During the merge process I also found a problem with the Python tests which affects only Ubuntu. The fix can be considered a general improvement, so I submitted it upstream here:

https://github.com/SSSD/sssd/pull/5636

and I am also incorporating it into our delta.

Now, the not-so-good news. There is another test failing: fail_over-tests. I spent some time debugging it and trying to understand what exactly is happening, but was unable to get to the bottom of the problem (I didn't want to spend too much time on it, since I have other things on my plate). I was able to determine that the problem seems to be related to libtevent, because the failure happens when "tevent_loop_once" is invoked. What's curious is that this failure only happens inside a chroot (when using sbuild, or when building the package on Launchpad, for example), and doesn't manifest on Debian. In all other scenarios the test passes, which tells me that this is probably sbuild/chroot-related and shouldn't impact regular users. For this reason, I am proposing that we temporarily disable this test. By the way, I got in touch with Timo (Debian's sssd maintainer) and he confirmed that he is aware of this issue but doesn't know why it happens.

As a side note, sssd has been recently re-enabled on i386 and you can check that it is currently not building there because of a missing dependency. I am already in contact with vorlon in order to get this sorted out; by the looks of it, it shouldn't be too much of a work.

There's a proposed PPA here:

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

autopkgtest is still happy:

autopkgtest [18:32:44]: @@@@@@@@@@@@@@@@@@@@ summary
ldap-user-group-ldap-auth PASS
ldap-user-group-krb5-auth PASS

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok (modulo i386, as already addressed in mp desc)
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

Thorough analysis on remaining issues, and otherwise LGTM, +1.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thank you for the review, Bryce.

Uploaded & pushed:

$ git push pkg upload/2.4.1-2ubuntu1
Enumerating objects: 48, done.
Counting objects: 100% (48/48), done.
Delta compression using up to 8 threads
Compressing objects: 100% (40/40), done.
Writing objects: 100% (40/40), 7.60 KiB | 370.00 KiB/s, done.
Total 40 (delta 26), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/sssd
 * [new tag] upload/2.4.1-2ubuntu1 -> upload/2.4.1-2ubuntu1

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

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches