Merge ~athos-ribeiro/ubuntu/+source/adcli:merge-impish into ubuntu/+source/adcli:debian/sid

[Athos Ribeiro]

Hi,

This is the merge for adcli 0.9.1.

The new upstream version includes most of the patches applied in our delta with exception of the one fixing the GCC 11 build errors. Moreover, one of our patches embedded a fix to the documentation where the path to the ldap configuration file was fixed to point to the one we do provide. I extracted this change into a new patch and forwarded it to Debian here: https://salsa.debian.org/debian/adcli/-/merge_requests/5

A PPA with the proposed merge is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/adcli-merge-impish/+packages

[Sergio Durigan Junior (sergiodj)]

I am going to review this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

* 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
  - [√] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

Everything LGTM. I built the package successfully here. It doesn't have any dep8 tests, so it won't contribute to the cluttering of update-excuses. Kudos for the attention to detail and for noticing the need to extract the documentation bit from the bigger patch being dropped.

Uploaded:

$ git push pkg upload/0.9.1-1ubuntu1
Enumerating objects: 44, done.
Counting objects: 100% (44/44), done.
Delta compression using up to 8 threads
Compressing objects: 100% (23/23), done.
Writing objects: 100% (40/40), 9.03 KiB | 9.03 MiB/s, done.
Total 40 (delta 16), reused 38 (delta 16)
To ssh://git.launchpad.net/ubuntu/+source/adcli
 * [new tag] upload/0.9.1-1ubuntu1 -> upload/0.9.1-1ubuntu1
$ dput adcli_0.9.1-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/adcli/adcli_0.9.1-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/adcli/adcli_0.9.1-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading adcli_0.9.1-1ubuntu1.dsc: done.
  Uploading adcli_0.9.1-1ubuntu1.debian.tar.xz: done.
  Uploading adcli_0.9.1-1ubuntu1_source.buildinfo: done.
  Uploading adcli_0.9.1-1ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

[Bryce Harrington (bryce)]

This has migrated successfully.

  - Source Package: adcli
  - Current Version: 0.9.1-1ubuntu1
  - Proposed Version: None
  - Old Version: tbd
  - New Version: 0.9.1-1ubuntu1
  - Migrated: True

diff --git a/debian/changelog b/debian/changelog
index f632ec6..d9b45d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,54 @@
+adcli (0.9.1-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/0013-configure-check-for-ns_get16-and-ns_get32-as-well.patch:
+      Fix FTBFS with glibc 2.34 where 'res_query' has been moved into
+      glibc but 'ns_get*' still require linking against libresolv.
+  * Added changes:
+    - d/p/fix-ldap-conf-path.patch: fix ldap.conf path in the documentation
+      [ This fix was embedded in a dropped patch ]
+  * Dropped changes:
+    - New features (LP: #1893784):
+      - d/p/tools-add-show-computer-command.patch: add a show-computer
+        command to print the LDAP attrs of the computer object
+      - d/p/add-description-option-to-join-and-update.patch: allow setting
+        an optional description on the computer account
+      [ Included in upstream version 0.9.1 ]
+    - Handle new Active Directory requirements from
+      https://portal.msrc.microsoft.com/en-us/security-guidance/advisory/ADV190023
+      (LP: #1868703):
+      - d/p/Use-GSS-SPNEGO-if-available.patch: prefer GSS-SPNEGO over
+        GSSAPI if available, as that can handle some of the more advanced
+        features which can be required by an AD server
+      - d/p/add-option-use-ldaps.patch: add option to use LDAPS, useful
+        if for some reason the LDAP port is blocked.
+      [ Included in upstream version 0.9.1 ]
+    - Documentation fixes:
+      - d/p/man-move-note-to-the-right-section.patch: move note about
+        password lifetime to the update section
+      - d/p/man-explain-optional-parameter-of-login-ccache-bette.patch,
+        d/p/man-make-handling-of-optional-credential-cache-more-.patch:
+        better explain the login-ccache and -C parameters
+      - d/p/tools-fix-typo-in-show-password-help-output.patch: typo fix
+      [ Included in upstream version 0.9.1 ]
+    - d/p/discovery-fix.patch: do not continue processing on a closed
+      connection
+      [ Included in upstream version 0.9.1 ]
+    - d/p/delete-do-not-exit-if-keytab-cannot-be-read.patch: fix computer
+      deletion when keytab cannot be read
+      [ Included in upstream version 0.9.1 ]
+    - d/p/tools-disable-SSSD-s-locator-plugin.patch: ignore MIT's locator
+      plugin to avoid conflicts if it returns a different DC than the one
+      used for the LDAP connection
+      [ Included in upstream version 0.9.1 ]
+    - Fixup "use-ldaps" option to add missing subcommands, as a part of
+      enabling support for new active directory requirement ADV190023
+      (LP #1868703):
+      + d/p/lp1868703-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch
+      [ Included in upstream version 0.9.1 ]
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 17 Aug 2021 10:14:27 -0300
+
 adcli (0.9.1-1) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -12,6 +63,62 @@ adcli (0.9.1-1) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Mon, 16 Aug 2021 14:40:09 +0200
 
+adcli (0.9.0-1ubuntu4) impish; urgency=medium
+
+  * d/p/configure-check-for-ns_get16-and-ns_get32-as-well.patch:
+    Fix FTBFS with glibc 2.34 where 'res_query' has been moved into
+    glibc but 'ns_get*' still require linking against libresolv.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 09 Aug 2021 18:09:42 -0400
+
+adcli (0.9.0-1ubuntu3) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 17:43:33 -0400
+
+adcli (0.9.0-1ubuntu2) hirsute; urgency=medium
+
+  * Fixup "use-ldaps" option to add missing subcommands, as a part of
+    enabling support for new active directory requirement ADV190023
+    (LP: #1868703):
+    - d/p/lp1868703-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch
+
+ -- Matthew Ruffell <[e-mail]>  Tue, 10 Nov 2020 15:47:22 +1300
+
+adcli (0.9.0-1ubuntu1) groovy; urgency=medium
+
+  * New features (LP: #1893784):
+    - d/p/tools-add-show-computer-command.patch: add a show-computer
+      command to print the LDAP attrs of the computer object
+    - d/p/add-description-option-to-join-and-update.patch: allow setting
+      an optional description on the computer account
+  * Handle new Active Directory requirements from
+    https://portal.msrc.microsoft.com/en-us/security-guidance/advisory/ADV190023
+    (LP: #1868703):
+    - d/p/Use-GSS-SPNEGO-if-available.patch: prefer GSS-SPNEGO over
+      GSSAPI if available, as that can handle some of the more advanced
+      features which can be required by an AD server
+    - d/p/add-option-use-ldaps.patch: add option to use LDAPS, useful
+      if for some reason the LDAP port is blocked.
+  * Documentation fixes:
+    - d/p/man-move-note-to-the-right-section.patch: move note about
+      password lifetime to the update section
+    - d/p/man-explain-optional-parameter-of-login-ccache-bette.patch,
+      d/p/man-make-handling-of-optional-credential-cache-more-.patch:
+      better explain the login-ccache and -C parameters
+    - d/p/tools-fix-typo-in-show-password-help-output.patch: typo fix
+  * Other fixes:
+    - d/p/discovery-fix.patch: do not continue processing on a closed
+      connection
+    - d/p/delete-do-not-exit-if-keytab-cannot-be-read.patch: fix computer
+      deletion when keytab cannot be read
+    - d/p/tools-disable-SSSD-s-locator-plugin.patch: ignore MIT's locator
+      plugin to avoid conflicts if it returns a different DC than the one
+      used for the LDAP connection
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 02 Sep 2020 09:50:18 -0300
+
 adcli (0.9.0-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #941583)
diff --git a/debian/control b/debian/control
index 7283c22..43054ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: adcli
 Section: admin
 Priority: optional
-Maintainer: Laurent Bigonville <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Laurent Bigonville <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
                libkrb5-dev,
                libldap2-dev,
diff --git a/debian/patches/configure-check-for-ns_get16-and-ns_get32-as-well.patch b/debian/patches/configure-check-for-ns_get16-and-ns_get32-as-well.patch
new file mode 100644
index 0000000..28665f0
--- /dev/null
+++ b/debian/patches/configure-check-for-ns_get16-and-ns_get32-as-well.patch
@@ -0,0 +1,38 @@
+From: Sumit Bose <[e-mail]>
+Date: Wed, 28 Jul 2021 12:55:16 +0200
+Subject: configure: check for ns_get16 and ns_get32 as well
+
+With newer versions of glibc res_query() might ba already available in
+glibc with ns_get16() and ns_get32() still requires libresolv.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891
+
+Origin: upstream, https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1984891
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ebc6cb4..e8775d0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS)
+ # -------------------------------------------------------------------
+ # resolv
+ 
+-AC_MSG_CHECKING(for which library has res_query)
++AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32])
+ for lib in "" "-lresolv"; do
+ 	saved_LIBS="$LIBS"
+ 	LIBS="$LIBS $lib"
+ 	AC_LINK_IFELSE([
+ 		AC_LANG_PROGRAM([#include <resolv.h>],
+-		                [res_query (0, 0, 0, 0, 0)])
++		                [res_query (0, 0, 0, 0, 0);
++		                 ns_get32 (NULL);
++		                 ns_get16 (NULL);])
+ 	],
+ 	[ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ],
+ 	[ LIBS="$saved_LIBS" ])
diff --git a/debian/patches/fix-ldap-conf-path.patch b/debian/patches/fix-ldap-conf-path.patch
new file mode 100644
index 0000000..727e8f4
--- /dev/null
+++ b/debian/patches/fix-ldap-conf-path.patch
@@ -0,0 +1,15 @@
+Author: Athos Ribeiro <[e-mail]>
+Description: Update docs ldap.conf path to match path provided by libldap-common
+Forwarded: not-needed
+Last-Update: 2021-08-17
+--- a/doc/adcli.xml
++++ b/doc/adcli.xml
+@@ -144,7 +144,7 @@
+ 			<para> Please note that the place where CA certificates
+ 			can be found to validate the AD DC certificates
+ 			must be configured in the OpenLDAP configuration
+-			file, e.g. <filename>/etc/openldap/ldap.conf</filename>.
++			file, e.g. <filename>/etc/ldap/ldap.conf</filename>.
+ 			As an alternative it can be specified with the help of
+ 			an environment variable, e.g.
+ <programlisting>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..28e539e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-ldap-conf-path.patch
+configure-check-for-ns_get16-and-ns_get32-as-well.patch