[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: d/rules: change ifeq($WITH_CEPTH, yes) into ifneq($WITH_CEPTH, ) for consistency...

[Michael Tokarev (@mjt)]

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


Commits:
d7303be1 by Michael Tokarev at 2022-04-03T09:11:35+03:00
d/rules: change ifeq($WITH_CEPTH,yes) into ifneq($WITH_CEPTH,) for consistency - non-empty/empty for yes/no

- - - - -
c2e331a0 by Michael Tokarev at 2022-04-03T13:50:28+03:00
d/patches: drop 07_private_lib

Drop a very old patch carried since pre-4.0 days.

This patch forces runpath (/usr/lib/$multiarch/samba/) to be embedded
into every samba binary, no matter if it is actually needed or not.

Upstream procedure was to see if the binary is actually using any of
the private libraries, and specify this rpath in that case only.
There is no reason to specify extra rpath for binaries which do not
use any private libraries.

Just drop this patch entirely. The result is that some binaries not
using private libs are now without RPATH, on amd64:

 lib/x86_64-linux-gnu/libnss_winbind.so.2
 lib/x86_64-linux-gnu/libnss_wins.so.2
 usr/bin/ping_pong
 usr/lib/python3/dist-packages/samba/ntstatus.cpython-39-x86_64-linux-gnu.so
 usr/lib/python3/dist-packages/samba/werror.cpython-39-x86_64-linux-gnu.so
 usr/lib/x86_64-linux-gnu/libsmbldap.so.2.1.0
 usr/lib/x86_64-linux-gnu/libwbclient.so.0.15
 usr/lib/x86_64-linux-gnu/samba/ldb/asq.so
 usr/lib/x86_64-linux-gnu/samba/ldb/paged_searches.so
 usr/lib/x86_64-linux-gnu/samba/ldb/rdn_name.so
 usr/lib/x86_64-linux-gnu/samba/ldb/sample.so
 usr/lib/x86_64-linux-gnu/samba/ldb/server_sort.so
 usr/lib/x86_64-linux-gnu/samba/ldb/skel.so
 usr/lib/x86_64-linux-gnu/samba/libldb-cmdline-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libmessages-util-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libreplace-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libsamba-modules-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libsmbpasswdparser-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libsocket-blocking-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libutil-reg-samba4.so.0
 usr/lib/x86_64-linux-gnu/samba/libutil-setid-samba4.so.0
 usr/libexec/ctdb/smnotify

This is entirely normal.

In fact, even more binaries need no runpath like this, because
some of them do not actually use any of the private libraries
symbols and do not actually linke with private libs (due to
ld --if-needed), dropping force-using-rpath patch to become
more consistent with upstream is already a good thing.

It is unclear why this change has been introduced in the first
place (my guess is that it was some build procedure defect)
and why it were carried out for so long.

- - - - -


3 changed files:

- − debian/patches/07_private_lib
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/07_private_lib deleted
=====================================
@@ -1,22 +0,0 @@
-From: Jelmer Vernooij <jelmer at samba.org>
-Subject: Always specify rpath for private libraries
-
-Last-Update: 2012-02-24
-Applied-Upstream: no
----
- buildtools/wafsamba/samba_utils.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
-index 0f95c12..f4bbf6c 100644
---- a/buildtools/wafsamba/samba_utils.py
-+++ b/buildtools/wafsamba/samba_utils.py
-@@ -64,7 +64,7 @@ def install_rpath(target):
-     ret = set()
-     if bld.env.RPATH_ON_INSTALL:
-         ret.add(bld.EXPAND_VARIABLES(bld.env.LIBDIR))
--    if bld.env.RPATH_ON_INSTALL_PRIVATE and needs_private_lib(bld, target):
-+    if bld.env.RPATH_ON_INSTALL_PRIVATE:
-         ret.add(bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR))
-     return list(ret)
- 


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-07_private_lib
 libsmbclient-ensure-lfs-221618.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch


=====================================
debian/rules
=====================================
@@ -92,7 +92,7 @@ ifeq ($(DEB_VENDOR) $(DEB_HOST_ARCH), Ubuntu i386)
     WITH_CEPH =
 endif
 
-ifeq ($(WITH_CEPH), yes)
+ifneq ($(WITH_CEPH),)
 	conf_args += \
 		--enable-ceph-reclock
 else
@@ -280,7 +280,7 @@ override_dh_shlibdeps:
 # to change Depends to Recommends for them in d/control
 	dh_shlibdeps -a -l${DESTDIR}/usr/lib/${DEB_HOST_MULTIARCH}/samba \
 	    -Xceph.so -Xglusterfs.so -Xsnapper.so -Xctdb_mutex_ceph_rados_helper
-ifeq ($(WITH_CEPH), yes)
+ifneq ($(WITH_CEPH),)
 	dpkg-shlibdeps -Tdebian/ctdb.substvars -prados \
 	    debian/ctdb/usr/libexec/ctdb/ctdb_mutex_ceph_rados_helper
 endif



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/6fdfa22a2aa1fd3d6662381b17bbaebce68eb66e...c2e331a022f36f309b54794bf06d13f3d3c7b8b6

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/6fdfa22a2aa1fd3d6662381b17bbaebce68eb66e...c2e331a022f36f309b54794bf06d13f3d3c7b8b6
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/20220404/accc761b/attachment-0001.htm>