[Pkg-samba-maint] [Git][samba-team/samba][master] libldb2: provide compat symlinks for ldb modules dir

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
8716ffc4 by Michael Tokarev at 2022-05-10T14:57:38+03:00
libldb2: provide compat symlinks for ldb modules dir

When ldb were built from its own source it had its modules in
/usr/lib/<triple>/ldb/modules/ldb/ but since it is built in samba it is
/usr/lib/<triple>/samba/modules/ldb/.  Samba (samba-vfs-modules) always
provided its modules in the latter dir, so we had a symlink
.../ldb/modules/ldb/samba => .../samba/modules/ldb/.

When we moved to building as part of samba, we broke third-party apps
(notable sssd) which placed their modules in .../ldb/modules/ldb/ b/c
new ldb were not finding them anymore.

Provide compat symlink .../samba/modules/ldb/compat => .../ldb/modules/ldb/
to keep old apps working.

Unbreak bullseye sssd, it should work fine now.

This compat symlink can go away past bookworm.

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -482,12 +482,8 @@ Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: ldb-tools (<<1.1.30~),
-# sssd had --with-ldb-lib-dir hardcoded until 2.6.3-3
-# and we moved our modules when built from samba sources
-# samba-dsdb-modules is also broken by this move
-        sssd (<< 2.6.3-3~),
         samba (<<2:4.7.0~),
-        samba-dsdb-modules (<< 2:4.16.0~),
+        samba-dsdb-modules (<< 2:4.7.0~),
         samba-libs (<< 2:4.7.0~),
         samba-testsuite (<< 2:4.7.0~)
 Description: LDAP-like embedded database - shared library


=====================================
debian/rules
=====================================
@@ -217,6 +217,17 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
 	install -p debian/ctdb.README.kfreebsd debian/tmp/ctdb/README.kfreebsd
 endif
 
+# compatibility link. When ldb was built by its own it stored modules in
+# /usr/lib/<triple>/ldb/modules/ldb/. Now as part of samba it stores modules in
+# /usr/lib/<triple>/samba/ldb/.  Keep them together instead of d/*.{links,dirs}.
+# (sssd 2.6.3-3 moved their module to the new location;
+#  samba-dsdb-modules always had their modules in ..../samba/ldb/)
+# This compat symlink should go away after bookworm
+# (needed mostly for bullseye sssd)
+	dh_installdirs -plibldb2 /usr/lib/${DEB_HOST_MULTIARCH}/ldb/modules/ldb
+	dh_link -pldb2 /usr/lib/${DEB_HOST_MULTIARCH}/ldb/modules/ldb \
+	               /usr/lib/${DEB_HOST_MULTIARCH}/samba/ldb/compat
+
 override_dh_auto_install-indep:
 # only arch-all package is samba-common containing a few debian-specific files
 # Most of files needs are renamed during install so lets put them



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/8716ffc4c07d59fc45c43627ab1e477511943828

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/8716ffc4c07d59fc45c43627ab1e477511943828
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20220510/2f4680f5/attachment-0001.htm>