From patchwork Sat Dec 18 10:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Remco van 't Veer X-Patchwork-Id: 35387 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2D53327BBEA; Sat, 18 Dec 2021 15:52:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8BD2827BBE9 for ; Sat, 18 Dec 2021 15:52:35 +0000 (GMT) Received: from localhost ([::1]:48692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myc0g-0002al-Ic for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 10:52:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myXQd-0005nt-5t for guix-patches@gnu.org; Sat, 18 Dec 2021 05:59:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myXQc-0003Le-Oz for guix-patches@gnu.org; Sat, 18 Dec 2021 05:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myXQc-0005NI-JS for guix-patches@gnu.org; Sat, 18 Dec 2021 05:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52597] [PATCH] gnu: sssd: Fix build with glibc-2.33 Resent-From: Remco van 't Veer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 10:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52597@debbugs.gnu.org Cc: Remco van 't Veer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163982511420624 (code B ref -1); Sat, 18 Dec 2021 10:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 10:58:34 +0000 Received: from localhost ([127.0.0.1]:41342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myXQ6-0005MW-HO for submit@debbugs.gnu.org; Sat, 18 Dec 2021 05:58:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:54718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myXQ4-0005MM-Mc for submit@debbugs.gnu.org; Sat, 18 Dec 2021 05:58:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myXQ4-0005jB-3u for guix-patches@gnu.org; Sat, 18 Dec 2021 05:58:28 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:57847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myXQ1-0003JN-Pe for guix-patches@gnu.org; Sat, 18 Dec 2021 05:58:27 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 438445C0127; Sat, 18 Dec 2021 05:58:18 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 18 Dec 2021 05:58:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h= from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=3XpOHI2eQxx1cA3Y49+4N5Yvqb gtOcOYhfiuEBvzaLI=; b=S9zS48GlLrg3DXl1WNCWR5esyYi85uOvNa4wwttqQT jysBSApYAu7hyZqV/8XqanbPt1OznfAzNsfYAuRCj70ZIMTc07RlttLtTpzhASa8 btXYQdRMv4u30qS34KqfRVy2nEYvoHWBdSILCuQhkowHfmSXSbctc2yHzP1fW7pc 5P5kg/X7Va9h8aY9pi6rYFp20c8vEeKdxbxG2CZFDi3+63GuqmxJ39MM8I3u8xj8 uDaM5sHGpGjA12pI6vdcEuoRCh8zomPTOYkwnvBLCGUjmTmE4GOZgIGVaFn6URQX /pOCWL3VABBHJr5wLdPBw3Aye+ZrGTbffpmJqIL80Pww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=3XpOHI 2eQxx1cA3Y49+4N5YvqbgtOcOYhfiuEBvzaLI=; b=DLCIYqEaMp8XudE+mSE0WX VHcQTeXjOWTzJMro4hNVhhxfQVYDxIEN5qVPnhifBfQYcrpbD92sfPf1X37YejEe xw12vYf5CaeNd3yqC+8bi+7mEVcYi1W3dBcb3QQxXLqZMdi574piyuT70dAP2GBc g0eXor8fyUrBjMISdDyWnePhH7D6GYfJFsczZJ9ghHveHcrusrtjyxHLMSOs2Bjl TFNegVszz6Q9J2PyRPUk6AwJ4wVhVO/q76w7njpnZ5QfxPt9tikYANiyCZiiljk3 YPNWgJoYQv4yjruWKQe/QPALBsuKIynN/AE5LnAk+qfSDufAlVQtxkyFKVR8uChQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrleekgddvvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdhtucggvggvrhcuoehrvghmtghosehr vghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvghrnhepveefudfgfeeuleevledttd etheejhfevvdeugfeukedthfdufeetkeeutdeghfeinecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprhifvhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 18 Dec 2021 05:58:17 -0500 (EST) From: Remco van 't Veer Date: Sat, 18 Dec 2021 11:58:04 +0100 Message-Id: <20211218105804.10688-1-remco@remworks.net> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.28; envelope-from=rwv@fastmail.com; helo=out4-smtp.messagingengine.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 18 Dec 2021 10:52:23 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch: Commit from sssd repo * gnu/packages/sssd.scm: Add patch --- ...d-collision-with-external-nss-symbol.patch | 71 +++++++++++++++++++ gnu/packages/sssd.scm | 4 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch diff --git a/gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch b/gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch new file mode 100644 index 0000000000..9d59ae91be --- /dev/null +++ b/gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch @@ -0,0 +1,71 @@ +From fe9eeb51be06059721e873f77092b1e9ba08e6c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C5=BDidek?= +Date: Thu, 27 Feb 2020 06:50:40 +0100 +Subject: [PATCH] nss: Collision with external nss symbol +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +One of our internal static function names started +to collide with external nss symbol. Additional +sss_ suffix was added to avoid the collision. + +This is needed to unblock Fedora Rawhide's +SSSD build. + +Reviewed-by: Pavel Březina +--- + src/responder/nss/nss_cmd.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/responder/nss/nss_cmd.c b/src/responder/nss/nss_cmd.c +index 356aea1564..02706c4b94 100644 +--- a/src/responder/nss/nss_cmd.c ++++ b/src/responder/nss/nss_cmd.c +@@ -731,11 +731,13 @@ static void nss_getent_done(struct tevent_req *subreq) + talloc_free(cmd_ctx); + } + +-static void nss_setnetgrent_done(struct tevent_req *subreq); ++static void sss_nss_setnetgrent_done(struct tevent_req *subreq); + +-static errno_t nss_setnetgrent(struct cli_ctx *cli_ctx, +- enum cache_req_type type, +- nss_protocol_fill_packet_fn fill_fn) ++/* This function's name started to collide with external nss symbol, ++ * so it has additional sss_* prefix unlike other functions here. */ ++static errno_t sss_nss_setnetgrent(struct cli_ctx *cli_ctx, ++ enum cache_req_type type, ++ nss_protocol_fill_packet_fn fill_fn) + { + struct nss_ctx *nss_ctx; + struct nss_state_ctx *state_ctx; +@@ -777,7 +779,7 @@ static errno_t nss_setnetgrent(struct cli_ctx *cli_ctx, + goto done; + } + +- tevent_req_set_callback(subreq, nss_setnetgrent_done, cmd_ctx); ++ tevent_req_set_callback(subreq, sss_nss_setnetgrent_done, cmd_ctx); + + ret = EOK; + +@@ -790,7 +792,7 @@ static errno_t nss_setnetgrent(struct cli_ctx *cli_ctx, + return EOK; + } + +-static void nss_setnetgrent_done(struct tevent_req *subreq) ++static void sss_nss_setnetgrent_done(struct tevent_req *subreq) + { + struct nss_cmd_ctx *cmd_ctx; + errno_t ret; +@@ -1040,8 +1042,8 @@ static errno_t nss_cmd_initgroups_ex(struct cli_ctx *cli_ctx) + + static errno_t nss_cmd_setnetgrent(struct cli_ctx *cli_ctx) + { +- return nss_setnetgrent(cli_ctx, CACHE_REQ_NETGROUP_BY_NAME, +- nss_protocol_fill_setnetgrent); ++ return sss_nss_setnetgrent(cli_ctx, CACHE_REQ_NETGROUP_BY_NAME, ++ nss_protocol_fill_setnetgrent); + } + + static errno_t nss_cmd_getnetgrent(struct cli_ctx *cli_ctx) diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 7f7c71972a..9d254d4b3c 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Timotej Lazar +;;; Copyright © 2021 Remco van 't Veer ;;; ;;; This file is part of GNU Guix. ;;; @@ -150,7 +151,8 @@ (define-public sssd (base32 "1h6hwibaf3xa2w6qpzjiiywmfj6zkgbz4r2isf3gd0xm6vq7n6if")) (patches (search-patches "sssd-fix-samba.patch" - "sssd-system-directories.patch")))) + "sssd-system-directories.patch" + "sssd-collision-with-external-nss-symbol.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags