From 94aa6efec6b29288c2d211de3fb7b0c82759a8b5 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 16 Jun 2021 14:42:33 +0800 Subject: sssd: add fix-ldblibdir.patch back The patch fix-ldblibdir.patch has been dropped when update sssd to 2.5.0. But it fails to start sssd without this patch. So add it back. Signed-off-by: Kai Kang Signed-off-by: Armin Kuster --- recipes-security/sssd/files/fix-ldblibdir.patch | 25 +++++++++++++++++++++++++ recipes-security/sssd/sssd_2.5.0.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 recipes-security/sssd/files/fix-ldblibdir.patch (limited to 'recipes-security/sssd') diff --git a/recipes-security/sssd/files/fix-ldblibdir.patch b/recipes-security/sssd/files/fix-ldblibdir.patch new file mode 100644 index 0000000..e350baf --- /dev/null +++ b/recipes-security/sssd/files/fix-ldblibdir.patch @@ -0,0 +1,25 @@ +When calculate value of ldblibdir, it checks whether the directory of +$ldblibdir exists. If not, it assigns ldblibdir with ${libdir}/ldb. It is not +suitable for cross compile. Fix it that only re-assign ldblibdir when its value +is empty. + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Kai Kang +--- + src/external/libldb.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/external/libldb.m4 b/src/external/libldb.m4 +index c400add..5e5f06d 100644 +--- a/src/external/libldb.m4 ++++ b/src/external/libldb.m4 +@@ -19,7 +19,7 @@ if test x"$with_ldb_lib_dir" != x; then + ldblibdir=$with_ldb_lib_dir + else + ldblibdir="`$PKG_CONFIG --variable=modulesdir ldb`" +- if ! test -d $ldblibdir; then ++ if test -z $ldblibdir; then + ldblibdir="${libdir}/ldb" + fi + fi diff --git a/recipes-security/sssd/sssd_2.5.0.bb b/recipes-security/sssd/sssd_2.5.0.bb index c699527..84b7b0e 100644 --- a/recipes-security/sssd/sssd_2.5.0.bb +++ b/recipes-security/sssd/sssd_2.5.0.bb @@ -21,6 +21,7 @@ SRC_URI = "https://github.com/SSSD/sssd/releases/download/2.5.0/sssd-2.5.0.tar.g file://no_gen.patch \ file://fix_gid.patch \ file://drop_ntpdate_chk.patch \ + file://fix-ldblibdir.patch \ " SRC_URI[sha256sum] = "afa62d7d8d23fca3aba093abe4ec0d14e7d9346c5b28ceb7c2c624bed98caa06" -- cgit v1.2.3-54-g00ecf