[Pkg-sssd-devel] sssd: Changes to 'debian-experimental'
Timo Aaltonen
tjaalton-guest at alioth.debian.org
Wed Jun 5 08:34:53 UTC 2013
debian/changelog | 2
debian/patches/0001-Fix-compilation-with-disabled-link_all_deplibs.patch | 540 ++++++++++
debian/patches/fix-linking.diff | 12
debian/patches/series | 1
4 files changed, 542 insertions(+), 13 deletions(-)
New commits:
commit e1e246447624c29efa5eb0429657271e1c07c672
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed Jun 5 11:33:42 2013 +0300
Added patch from upstream to fix linking with our libtool.
diff --git a/debian/changelog b/debian/changelog
index a4e69da..862889c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
sssd (1.10.0~beta1-1) UNRELEASED; urgency=low
* New upstream release.
- * fix-linking.diff: Updated, force link_all_deplibs=yes in configure.ac.
* Add packaging for libsss-nss-idmap0, libsss-nss-idmap-dev,
python-libsss-nss-idmap.
* watch: Updated to work with alpha/beta releases.
* control: Migrate to libnl-3 now that it's supported.
+ * Added patch from upstream to fix linking with our libtool.
-- Timo Aaltonen <tjaalton at ubuntu.com> Mon, 13 May 2013 10:42:46 +0300
diff --git a/debian/patches/0001-Fix-compilation-with-disabled-link_all_deplibs.patch b/debian/patches/0001-Fix-compilation-with-disabled-link_all_deplibs.patch
new file mode 100644
index 0000000..0ae9c47
--- /dev/null
+++ b/debian/patches/0001-Fix-compilation-with-disabled-link_all_deplibs.patch
@@ -0,0 +1,540 @@
+From 3e9514f5c24db8156c7e9945415eb80373b24805 Mon Sep 17 00:00:00 2001
+From: Lukas Slebodnik <lslebodn at redhat.com>
+Date: Tue, 21 May 2013 16:41:31 +0200
+Subject: [PATCH] Fix compilation with disabled link_all_deplibs.
+
+From the Debian patch:
+># Do not link against deplibs. This is not needed for shared libs
+># on at least ELF systems since those already know which libs they
+># need themself. This seems to break a few things and will be fixed
+># in a better way in a future upstream version.
+
+Overlinking has several issues. An obvious one is performance on startup,
+a more serious is if one of the lib deps changes soname of something it links
+against, and you could load two versions to the memory at the same time..
+
+This patch changes dependencies among libsss_util and libsss_child,
+libsss_crypt, libsss_debug. Library libsss_util no longer depends on
+any internal library. Each program, which was linked with libsss_util,
+now directly link necessary libraries
+(libsss_child, libsss_crypt, libsss_debug)
+
+https://fedorahosted.org/sssd/ticket/1928
+---
+ Makefile.am | 162 +++++++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 112 insertions(+), 50 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -565,10 +565,7 @@ libsss_util_la_SOURCES = \
+ src/util/io.c
+ libsss_util_la_LIBADD = \
+ $(SSSD_LIBS) \
+- $(UNICODE_LIBS) \
+- libsss_child.la \
+- libsss_crypt.la \
+- libsss_debug.la
++ $(UNICODE_LIBS)
+ if BUILD_SUDO
+ libsss_util_la_SOURCES += src/db/sysdb_sudo.c
+ endif
+@@ -621,7 +618,10 @@ sssd_LDADD = \
+ $(SSSD_LIBS) \
+ $(LIBNL_LIBS) \
+ $(KEYUTILS_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_child.la \
++ libsss_debug.la
+
+ sssd_nss_SOURCES = \
+ src/responder/nss/nsssrv.c \
+@@ -634,7 +634,9 @@ sssd_nss_LDADD = \
+ $(TDB_LIBS) \
+ $(SSSD_LIBS) \
+ libsss_idmap.la \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sssd_pam_SOURCES = \
+ src/responder/pam/pam_LOCAL_domain.c \
+@@ -647,7 +649,9 @@ sssd_pam_LDADD = \
+ $(TDB_LIBS) \
+ $(SSSD_LIBS) \
+ $(SELINUX_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ if BUILD_SUDO
+ sssd_sudo_SOURCES = \
+@@ -659,7 +663,9 @@ sssd_sudo_SOURCES = \
+ $(SSSD_RESPONDER_OBJ)
+ sssd_sudo_LDADD = \
+ $(SSSD_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+ endif
+
+ if BUILD_AUTOFS
+@@ -670,7 +676,9 @@ sssd_autofs_SOURCES = \
+ $(SSSD_RESPONDER_OBJ)
+ sssd_autofs_LDADD = \
+ $(SSSD_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+ endif
+
+ if BUILD_SSH
+@@ -681,7 +689,9 @@ sssd_ssh_SOURCES = \
+ $(SSSD_RESPONDER_OBJ)
+ sssd_ssh_LDADD = \
+ $(SSSD_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+ endif
+
+ sssd_pac_SOURCES = \
+@@ -698,7 +708,9 @@ sssd_pac_LDADD = \
+ $(TDB_LIBS) \
+ $(SSSD_LIBS) \
+ libsss_idmap.la \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sssd_be_SOURCES = \
+ src/providers/data_provider_be.c \
+@@ -711,7 +723,10 @@ sssd_be_LDADD = \
+ -ldl \
+ $(SSSD_LIBS) \
+ $(CARES_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_child.la \
++ libsss_debug.la
+ sssd_be_LDFLAGS = \
+ -Wl,--version-script,$(srcdir)/src/providers/sssd_be.exports \
+ -export-dynamic \
+@@ -742,16 +757,20 @@ sss_useradd_SOURCES = \
+ src/tools/sss_useradd.c \
+ $(SSSD_TOOLS_OBJ)
+ sss_useradd_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sss_userdel_SOURCES = \
+ src/tools/sss_userdel.c \
+ src/util/find_uid.c \
+ $(SSSD_LCL_TOOLS_OBJ)
+ sss_userdel_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+ sss_userdel_CFLAGS = $(AM_CFLAGS)
+ sss_userdel_LDFLAGS = \
+ $(CLIENT_LIBS)
+@@ -760,15 +779,19 @@ sss_groupadd_SOURCES = \
+ src/tools/sss_groupadd.c \
+ $(SSSD_TOOLS_OBJ)
+ sss_groupadd_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sss_groupdel_SOURCES = \
+ src/tools/sss_groupdel.c \
+ $(SSSD_LCL_TOOLS_OBJ)
+ sss_groupdel_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+ sss_groupdel_CFLAGS = $(AM_CFLAGS)
+ sss_groupdel_LDFLAGS = \
+ $(CLIENT_LIBS)
+@@ -777,8 +800,10 @@ sss_usermod_SOURCES = \
+ src/tools/sss_usermod.c \
+ $(SSSD_LCL_TOOLS_OBJ)
+ sss_usermod_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+ sss_usermod_CFLAGS = $(AM_CFLAGS)
+ sss_usermod_LDFLAGS = \
+ $(CLIENT_LIBS)
+@@ -787,8 +812,10 @@ sss_groupmod_SOURCES = \
+ src/tools/sss_groupmod.c \
+ $(SSSD_LCL_TOOLS_OBJ)
+ sss_groupmod_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+ sss_groupmod_CFLAGS = $(AM_CFLAGS)
+ sss_groupmod_LDFLAGS = \
+ $(CLIENT_LIBS)
+@@ -797,15 +824,19 @@ sss_groupshow_SOURCES = \
+ src/tools/sss_groupshow.c \
+ $(SSSD_TOOLS_OBJ)
+ sss_groupshow_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sss_cache_SOURCES = \
+ src/tools/sss_cache.c \
+ $(SSSD_LCL_TOOLS_OBJ)
+ sss_cache_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+ sss_cache_CFLAGS = $(AM_CFLAGS)
+ sss_cache_LDFLAGS = \
+ $(CLIENT_LIBS)
+@@ -814,15 +845,19 @@ sss_debuglevel_SOURCES = \
+ src/tools/sss_debuglevel.c \
+ $(SSSD_TOOLS_OBJ)
+ sss_debuglevel_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+
+ sss_seed_SOURCES = \
+ src/tools/sss_seed.c \
+ $(SSSD_TOOLS_OBJ)
+ sss_seed_LDADD = \
++ $(TOOLS_LIBS) \
+ libsss_util.la \
+- $(TOOLS_LIBS)
++ libsss_crypt.la \
++ libsss_debug.la
+
+ if BUILD_SUDO
+ sss_sudo_cli_SOURCES = \
+@@ -841,8 +876,10 @@ sss_ssh_authorizedkeys_SOURCES = \
+ src/sss_client/ssh/sss_ssh_authorizedkeys.c
+ sss_ssh_authorizedkeys_CFLAGS = $(AM_CFLAGS)
+ sss_ssh_authorizedkeys_LDADD = \
+- libsss_util.la
+-sss_ssh_authorizedkeys_LDFLAGS = $(CLIENT_LIBS)
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
++sss_ssh_authorizedkeys_LDFLAGS = $(CLIENT_LIBS) $(TALLOC_LIBS) $(POPT_LIBS)
+
+ sss_ssh_knownhostsproxy_SOURCES = \
+ src/sss_client/common.c \
+@@ -850,8 +887,10 @@ sss_ssh_knownhostsproxy_SOURCES = \
+ src/sss_client/ssh/sss_ssh_knownhostsproxy.c
+ sss_ssh_knownhostsproxy_CFLAGS = $(AM_CFLAGS)
+ sss_ssh_knownhostsproxy_LDADD = \
+- libsss_util.la
+-sss_ssh_knownhostsproxy_LDFLAGS = $(CLIENT_LIBS)
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
++sss_ssh_knownhostsproxy_LDFLAGS = $(CLIENT_LIBS) $(TALLOC_LIBS) $(POPT_LIBS)
+ endif
+
+ #################
+@@ -885,6 +924,8 @@ sysdb_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ sysdb_ssh_tests_DEPENDENCIES = \
+@@ -898,6 +939,8 @@ sysdb_ssh_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ strtonum_tests_SOURCES = \
+@@ -931,6 +974,8 @@ krb5_utils_tests_LDADD = \
+ $(KRB5_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+
+@@ -967,10 +1012,11 @@ files_tests_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CHECK_CFLAGS)
+ files_tests_LDADD = \
+- libsss_debug.la \
+ $(FILES_TESTS_LIBS) \
+ libsss_test_common.la \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ SSSD_RESOLV_TESTS_OBJ = \
+ $(SSSD_RESOLV_OBJ)
+@@ -991,7 +1037,7 @@ resolv_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ $(CARES_LIBS) \
+- libsss_util.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ refcount_tests_SOURCES = \
+@@ -1003,6 +1049,8 @@ refcount_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ fail_over_tests_SOURCES = \
+@@ -1016,6 +1064,8 @@ fail_over_tests_LDADD = \
+ $(CHECK_LIBS) \
+ $(CARES_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ find_uid_tests_SOURCES = \
+@@ -1044,6 +1094,8 @@ auth_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ ipa_ldap_opt_tests_SOURCES = \
+@@ -1087,6 +1139,9 @@ simple_access_tests_LDADD = \
+ $(PAM_LIBS) \
+ -ldl \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_child.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ util_tests_SOURCES = \
+@@ -1098,6 +1153,8 @@ util_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ debug_tests_SOURCES = \
+@@ -1109,7 +1166,7 @@ debug_tests_CFLAGS = \
+ debug_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+- libsss_util.la
++ libsss_debug.la
+
+ crypto_tests_SOURCES = \
+ $(SSS_CRYPT_SOURCES) \
+@@ -1133,7 +1190,6 @@ ipa_hbac_tests_CFLAGS = \
+ ipa_hbac_tests_LDADD = \
+ $(SSSD_LIBS) \
+ $(CHECK_LIBS) \
+- libsss_util.la \
+ libsss_test_common.la \
+ libipa_hbac.la
+
+@@ -1170,8 +1226,9 @@ pac_responder_tests_LDADD = \
+ $(SSSD_LIBS) \
+ -lm \
+ libsss_idmap.la \
+- libsss_debug.la \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ responder_socket_access_tests_SOURCES = \
+@@ -1184,16 +1241,17 @@ responder_socket_access_tests_CFLAGS = \
+ $(CHECK_CFLAGS)
+ responder_socket_access_tests_LDADD = \
+ $(CHECK_LIBS) \
+- $(TALLOC_LIBS) \
++ $(SSSD_LIBS) \
+ libsss_test_common.la \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+ endif
+
+ stress_tests_SOURCES = \
+ src/tests/stress-tests.c
+ stress_tests_LDADD = \
+ $(SSSD_LIBS) \
+- libsss_util.la \
+ libsss_test_common.la
+
+ krb5_child_test_SOURCES = \
+@@ -1213,11 +1271,14 @@ krb5_child_test_CFLAGS = \
+ -DKRB5_CHILD_DIR=\"$(builddir)\" \
+ $(CHECK_CFLAGS)
+ krb5_child_test_LDADD = \
+- $(SSSD_LIBS)\
++ $(SSSD_LIBS) \
+ $(CARES_LIBS) \
+ $(KRB5_LIBS) \
+ $(CHECK_LIBS) \
+ libsss_util.la \
++ libsss_crypt.la \
++ libsss_child.la \
++ libsss_debug.la \
+ libsss_test_common.la
+
+ if HAVE_CMOCKA
+@@ -1254,8 +1315,11 @@ nss_srv_tests_LDFLAGS = \
+ -Wl,-wrap,sss_cmd_done
+ nss_srv_tests_LDADD = \
+ $(CMOCKA_LIBS) \
++ $(SSSD_LIBS) \
+ libsss_idmap.la \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ test_find_uid_DEPENDENCIES = \
+ $(ldblib_LTLIBRARIES)
+@@ -1269,11 +1333,10 @@ test_find_uid_CFLAGS = \
+ $(TALLOC_CFLAGS) \
+ $(DHASH_CFLAGS)
+ test_find_uid_LDADD = \
+- libsss_debug.la \
+ $(TALLOC_LIBS) \
+ $(DHASH_LIBS) \
+ $(CMOCKA_LIBS) \
+- libsss_util.la
++ libsss_debug.la
+
+ test_io_SOURCES = \
+ src/tests/cmocka/test_io.c \
+@@ -1303,7 +1366,11 @@ dyndns_tests_LDFLAGS = \
+ dyndns_tests_LDADD = \
+ $(CARES_LIBS) \
+ $(CMOCKA_LIBS) \
+- libsss_util.la
++ $(SSSD_LIBS) \
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_child.la \
++ libsss_debug.la
+ endif
+
+ noinst_PROGRAMS = pam_test_client
+@@ -1497,7 +1564,6 @@ libsss_ldap_la_LIBADD = \
+ $(OPENLDAP_LIBS) \
+ $(DHASH_LIBS) \
+ $(KRB5_LIBS) \
+- libsss_util.la \
+ libsss_ldap_common.la \
+ libsss_idmap.la
+ libsss_ldap_la_LDFLAGS = \
+@@ -1514,7 +1580,6 @@ libsss_proxy_la_SOURCES = \
+ libsss_proxy_la_CFLAGS = \
+ $(AM_CFLAGS)
+ libsss_proxy_la_LIBADD = \
+- libsss_util.la \
+ $(PAM_LIBS)
+ libsss_proxy_la_LDFLAGS = \
+ -avoid-version \
+@@ -1526,8 +1591,7 @@ libsss_simple_la_SOURCES = \
+ libsss_simple_la_CFLAGS = \
+ $(AM_CFLAGS)
+ libsss_simple_la_LIBADD = \
+- $(PAM_LIBS) \
+- libsss_util.la
++ $(PAM_LIBS)
+ libsss_simple_la_LDFLAGS = \
+ -avoid-version \
+ -module
+@@ -1543,7 +1607,6 @@ libsss_krb5_la_LIBADD = \
+ $(DHASH_LIBS) \
+ $(KEYUTILS_LIBS) \
+ $(KRB5_LIBS) \
+- libsss_util.la \
+ libsss_krb5_common.la
+ libsss_krb5_la_LDFLAGS = \
+ -avoid-version \
+@@ -1588,7 +1651,6 @@ libsss_ipa_la_LIBADD = \
+ $(DHASH_LIBS) \
+ $(KEYUTILS_LIBS) \
+ $(KRB5_LIBS) \
+- libsss_util.la \
+ libsss_ldap_common.la \
+ libsss_krb5_common.la \
+ libipa_hbac.la \
+@@ -1639,7 +1701,6 @@ libsss_ad_la_LIBADD = \
+ $(KEYUTILS_LIBS) \
+ $(KRB5_LIBS) \
+ $(NDR_NBT_LIBS) \
+- libsss_util.la \
+ libsss_ldap_common.la \
+ libsss_krb5_common.la \
+ libsss_idmap.la
+@@ -1701,7 +1762,9 @@ proxy_child_CFLAGS = \
+ proxy_child_LDADD = \
+ $(PAM_LIBS) \
+ $(SSSD_LIBS) \
+- libsss_util.la
++ libsss_util.la \
++ libsss_crypt.la \
++ libsss_debug.la
+
+ memberof_la_SOURCES = \
+ src/ldb_modules/memberof.c \
+@@ -1751,8 +1814,7 @@ pysss_la_CFLAGS = \
+ $(PYTHON_CFLAGS)
+ pysss_la_LIBADD = \
+ $(PYTHON_BINDINGS_LIBS) \
+- $(PYTHON_LIBS) \
+- libsss_util.la
++ $(PYTHON_LIBS)
+ pysss_la_LDFLAGS = \
+ -avoid-version \
+ -module
diff --git a/debian/patches/fix-linking.diff b/debian/patches/fix-linking.diff
index 7f2f204..2067105 100644
--- a/debian/patches/fix-linking.diff
+++ b/debian/patches/fix-linking.diff
@@ -8,15 +8,3 @@
libsss_util.la \
libsss_test_common.la
-diff --git a/configure.ac b/configure.ac
-index f90d7fe..24da88c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,6 +21,7 @@ AM_PROG_AR
- AC_DISABLE_STATIC
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
-+link_all_deplibs=yes
- AC_CONFIG_MACRO_DIR([m4])
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.14])
diff --git a/debian/patches/series b/debian/patches/series
index dd2e430..e3a6165 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-linking.diff
+0001-Fix-compilation-with-disabled-link_all_deplibs.patch
More information about the Pkg-sssd-devel
mailing list