Merge ~ahasenack/ubuntu/+source/sssd:eoan-sssd-merge into ubuntu/+source/sssd:debian/sid

[Andreas Hasenack]

Since sssd has good dep8 tests, I created a bileto ticket: https://bileto.ubuntu.com/#/ticket/3728

It's still running as I write this, we'll see the results tomorrow.

Simple merge from debian, just to drop two bits of delta that they also applied.

GPO_CROND-customization.patch is applied upstream, so eventually we will be able to drop it.

The "newer samba build fix" delta doesn't apply to debian at the moment because they are still on samba 4.9.x, while we are at 4.10 and need that.

Finally, the sss_obfuscate change from foundations is probably part of the get-rid-of-py2 movement, I'm not sure how important that is to debian or upstream at the moment.

[Christian Ehrhardt  (paelzer)]

Unfortunately bileto decided to rate all tests as "always failed" and due to that doesn't even link the result to check it on our own :-/ Usually those are direct links to the logs with keys and tokens in the URL, I doubt that we can recover that easily.

The actual merge LGTM thou.

(Not part of the merge): dpkg-shlibdeps seems to have some issues with this.
Could you take a look at "dpkg-shlibdeps: warning:" in the build log and check if that is a yet to be discovered problem or not?

+1 on the merge, maybe run some tests in local qemu before uploading ?

review: Approve

[Andreas Hasenack (ahasenack)]

DEP8 passes in a local autopkgtest run with qemu:

(...)
testuser1@ldap:~$ klist
Ticket cache: FILE:/tmp/krb5cc_10001_tPwlbB
Default principal: <email address hidden> [09:50:21]: test ldap-user-group-krb5-auth: -----------------------]
autopkgtest [09:50:22]: test ldap-user-group-krb5-auth: - - - - - - - - - - results - - - - - - - - - -
ldap-user-group-krb5-auth PASS
autopkgtest [09:50:23]: @@@@@@@@@@@@@@@@@@@@ summary
ldap-user-group-ldap-auth PASS
ldap-user-group-krb5-auth PASS
qemu-system-x86_64: terminating on signal 15 from pid 32392 (/usr/bin/python3)

real 4m3,206s

I'll check dpkg-shlibdeps

[Andreas Hasenack (ahasenack)]

The shlibs warnings are because the .so files under the sssd directory in the library path are plugins.

I've seen these warnings forever, also in older releases, and in debian: https://buildd.debian.org/status/fetch.php?pkg=sssd&arch=amd64&ver=1.16.3-3&stamp=1543744496&raw=1

Not sure if there is a way to avoid them, like telling the tool to ignore the .so objects in that subdirectory. The manpage highlights this case, under "binary contains an unresolvable reference to symbol sym: it's probably a plugin", and offers no solution other than "If the binary is really a plugin, then disregard this warning.".

[Andreas Hasenack (ahasenack)]

Tagged and uploaded:

$ git push pkg upload/1.16.3-3.1ubuntu1
Enumerating objects: 46, done.
Counting objects: 100% (46/46), done.
Delta compression using up to 4 threads
Compressing objects: 100% (40/40), done.
Writing objects: 100% (40/40), 6.69 KiB | 1.12 MiB/s, done.
Total 40 (delta 25), reused 1 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/sssd
 * [new tag] upload/1.16.3-3.1ubuntu1 -> upload/1.16.3-3.1ubuntu1

$ dput ubuntu ../sssd_1.16.3-3.1ubuntu1_source.changes
Checking signature on .changes
gpg: ../sssd_1.16.3-3.1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../sssd_1.16.3-3.1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading sssd_1.16.3-3.1ubuntu1.dsc: done.
  Uploading sssd_1.16.3.orig.tar.gz: done.
  Uploading sssd_1.16.3-3.1ubuntu1.diff.gz: done.
  Uploading sssd_1.16.3-3.1ubuntu1_source.buildinfo: done.
  Uploading sssd_1.16.3-3.1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/debian/changelog b/debian/changelog
index c64efd8..aedfd74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+sssd (1.16.3-3.1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Fix build with newer samba (4.10+):
+      + d/p/build-newer-samba.patch: replace ARRAY_SIZE with N_ELEMENTS, since
+        the former is no longer available.
+      + d/p/make-n_elements-public.patch: make N_ELEMENTS public
+    - d/p/GPO_CROND-customization.patch: Set GPO_CROND to cron instead of
+      crond for Debian and Ubuntu (LP #1572908)
+    - Switch sss_obfuscate shebang to python3.
+  * Dropped:
+    - d/p/mit-krb-1.17-build-fix.patch: accept krb5 1.17 for building the PAC
+      plugin
+      [In 1.16.3-3.1]
+    - d/p/fix-test-copy-ccache.patch: fix mocking krb5_creds in test_copy_ccache
+      [In 1.16.3-3.1]
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 22 May 2019 18:28:06 -0300
+
 sssd (1.16.3-3.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -6,6 +25,31 @@ sssd (1.16.3-3.1) unstable; urgency=high
 
  -- Dominik George <[e-mail]>  Sun, 24 Feb 2019 11:05:55 +0100
 
+sssd (1.16.3-3ubuntu3) eoan; urgency=medium
+
+  * Switch sss_obfuscate shebang to python3.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 29 Apr 2019 11:17:49 +0100
+
+sssd (1.16.3-3ubuntu2) eoan; urgency=medium
+  
+  * d/p/GPO_CROND-customization.patch: Set GPO_CROND to cron instead of
+    crond for Debian and Ubuntu (LP: #1572908)
+
+ -- Victor Tapia <[e-mail]>  Mon, 23 Apr 2019 13:48:26 +0100
+
+sssd (1.16.3-3ubuntu1) disco; urgency=medium
+
+  * Fix build with newer samba (4.10+):
+    - d/p/build-newer-samba.patch: replace ARRAY_SIZE with N_ELEMENTS, since
+      the former is no longer available.
+    - d/p/make-n_elements-public.patch: make N_ELEMENTS public
+  * d/p/fix-test-copy-ccache.patch: fix mocking krb5_creds in test_copy_ccache
+  * d/p/mit-krb-1.17-build-fix.patch: accept krb5 1.17 for building the PAC
+    plugin
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 04 Mar 2019 20:21:27 -0300
+
 sssd (1.16.3-3) unstable; urgency=medium
 
   * fix-curl-ftbfs.diff: Fix build with current curl. (Closes: #913403)
diff --git a/debian/control b/debian/control
index 266a2ee..55dd137 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]>
 Build-Depends:
  autopoint,
@@ -232,8 +233,8 @@ Description: System Security Services Daemon -- proxy back end
 Package: sssd-tools
 Architecture: any
 Depends:
- python,
- python-sss,
+ python3,
+ python3-sss,
  sssd-common (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/patches/GPO_CROND-customization.patch b/debian/patches/GPO_CROND-customization.patch
new file mode 100644
index 0000000..b2be61c
--- /dev/null
+++ b/debian/patches/GPO_CROND-customization.patch
@@ -0,0 +1,45 @@
+Description: GPO: Allow customization of GPO_CROND per OS
+ For both Debian and Ubuntu, the cron PAM service is named "cron" instead
+ of "crond", denying the use of the service by default.
+
+ This patch enables the HAVE_$OS (HAVE_DEBIAN/HAVE_FEDORA...) macros to select
+ the service name during build, allowing further customization if required.
+
+Author: Victor Tapia <[e-mail]>
+Origin: upstream, https://github.com/SSSD/sssd/commit/bc65ba9a07a924a58b13a0d5a935114ab72b7524
+Bug-Ubuntu: https://launchpad.net/bugs/1572908
+Index: sssd-1.16.3/src/external/platform.m4
+===================================================================
+--- sssd-1.16.3.orig/src/external/platform.m4
++++ sssd-1.16.3/src/external/platform.m4
+@@ -36,6 +36,14 @@ AM_CONDITIONAL([HAVE_SUSE], [test x"$osn
+ AM_CONDITIONAL([HAVE_DEBIAN], [test x"$osname" = xdebian])
+ AM_CONDITIONAL([HAVE_GENTOO], [test x"$osname" = xgentoo])
+ 
++AS_CASE([$osname],
++        [redhat], [AC_DEFINE_UNQUOTED([HAVE_REDHAT], 1, [Build with redhat config])],
++        [fedora], [AC_DEFINE_UNQUOTED([HAVE_FEDORA], 1, [Build with fedora config])],
++        [suse], [AC_DEFINE_UNQUOTED([HAVE_SUSE], 1, [Build with suse config])],
++        [gentoo], [AC_DEFINE_UNQUOTED([HAVE_GENTOO], 1, [Build with gentoo config])],
++        [debian], [AC_DEFINE_UNQUOTED([HAVE_DEBIAN], 1, [Build with debian config])],
++        [AC_MSG_NOTICE([Build with $osname config])])
++
+ AC_CHECK_MEMBERS([struct ucred.pid, struct ucred.uid, struct ucred.gid], , ,
+                  [[#include <sys/socket.h>]])
+ 
+Index: sssd-1.16.3/src/providers/ad/ad_gpo.c
+===================================================================
+--- sssd-1.16.3.orig/src/providers/ad/ad_gpo.c
++++ sssd-1.16.3/src/providers/ad/ad_gpo.c
+@@ -200,7 +200,11 @@ int ad_gpo_process_cse_recv(struct teven
+ #define GPO_SSHD "sshd"
+ #define GPO_FTP "ftp"
+ #define GPO_SAMBA "samba"
++#ifdef HAVE_DEBIAN
++#define GPO_CROND "cron"
++#else
+ #define GPO_CROND "crond"
++#endif
+ #define GPO_POLKIT "polkit-1"
+ #define GPO_SUDO "sudo"
+ #define GPO_SUDO_I "sudo-i"
diff --git a/debian/patches/build-newer-samba.patch b/debian/patches/build-newer-samba.patch
new file mode 100644
index 0000000..9b80f55
--- /dev/null
+++ b/debian/patches/build-newer-samba.patch
@@ -0,0 +1,29 @@
+From e1ff063ffa4ad459bd0c8a9da56abf8379401dbe Mon Sep 17 00:00:00 2001
+From: Sumit Bose <[e-mail]>
+Date: Feb 16 2019 21:52:15 +0000
+Subject: ad: replace ARRAY_SIZE with N_ELEMENTS
+
+
+ARRAY_SIZE is taken from the Samba header file memory.h which is not
+available as a public header in newer Samba versions anymore. This patch
+replaces it with an internal macro.
+
+Reviewed-by: Jakub Hrozek <[e-mail]>
+Origin: upstream, https://pagure.io/SSSD/sssd/c/e1ff063ffa4ad459bd0c8a9da56abf8379401dbe
+Last-Update: 2019-03-04
+---
+
+diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c
+index 84ad75b..101701c 100644
+--- a/src/providers/ad/ad_gpo_ndr.c
++++ b/src/providers/ad/ad_gpo_ndr.c
+@@ -258,7 +258,7 @@ ndr_pull_dom_sid(struct ndr_pull *ndr,
+         NDR_CHECK(ndr_pull_align(ndr, 4));
+         NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->sid_rev_num));
+         NDR_CHECK(ndr_pull_int8(ndr, NDR_SCALARS, &r->num_auths));
+-        if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
++        if (r->num_auths < 0 || r->num_auths > N_ELEMENTS(r->sub_auths)) {
+             return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
+         }
+         NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
+
diff --git a/debian/patches/make-n_elements-public.patch b/debian/patches/make-n_elements-public.patch
new file mode 100644
index 0000000..cdb8a65
--- /dev/null
+++ b/debian/patches/make-n_elements-public.patch
@@ -0,0 +1,38 @@
+From e32920a9c7998476b596507762b28fcf81f6a456 Mon Sep 17 00:00:00 2001
+From: Sumit Bose <[e-mail]>
+Date: Feb 16 2019 21:52:09 +0000
+Subject: utils: make N_ELEMENTS public
+
+
+The calculation of the size of an array is used in the main code as
+well, so it makes sense to move N_ELEMENTS to a common header to use it
+more often.
+
+Reviewed-by: Jakub Hrozek <[e-mail]>
+
+Origin: upstream, https://pagure.io/SSSD/sssd/c/e32920a9c7998476b596507762b28fcf81f6a456
+Last-Update: 2019-03-04
+---
+
+--- a/src/tests/common.h
++++ b/src/tests/common.h
+@@ -39,8 +39,6 @@
+ #define SSS_ATTRIBUTE_WARN_UNUSED_RESULT
+ #endif
+ 
+-#define N_ELEMENTS(arr) (sizeof(arr) / sizeof(arr[0]))
+-
+ extern TALLOC_CTX *global_talloc_context;
+ 
+ void check_leaks_push(TALLOC_CTX *ctx);
+--- a/src/util/util.h
++++ b/src/util/util.h
+@@ -722,4 +722,8 @@
+ #define P11_CHILD_TIMEOUT_DEFAULT 10
+ #endif  /* SSSD_LIBEXEC_PATH */
+ 
++#ifndef N_ELEMENTS
++#define N_ELEMENTS(arr) (sizeof(arr) / sizeof(arr[0]))
++#endif
++
+ #endif /* __SSSD_UTIL_H__ */
diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch
new file mode 100644
index 0000000..a74fd04
--- /dev/null
+++ b/debian/patches/python3-shebang.patch
@@ -0,0 +1,13 @@
+Description: Switch sss_obfuscate shebang to python3.
+Author: Dimitri John Ledkov <[e-mail]>
+
+Index: sssd-1.16.3/src/tools/sss_obfuscate
+===================================================================
+--- sssd-1.16.3.orig/src/tools/sss_obfuscate
++++ sssd-1.16.3/src/tools/sss_obfuscate
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ from __future__ import print_function
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9b354fd..d328d28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,7 @@
 fix-curl-ftbfs.diff
 fix_copy_ccache_test.diff 
 fix_authdata_krb5_1.17.diff
+build-newer-samba.patch
+make-n_elements-public.patch
+GPO_CROND-customization.patch
+python3-shebang.patch