mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
testing/sssd: upgrade to 2.11.0
https://github.com/SSSD/sssd/releases/tag/2.11.0
This commit is contained in:
fossdd
Andy Postnikov
parent
d560e4e19b
commit
61636fb6a3
3 changed files with 30 additions and 73 deletions
|
|
@ -2,8 +2,8 @@
|
|||
# Contributor: Henrik Riomar <henrik.riomar@gmail.com>
|
||||
maintainer="fossdd <fossdd@pwned.life>"
|
||||
pkgname=sssd
|
||||
pkgver=2.10.2
|
||||
pkgrel=1
|
||||
pkgver=2.11.0
|
||||
pkgrel=0
|
||||
pkgdesc="System Security Services Daemon"
|
||||
url="https://github.com/SSSD/sssd"
|
||||
arch="all"
|
||||
|
|
@ -59,7 +59,7 @@ makedepends="
|
|||
"
|
||||
subpackages="$pkgname-dev py3-$pkgname-pyc py3-$pkgname:py3 $pkgname-openrc"
|
||||
source="https://github.com/SSSD/sssd/releases/download/$pkgver/sssd-$pkgver.tar.gz
|
||||
musl_fixup.patch
|
||||
prctl.patch
|
||||
sssd.initd
|
||||
"
|
||||
options="!check" # fails
|
||||
|
|
@ -115,7 +115,7 @@ py3() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
14ad222802e5426b0959ee32602e04ce24b3eb8d3bdd5e188cf29e3c7d32e0631b41c386fdbd129acf281317538460015d35410a688ea48dd546f9ae28522eac sssd-2.10.2.tar.gz
|
||||
c9db51a773c821a2c5327d2e4b0d3c81dd89d780aa7f9dd66ff88a7419a8072907047c8d9faec17ea14c5404c636485eceda85df0b299f40fae362ef7bfb34e8 musl_fixup.patch
|
||||
cf273853170ff8fa8767eb7f760ee205d7b0b9c725f81de51c44463b96b66b509c5e257a4e9c9a633bd7080fde42b11164579291664de4629654ffa9989352fb sssd-2.11.0.tar.gz
|
||||
4f86a48330ae39825d878f85abcac3e88dbe4bbcc021f93d320418264a18afa326b0267c61aa9944c65f5f9c635856e2c5eff6504538b7e50ff666b7cc203ddf prctl.patch
|
||||
7198c66c96ba48c43def004e302be2e3348d43a4b5a1b35eb25f99081f1f6dce89d3994377a3064f72462509648bfbca1062493d244e413f0c47122cc0436bc9 sssd.initd
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
fix musl build failures
|
||||
|
||||
Missing _PATH_HOSTS and some NETDB defines when musl is enabled.
|
||||
|
||||
These are work arounds for now while we figure out where the real fix should reside (musl, gcompact, sssd):
|
||||
|
||||
./sssd-2.5.1/src/providers/fail_over.c:1199:19: error: '_PATH_HOSTS' undeclared (first use in this function)
|
||||
| 1199 | _PATH_HOSTS);
|
||||
| | ^~~~~~~~~~~
|
||||
|
||||
and
|
||||
|
||||
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;
|
||||
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
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 9cb2683..655438c 100644
|
||||
--- a/src/providers/fail_over.c
|
||||
+++ b/src/providers/fail_over.c
|
||||
@@ -31,6 +31,10 @@
|
||||
#include <talloc.h>
|
||||
#include <netdb.h>
|
||||
|
||||
+#if !defined(_PATH_HOSTS)
|
||||
+#define _PATH_HOSTS "/etc/hosts"
|
||||
+#endif
|
||||
+
|
||||
#include "util/dlinklist.h"
|
||||
#include "util/refcount.h"
|
||||
#include "util/util.h"
|
||||
diff --git a/src/sss_client/sss_cli.h b/src/sss_client/sss_cli.h
|
||||
index dd36e21..96f279d 100644
|
||||
--- a/src/sss_client/sss_cli.h
|
||||
+++ b/src/sss_client/sss_cli.h
|
||||
@@ -44,6 +44,14 @@ typedef int errno_t;
|
||||
#define EOK 0
|
||||
#endif
|
||||
|
||||
+#ifndef NETDB_INTERNAL
|
||||
+# define NETDB_INTERNAL (-1)
|
||||
+#endif
|
||||
+
|
||||
+#ifndef NETDB_SUCCESS
|
||||
+# define NETDB_SUCCESS (0)
|
||||
+#endif
|
||||
+
|
||||
#define SSS_NSS_PROTOCOL_VERSION 1
|
||||
#define SSS_PAM_PROTOCOL_VERSION 3
|
||||
#define SSS_SUDO_PROTOCOL_VERSION 1
|
||||
diff --git a/src/tools/tools_mc_util.c b/src/tools/tools_mc_util.c
|
||||
index a4f3a81..cad1f3e 100644
|
||||
--- a/src/tools/tools_mc_util.c
|
||||
+++ b/src/tools/tools_mc_util.c
|
||||
@@ -168,7 +168,7 @@ static errno_t wait_till_nss_responder_invalidate_cache(void)
|
||||
{
|
||||
struct stat stat_buf = { 0 };
|
||||
const time_t max_wait = 1000000; /* 1 second */
|
||||
- const __useconds_t step_time = 5000; /* 5 milliseconds */
|
||||
+ const useconds_t step_time = 5000; /* 5 milliseconds */
|
||||
const size_t steps_count = max_wait / step_time;
|
||||
int ret;
|
||||
|
||||
25
testing/sssd/prctl.patch
Normal file
25
testing/sssd/prctl.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
Patch-Source: https://github.com/SSSD/sssd/pull/7989
|
||||
---
|
||||
From 5793a46e12c7673456b6dfd465a8e49757dc0bc1 Mon Sep 17 00:00:00 2001
|
||||
From: fossdd <fossdd@pwned.life>
|
||||
Date: Fri, 6 Jun 2025 08:03:06 +0200
|
||||
Subject: [PATCH] sss_prctl: avoid redefinition of prctl_mm_map
|
||||
|
||||
prctl_mm_map is provided by linux's prctl.h and libc's prctl.h.
|
||||
libc's headers should be preferred.
|
||||
---
|
||||
src/util/sss_prctl.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/util/sss_prctl.c b/src/util/sss_prctl.c
|
||||
index c7561673b51..aa29bcdb198 100644
|
||||
--- a/src/util/sss_prctl.c
|
||||
+++ b/src/util/sss_prctl.c
|
||||
@@ -21,7 +21,6 @@
|
||||
#include "util/sss_prctl.h"
|
||||
|
||||
#ifdef HAVE_PRCTL
|
||||
-#include <linux/prctl.h>
|
||||
#include <sys/prctl.h>
|
||||
|
||||
int sss_prctl_set_dumpable(int dumpable)
|
||||
Loading…
Add table
Add a link
Reference in a new issue