Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web08.2942.1625431698316399989 for ; Sun, 04 Jul 2021 13:48:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NwSP6Amk; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id j199so14434473pfd.7 for ; Sun, 04 Jul 2021 13:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=a5Q35+7BcJPsntT+sKeqamaf7/gPo4q2jOiF5TV6Gbs=; b=NwSP6AmkE5t1XzTHTJ+1JE2lujpT30EJtrC8FM7dW68HdM8lHDHhc3k/CHzFNqZ0vm HNPJN9zbPLEjkbmYi88WXpu5ioopaTvsg8uMiVzRUX1Q57SbkVzO3FH9AlTQuv4Nx0bx /zR8vqDbEbdPTNmML81R8jY4D2Bv0q38xGfgNUmhEVdA6JBqX4Ke4HWRhvpSvWQse5FJ //FmlummkbhkR0NOIeUYqE5yhclEzEHceVrjTpPfyVJEgW9zlCMRik0Ug88O6K6ukB5H ALeYeOJWtJiwj0U6TsIgd8MeoZ+SdAgCDozWxkCoRf++pp1JBMQHebwe+iUlMLb6pIZJ h8Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=a5Q35+7BcJPsntT+sKeqamaf7/gPo4q2jOiF5TV6Gbs=; b=qSNXmYMMtu18o9tfw5vZbH+FlsLnUDWjh1iaml6IHrX/ij/zG8mcsuLf1V/HVolaSk PUc9BphxOybtuXZdC6HV1zE73Yx5mAJJokvZcB8j1vMRg6yjgy0xUw1JiYiaPpYI9sJ1 rD0hexo1ZMmBSUThBys/7Qj2w0mfrBx83QiipmPJBZr4uEyqjN74YynLyOzQkNncbQFm P+sG/bUQzG6JVhARQc+j0mtqNj3bpi9NaNrSeS5JG7F23GwSUsRlBTC92N6KfGLk1ziA oI8VGo/ZgmKo3MxbGTgC5vZyVTNRO3k9oXk26hEVtnIkrkhwweXuz/3x6PbM2+9eLmoH BT+Q== X-Gm-Message-State: AOAM530eGMJG4yyVzZrwmcipc9SVnQbbyFArp2SVdo0zvheiiCZ8z7tm PNRYR07LD1wLLdjX/jQmHuWh2sepyCLl9A== X-Google-Smtp-Source: ABdhPJxMMAKoQE0OWK5s21T8E8QY8O0hpT5CTlCSTVhmgiGVT9+8VlAGo6Y/YB4rTDsm5zsL3QS0hw== X-Received: by 2002:a63:b25c:: with SMTP id t28mr12025974pgo.251.1625431697813; Sun, 04 Jul 2021 13:48:17 -0700 (PDT) Return-Path: Received: from akuster-ThinkPad-X13-Gen-1.hsd1.ca.comcast.net ([2601:202:4180:a5c0:5f44:8c5e:6750:1a4a]) by smtp.gmail.com with ESMTPSA id d1sm8447512pju.16.2021.07.04.13.48.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 13:48:17 -0700 (PDT) From: "Armin Kuster" To: yocto@lists.yoctoproject.org Subject: [meta-security][PATCH] sssd: update to 2.5.1 Date: Sun, 4 Jul 2021 13:48:15 -0700 Message-Id: <20210704204815.2808051-1-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit See full change log: https://sssd.io/release-notes/sssd-2.5.1.html Including a musl build work around Signed-off-by: Armin Kuster --- recipes-security/sssd/files/musl_fixup.patch | 53 +++++++++++++++++++ .../sssd/{sssd_2.5.0.bb => sssd_2.5.1.bb} | 6 ++- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 recipes-security/sssd/files/musl_fixup.patch rename recipes-security/sssd/{sssd_2.5.0.bb => sssd_2.5.1.bb} (96%) diff --git a/recipes-security/sssd/files/musl_fixup.patch b/recipes-security/sssd/files/musl_fixup.patch new file mode 100644 index 0000000..68f267c --- /dev/null +++ b/recipes-security/sssd/files/musl_fixup.patch @@ -0,0 +1,53 @@ +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 + +Index: sssd-2.5.1/src/providers/fail_over.c +=================================================================== +--- sssd-2.5.1.orig/src/providers/fail_over.c ++++ sssd-2.5.1/src/providers/fail_over.c +@@ -31,6 +31,10 @@ + #include + #include + ++#if !defined(_PATH_HOSTS) ++#define _PATH_HOSTS "/etc/hosts" ++#endif ++ + #include "util/dlinklist.h" + #include "util/refcount.h" + #include "util/util.h" +Index: sssd-2.5.1/src/sss_client/sss_cli.h +=================================================================== +--- sssd-2.5.1.orig/src/sss_client/sss_cli.h ++++ sssd-2.5.1/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/recipes-security/sssd/sssd_2.5.0.bb b/recipes-security/sssd/sssd_2.5.1.bb similarity index 96% rename from recipes-security/sssd/sssd_2.5.0.bb rename to recipes-security/sssd/sssd_2.5.1.bb index 84b7b0e..9205843 100644 --- a/recipes-security/sssd/sssd_2.5.0.bb +++ b/recipes-security/sssd/sssd_2.5.1.bb @@ -15,15 +15,17 @@ DEPENDS_append_libc-musl = " musl-nscd" DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'nss', '', \ bb.utils.contains('PACKAGECONFIG', 'crypto', '', 'nss', d), d)}" -SRC_URI = "https://github.com/SSSD/sssd/releases/download/2.5.0/sssd-2.5.0.tar.gz \ +SRC_URI = "https://github.com/SSSD/sssd/releases/download/${PV}/sssd-${PV}.tar.gz \ file://sssd.conf \ file://volatiles.99_sssd \ file://no_gen.patch \ file://fix_gid.patch \ file://drop_ntpdate_chk.patch \ file://fix-ldblibdir.patch \ + file://musl_fixup.patch \ " -SRC_URI[sha256sum] = "afa62d7d8d23fca3aba093abe4ec0d14e7d9346c5b28ceb7c2c624bed98caa06" + +SRC_URI[sha256sum] = "ce2f5d84a3f1750093318afd27f4fd75b1e3e75f7d80fc42d21a40cc54b58ea4" inherit autotools pkgconfig gettext python3-dir features_check systemd -- 2.25.1