From 7f9841f3257b4530e14bb61956e8f68ed624d18756e0ea0d194e417410e0e6cf Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Thu, 2 Jan 2025 14:30:24 +0100 Subject: [PATCH] Fix Leap 15.x builds Signed-off-by: Samuel Cabrero --- ...OOL-Fix-build-parameter-name-omitted.patch | 85 +++++++++++++++++++ sssd.spec | 2 + 2 files changed, 87 insertions(+) create mode 100644 0001-TOOL-Fix-build-parameter-name-omitted.patch diff --git a/0001-TOOL-Fix-build-parameter-name-omitted.patch b/0001-TOOL-Fix-build-parameter-name-omitted.patch new file mode 100644 index 0000000..6bda949 --- /dev/null +++ b/0001-TOOL-Fix-build-parameter-name-omitted.patch @@ -0,0 +1,85 @@ +From b927ca4196f828bda6d5db6c6a6d852389bfede0 Mon Sep 17 00:00:00 2001 +From: Samuel Cabrero +Date: Thu, 2 Jan 2025 14:09:17 +0100 +Subject: [PATCH] TOOL: Fix build, parameter name omitted + +Signed-off-by: Samuel Cabrero +--- + src/tools/sssctl/sssctl_data.c | 8 ++++---- + src/tools/sssctl/sssctl_logs.c | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c +index b28556e73..a473e7e14 100644 +--- a/src/tools/sssctl/sssctl_data.c ++++ b/src/tools/sssctl/sssctl_data.c +@@ -125,7 +125,7 @@ static errno_t sssctl_backup(bool force) + } + + errno_t sssctl_client_data_backup(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + struct sssctl_data_opts opts = {0}; + errno_t ret; +@@ -184,7 +184,7 @@ static errno_t sssctl_restore(bool force_start, bool force_restart) + } + + errno_t sssctl_client_data_restore(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + struct sssctl_data_opts opts = {0}; + errno_t ret; +@@ -206,7 +206,7 @@ errno_t sssctl_client_data_restore(struct sss_cmdline *cmdline, + } + + errno_t sssctl_cache_remove(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + struct sssctl_data_opts opts = {0}; + errno_t ret; +@@ -413,7 +413,7 @@ done: + } + + errno_t sssctl_cache_index(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + const char *attr = NULL; + const char *action_str = NULL; +diff --git a/src/tools/sssctl/sssctl_logs.c b/src/tools/sssctl/sssctl_logs.c +index f8ef9f2c6..8ba18b394 100644 +--- a/src/tools/sssctl/sssctl_logs.c ++++ b/src/tools/sssctl/sssctl_logs.c +@@ -418,7 +418,7 @@ int parse_debug_level(const char *strlevel) + } + + errno_t sssctl_logs_remove(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + struct sssctl_logs_opts opts = {0}; + errno_t ret; +@@ -470,7 +470,7 @@ errno_t sssctl_logs_remove(struct sss_cmdline *cmdline, + } + + errno_t sssctl_logs_fetch(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + const char *file = NULL; + errno_t ret; +@@ -587,7 +587,7 @@ fini: + } + + errno_t sssctl_analyze(struct sss_cmdline *cmdline, +- struct sss_tool_ctx *) ++ struct sss_tool_ctx *tool_ctx) + { + #ifndef BUILD_CHAIN_ID + PRINT("ERROR: Tevent chain ID support missing, log analyzer is unsupported.\n"); +-- +2.47.1 + diff --git a/sssd.spec b/sssd.spec index a79967b..41ffc2d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -28,6 +28,7 @@ Source: https://github.com/SSSD/sssd/releases/download/%version/%name-%v Source2: https://github.com/SSSD/sssd/releases/download/%version/%name-%version.tar.gz.asc Source3: baselibs.conf Source5: %name.keyring +Patch1: 0001-TOOL-Fix-build-parameter-name-omitted.patch Patch11: krb-noversion.diff Patch12: harden_sssd-ifp.service.patch Patch13: harden_sssd-kcm.service.patch @@ -48,6 +49,7 @@ BuildRequires: libtool BuildRequires: libunistring-devel BuildRequires: libxml2-tools BuildRequires: libxslt-tools +BuildRequires: libopenssl-3-devel BuildRequires: nscd BuildRequires: nss_wrapper BuildRequires: openldap2-devel