mirror of
https://git.yoctoproject.org/meta-security
synced 2026-10-23 07:48:12 +00:00
sssd: upgrade 2.10.2 -> 2.13.1
Upgrade sssd to latest release. Add _GNU_SOURCE to CFLAGS when building with musl to pick up strchrnul definition. Release notes: https://sssd.io/release-notes/sssd-2.11.0.html https://sssd.io/release-notes/sssd-2.11.1.html https://sssd.io/release-notes/sssd-2.12.0.html https://sssd.io/release-notes/sssd-2.13.0.html https://sssd.io/release-notes/sssd-2.13.1.html Signed-off-by: Scott Murray <scott.murray@konsulko.com>
This commit is contained in:
1 parent
f80269340c
commit
d8dc1ec244
6 files changed
+67
-33
No files matched your search
@@ -1,14 +1,21 @@
|
|||||||
|
From 106a4283f450d9cf6caab9e63d45aeb5a6c9718b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Armin Kuster <akuster808@gmail.com>
|
||||||
|
Date: Tue, 18 May 2021 15:10:53 +0000
|
||||||
|
Subject: [PATCH] sssd: update to 2.5.0
|
||||||
|
|
||||||
nsupdate path is needed for various exec call
|
nsupdate path is needed for various exec call
|
||||||
but don't run natvie tests on it.
|
but don't run natvie tests on it.
|
||||||
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [OE specific]
|
Upstream-Status: Inappropriate [OE specific]
|
||||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||||
|
---
|
||||||
|
src/external/nsupdate.m4 | 12 ------------
|
||||||
|
1 file changed, 12 deletions(-)
|
||||||
|
|
||||||
Index: sssd-2.5.0/src/external/nsupdate.m4
|
diff --git a/src/external/nsupdate.m4 b/src/external/nsupdate.m4
|
||||||
===================================================================
|
index a137f38..ab08f57 100644
|
||||||
--- sssd-2.5.0.orig/src/external/nsupdate.m4
|
--- a/src/external/nsupdate.m4
|
||||||
+++ sssd-2.5.0/src/external/nsupdate.m4
|
+++ b/src/external/nsupdate.m4
|
||||||
@@ -3,16 +3,4 @@ AC_MSG_CHECKING(for executable nsupdate)
|
@@ -3,16 +3,4 @@ AC_MSG_CHECKING(for executable nsupdate)
|
||||||
if test -x "$NSUPDATE"; then
|
if test -x "$NSUPDATE"; then
|
||||||
AC_DEFINE_UNQUOTED([NSUPDATE_PATH], ["$NSUPDATE"], [The path to nsupdate])
|
AC_DEFINE_UNQUOTED([NSUPDATE_PATH], ["$NSUPDATE"], [The path to nsupdate])
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
From 937a58aaa95036529e03926ab79d407438777981 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kai Kang <kai.kang@windriver.com>
|
||||||
|
Date: Wed, 16 Jun 2021 14:42:33 +0800
|
||||||
|
Subject: [PATCH] sssd: fix for ldblibdir and systemd etc
|
||||||
|
|
||||||
When calculate value of ldblibdir, it checks whether the directory of
|
When calculate value of ldblibdir, it checks whether the directory of
|
||||||
$ldblibdir exists. If not, it assigns ldblibdir with ${libdir}/ldb. It is not
|
$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
|
suitable for cross compile. Fix it that only re-assign ldblibdir when its value
|
||||||
@@ -11,10 +16,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/external/libldb.m4 b/src/external/libldb.m4
|
diff --git a/src/external/libldb.m4 b/src/external/libldb.m4
|
||||||
index c400add..5e5f06d 100644
|
index e8285a9..e98913c 100644
|
||||||
--- a/src/external/libldb.m4
|
--- a/src/external/libldb.m4
|
||||||
+++ b/src/external/libldb.m4
|
+++ b/src/external/libldb.m4
|
||||||
@@ -19,7 +19,7 @@ if test x"$with_ldb_lib_dir" != x; then
|
@@ -22,7 +22,7 @@ if test x"$with_ldb_lib_dir" != x; then
|
||||||
ldblibdir=$with_ldb_lib_dir
|
ldblibdir=$with_ldb_lib_dir
|
||||||
else
|
else
|
||||||
ldblibdir="`$PKG_CONFIG --variable=modulesdir ldb`"
|
ldblibdir="`$PKG_CONFIG --variable=modulesdir ldb`"
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
From 394e022694d03dc456f00df656c8a0c5e59a1d49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Armin Kuster <akuster808@gmail.com>
|
||||||
|
Date: Tue, 18 May 2021 15:10:53 +0000
|
||||||
|
Subject: [PATCH] sssd: update to 2.5.0
|
||||||
|
|
||||||
from ../sssd-2.5.0/src/util/sss_pam_data.c:27:
|
from ../sssd-2.5.0/src/util/sss_pam_data.c:27:
|
||||||
| ../sssd-2.5.0/src/util/debug.h:88:44: error: unknown type name 'uid_t'; did you mean 'uint_t'?
|
| ../sssd-2.5.0/src/util/debug.h:88:44: error: unknown type name 'uid_t'; did you mean 'uint_t'?
|
||||||
| 88 | int chown_debug_file(const char *filename, uid_t uid, gid_t gid);
|
| 88 | int chown_debug_file(const char *filename, uid_t uid, gid_t gid);
|
||||||
@@ -11,11 +16,14 @@ from ../sssd-2.5.0/src/util/sss_pam_data.c:27:
|
|||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||||
|
---
|
||||||
|
src/util/debug.h | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
Index: sssd-2.7.1/src/util/debug.h
|
diff --git a/src/util/debug.h b/src/util/debug.h
|
||||||
===================================================================
|
index 22c8ebd..5736d3d 100644
|
||||||
--- sssd-2.7.1.orig/src/util/debug.h
|
--- a/src/util/debug.h
|
||||||
+++ sssd-2.7.1/src/util/debug.h
|
+++ b/src/util/debug.h
|
||||||
@@ -24,6 +24,8 @@
|
@@ -24,6 +24,8 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
@@ -24,4 +32,4 @@ Index: sssd-2.7.1/src/util/debug.h
|
|||||||
+#include <sys/types.h>
|
+#include <sys/types.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <libintl.h>
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
fix musl build failures
|
From 05abd666016db971d8738685a31277771d16b29d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Armin Kuster <akuster808@gmail.com>
|
||||||
|
Date: Sun, 4 Jul 2021 08:50:06 -0700
|
||||||
|
Subject: [PATCH] fix musl build failures
|
||||||
|
|
||||||
Missing _PATH_HOSTS and some NETDB defines when musl is enabled.
|
Missing _PATH_HOSTS and some NETDB defines when musl is enabled.
|
||||||
|
|
||||||
@@ -13,17 +16,20 @@ and
|
|||||||
i./sssd-2.5.1/src/sss_client/nss_ipnetworks.c:415:21: error: 'NETDB_INTERNAL' undeclared (first use in this function)
|
i./sssd-2.5.1/src/sss_client/nss_ipnetworks.c:415:21: error: 'NETDB_INTERNAL' undeclared (first use in this function)
|
||||||
| 415 | *h_errnop = NETDB_INTERNAL;
|
| 415 | *h_errnop = NETDB_INTERNAL;
|
||||||
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||||
|
---
|
||||||
|
src/providers/fail_over.c | 4 ++++
|
||||||
|
src/sss_client/sss_cli.h | 8 ++++++++
|
||||||
|
2 files changed, 12 insertions(+)
|
||||||
|
|
||||||
Index: sssd-2.5.1/src/providers/fail_over.c
|
diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c
|
||||||
===================================================================
|
index d56c20f..2c6ceb6 100644
|
||||||
--- sssd-2.5.1.orig/src/providers/fail_over.c
|
--- a/src/providers/fail_over.c
|
||||||
+++ sssd-2.5.1/src/providers/fail_over.c
|
+++ b/src/providers/fail_over.c
|
||||||
@@ -31,6 +31,10 @@
|
@@ -33,6 +33,10 @@
|
||||||
#include <talloc.h>
|
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
+#if !defined(_PATH_HOSTS)
|
+#if !defined(_PATH_HOSTS)
|
||||||
+#define _PATH_HOSTS "/etc/hosts"
|
+#define _PATH_HOSTS "/etc/hosts"
|
||||||
@@ -32,12 +38,12 @@ Index: sssd-2.5.1/src/providers/fail_over.c
|
|||||||
#include "util/dlinklist.h"
|
#include "util/dlinklist.h"
|
||||||
#include "util/refcount.h"
|
#include "util/refcount.h"
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
Index: sssd-2.5.1/src/sss_client/sss_cli.h
|
diff --git a/src/sss_client/sss_cli.h b/src/sss_client/sss_cli.h
|
||||||
===================================================================
|
index 57e1ead..f58510f 100644
|
||||||
--- sssd-2.5.1.orig/src/sss_client/sss_cli.h
|
--- a/src/sss_client/sss_cli.h
|
||||||
+++ sssd-2.5.1/src/sss_client/sss_cli.h
|
+++ b/src/sss_client/sss_cli.h
|
||||||
@@ -44,6 +44,14 @@ typedef int errno_t;
|
@@ -52,6 +52,14 @@ typedef int errno_t;
|
||||||
#define EOK 0
|
#define NETDB_INTERNAL (-1)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+#ifndef NETDB_INTERNAL
|
+#ifndef NETDB_INTERNAL
|
||||||
|
|||||||
@@ -1,14 +1,20 @@
|
|||||||
don't run generate-sbus-code
|
From e9d42559b03a9543f3db91202917c76184617a4f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Armin Kuster <akuster808@gmail.com>
|
||||||
|
Date: Tue, 18 May 2021 15:10:53 +0000
|
||||||
|
Subject: [PATCH] don't run generate-sbus-code
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [OE Specific]
|
Upstream-Status: Inappropriate [OE Specific]
|
||||||
|
|
||||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||||
|
---
|
||||||
|
Makefile.am | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
Index: sssd-2.7.1/Makefile.am
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
===================================================================
|
index 0ca40d9..75fdf72 100644
|
||||||
--- sssd-2.7.1.orig/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ sssd-2.7.1/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -1023,8 +1023,6 @@ generate-sbus-code:
|
@@ -1048,8 +1048,6 @@ generate-sbus-code:
|
||||||
|
|
||||||
.PHONY: generate-sbus-code
|
.PHONY: generate-sbus-code
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -24,7 +24,7 @@ SRC_URI = "https://github.com/SSSD/sssd/releases/download/${PV}/${BP}.tar.gz \
|
|||||||
file://fix-ldblibdir.patch \
|
file://fix-ldblibdir.patch \
|
||||||
file://musl_fixup.patch \
|
file://musl_fixup.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "e8aa5e6b48ae465bea7064048715ce7e9c53b50ec6a9c69304f59e0d35be40ff"
|
SRC_URI[sha256sum] = "05ea79e89f0be399983925b8874ac196d6dc5fd4416f83609557b9fc8ef798b5"
|
||||||
|
|
||||||
inherit autotools pkgconfig gettext python3native features_check systemd useradd github-releases
|
inherit autotools pkgconfig gettext python3native features_check systemd useradd github-releases
|
||||||
|
|
||||||
@@ -71,6 +71,8 @@ EXTRA_OECONF += " \
|
|||||||
--with-sssd-user=sssd \
|
--with-sssd-user=sssd \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
CFLAGS:append:libc-musl = " -D_GNU_SOURCE"
|
||||||
|
|
||||||
do_configure:prepend () {
|
do_configure:prepend () {
|
||||||
mkdir -p ${AUTOTOOLS_AUXDIR}/build
|
mkdir -p ${AUTOTOOLS_AUXDIR}/build
|
||||||
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/build/
|
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/build/
|
||||||
Reference in new issue
Block a user