Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SSSD, move to portage-stable #2501

Merged
merged 14 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/portage-stable-packages-list
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ dev-libs/libltdl
dev-libs/libmspack
dev-libs/libnl
dev-libs/libp11
dev-libs/libpcre
dev-libs/libpcre2
dev-libs/libpipeline
dev-libs/libpwquality
Expand Down Expand Up @@ -502,6 +501,7 @@ net-dialup/lrzsz
net-dialup/minicom

net-dns/bind
net-dns/bind-tools
krnowak marked this conversation as resolved.
Show resolved Hide resolved
net-dns/c-ares
net-dns/dnsmasq
net-dns/libidn2
Expand All @@ -512,7 +512,6 @@ net-firewall/ipset
net-fs/cifs-utils

net-libs/gnutls
net-libs/http-parser
net-libs/libmicrohttpd
net-libs/libmnl
net-libs/libnetfilter_conntrack
Expand Down Expand Up @@ -614,6 +613,8 @@ sys-apps/util-linux
sys-apps/which
sys-apps/zram-generator

sys-auth/sssd

sys-block/open-iscsi
sys-block/open-isns
sys-block/parted
Expand Down
1 change: 1 addition & 0 deletions changelog/security/2024-12-03-sssd-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- sssd ([CVE-2023-3758](https://nvd.nist.gov/vuln/detail/CVE-2023-3758))
1 change: 1 addition & 0 deletions changelog/updates/2024-12-03-sssd-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- sssd ([2.9.5](https://sssd.io/release-notes/sssd-2.9.5.html) (includes [2.9.4](https://sssd.io/release-notes/sssd-2.9.4.html), [2.9.3](https://sssd.io/release-notes/sssd-2.9.3.html), [2.9.2](https://sssd.io/release-notes/sssd-2.9.2.html), [2.9.1](https://sssd.io/release-notes/sssd-2.9.1.html), [2.9.0](https://sssd.io/release-notes/sssd-2.9.0.html), [2.8.0](https://sssd.io/release-notes/sssd-2.8.0.html), [2.7.0](https://sssd.io/release-notes/sssd-2.7.0.html), [2.6.0](https://sssd.io/release-notes/sssd-2.6.0.html), [2.5.0](https://sssd.io/release-notes/sssd-2.5.0.html), [2.4.0](https://sssd.io/release-notes/sssd-2.4.0.html))
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
export ac_cv_member_struct_ldap_conncb_lc_arg=no
# `--enable-sss-default-nss-plugin` enables nss lookup with sss
# plugin, even if sssd is not running.
export EXTRA_ECONF="--enable-sss-default-nss-plugin"

# We haven't switched to having pam config in /etc, so move the files
# to /usr.
cros_post_src_install_move_pamd() {
mkdir -p "${ED}/usr/share/"
mv "${ED}/etc/pam.d" "${ED}/usr/share/pam.d"
}

# This is to make sure that some sssd config is always in place.
cros_post_src_set_initial_config() {
cp -a "${ED}"/etc/sssd/sssd{-example,}.conf
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From a559550c8e2d162735ff8a43de6dc59af71cf3df Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <[email protected]>
Date: Tue, 3 Dec 2024 19:05:44 +0100
Subject: [PATCH] Assume that callbacks are not broken in OpenLDAP when
cross-compiling

If we do cross-compiling against a known broken version of OpenLDAP,
we can do `export ac_cv_member_struct_ldap_conncb_lc_arg=no` before
running configure. This is rather unlikely now, as the test was done
to detect a bug that was fixed 16 years ago.

This allows the project to be configured successfully when
cross-compiling, without disabling connection callbacks.
---
src/external/ldap.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/external/ldap.m4 b/src/external/ldap.m4
index f42023cd4..09e44fc7b 100644
--- a/src/external/ldap.m4
+++ b/src/external/ldap.m4
@@ -80,7 +80,8 @@ AC_CHECK_MEMBERS([struct ldap_conncb.lc_arg],
[AC_DEFINE([HAVE_LDAP_CONNCB], [1],
[Define if LDAP connection callbacks are available])],
[AC_MSG_WARN([Found broken callback implementation])],
- [])],
+ [AC_DEFINE([HAVE_LDAP_CONNCB], [1],
+ [Define if LDAP connection callbacks are available])])],
[], [[#include <ldap.h>]])

AC_CHECK_TYPE([LDAPDerefRes],
--
2.34.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The `0001-Assume-that-callbacks-are-not-broken-in-OpenLDAP-whe.patch` allows
the project to be cross-compiled without disabling LDAP connection
callbacks. It is being upstreamed.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Only ship microcode currently distributed by Intel
# See https://bugs.gentoo.org/654638#c11 by iucode-tool maintainer
sys-firmware/intel-microcode vanilla

# Enable gssapi only for amd64, to avoid build errors in arm64.
net-dns/bind gssapi

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
# Keep versions on both arches in sync.
=sys-apps/kexec-tools-2.0.28 ~arm64
=sys-apps/zram-generator-1.1.2-r1 ~arm64
=sys-auth/sssd-2.9.5 ~arm64
=sys-boot/mokutil-0.7.2 **

# Enable ipvsadm for arm64.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ sys-fs/squashfs-tools xz lz4 lzma lzo zstd
# make the kernel version discoverable via the traditional gentoo symlink
sys-kernel/coreos-sources symlink

# set build options for ssdp
net-nds/openldap minimal sasl
# set build options for sssd
net-nds/openldap minimal sasl experimental
sys-libs/glibc nscd

# disable database build because otherwise it tries to generate a database in /etc
Expand Down Expand Up @@ -100,7 +100,8 @@ sys-apps/kmod lzma
app-portage/portage-utils -qmanifest

# Disable unnecessary regedit in samba to minimize the package size.
net-fs/samba -regedit
# winbind needed by sssd
net-fs/samba -regedit winbind

# Drop extra dependencies
sys-libs/ldb -lmdb -python
Expand Down Expand Up @@ -160,3 +161,7 @@ sys-fs/zfs minimal -rootfs
# Do not tinker with /boot partition at installation time.
sys-firmware/intel-microcode -initramfs
sys-fs/zfs-kmod -initramfs

# For sys-auth/sssd
net-dns/bind gssapi
net-dns/bind-tools gssapi

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,3 @@ x11-libs/pixman static-libs

# Get latest EDK2 firmware for Secure Boot on arm64.
app-emulation/qemu -pin-upstream-blobs

# Enable gssapi for SDK
net-dns/bind gssapi

This file was deleted.

This file was deleted.

Loading
Loading