From patchwork Mon Apr 14 01:42:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41654 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 0FFC827BC4B; Mon, 14 Apr 2025 02:44:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 84ABD27BC4A for ; Mon, 14 Apr 2025 02:44:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u48rr-0004Ax-Vv; Sun, 13 Apr 2025 21:44:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u48ri-0004AG-PA for guix-patches@gnu.org; Sun, 13 Apr 2025 21:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u48ri-0005ez-Es for guix-patches@gnu.org; Sun, 13 Apr 2025 21:44:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=ZQ8ulSomRr2TuxoONXG2zefu+0schCtMOq4sUvFKmB8=; b=IOcBb6GosYJGKZeccGVsBfW4kSz6WUeaGFXG7dqW29pcgtuHedX36c9E6Hu69jCLk0GtDLCohMaB71/pQEv1qtqdqxrTdsxZAT6x82nVvnsD7+52gMFgX9DXGNovmYaQ8qYT+yNY94Xy0x2WB57sZ8lHjRrOOVivl52Nou78TlGd+LMgDAZa+16RYPwXtIX9mYR2Ml+mX5bFF043zi/JHMr3YGXd9qSv3cRZeIrDRImsvHzqXqkNuFF59211skQnKqlIPuA0exTKjcN34/K0hCRKTpnioOYaujhoG/zeluWiJkH/Et0TIq34usLTm/8wkqlsCZvHPTag1D2nt6F8/A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u48rh-0000wd-VZ for guix-patches@gnu.org; Sun, 13 Apr 2025 21:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77789] [PATCH] gnu: sssd: Update to 2.9.6. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Apr 2025 01:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77789@debbugs.gnu.org Cc: Ian Eure X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17445949953535 (code B ref -1); Mon, 14 Apr 2025 01:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Apr 2025 01:43:15 +0000 Received: from localhost ([127.0.0.1]:44739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u48qw-0000uw-SH for submit@debbugs.gnu.org; Sun, 13 Apr 2025 21:43:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53362) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u48qt-0000uc-Qp for submit@debbugs.gnu.org; Sun, 13 Apr 2025 21:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u48qo-00046a-7H for guix-patches@gnu.org; Sun, 13 Apr 2025 21:43:06 -0400 Received: from fout-a1-smtp.messagingengine.com ([103.168.172.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u48qm-0005aZ-3r for guix-patches@gnu.org; Sun, 13 Apr 2025 21:43:05 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id A731D13801B1; Sun, 13 Apr 2025 21:43:01 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Sun, 13 Apr 2025 21:43:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1744594981; x=1744681381; bh=ZQ 8ulSomRr2TuxoONXG2zefu+0schCtMOq4sUvFKmB8=; b=LnDch1Lfz3ywsVwulL L1MEOiRBHEwtcQ820lxhM3SeUf4KwJZjXO1xlYwjKu8fO2/1g4ZTly1AfE2INlU5 M3Kxzpvyq9m8cutwhgr7RFO+eNoTzlPdF01qTjWG8QX3eBd29k5aQgFnqO3FKqmS t3SmRlbQLPSK12sr5MJwDogQSLzWe4CuSgUTt/tpQss3pSTnL2oJrDvMuklkypd1 /4Ho+JtLo7SLX6CrCtTqBzCipR43PUpmzbvQP8qUWSeL+kJzocHT6h6oQyQJokmT 4ZAG5CL/VdKbm4cSv8noqJt45/4RB4bpMR+iOFSoTM9NkyCH/VmA3W4DJLhVCVXK 3qnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1744594981; x=1744681381; bh=ZQ8ulSomRr2TuxoONXG2zefu+0sc hCtMOq4sUvFKmB8=; b=eBYmNC+25ARiVZWpuqZYISIZM+WBrCFLHJwIehAkksqu NCEYoHsdc/Ib2BNi+qJFUdDuwCMLOvoMK1gAPKsYWe7yCFj6Ia2bainUnQKi3jzL ALWWsa66u6cwTvDjoGezs/NRKdSGF6mgJk6PNOKLsI/+UACcBcSiXTGVO4kDtHSf O39SBxk2NVOnCne6NFz52nuGzlQUT42tP2LKPufua7OZgQEngXg/Ec6UNR1LD9tY vcps7Fub0I1XzPQukDdWAcumMtV1ItgmxbWCs3darmU9vZPIZ5PfL0YCYGtMFarV tmH6AOKFBQoV5p+Ndb20i2jVKbs8Gt0hP0GDNt4mGA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvudelvdeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgueekffejudfgvd evteelteeitdeuuddufffhuefhiefhjeetuefhgfettedvteenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrd htvhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohep ghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvth hrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 13 Apr 2025 21:43:00 -0400 (EDT) From: Ian Eure Date: Sun, 13 Apr 2025 18:42:44 -0700 Message-ID: <20250414014244.20425-1-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.144; envelope-from=ian@retrospec.tv; helo=fout-a1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This package has been broken since Samba was updated from 4.17.x to 4.18.x in 744e973de361fed498cdcf9725fe36aef3d7a73d. This patch updates sssd to 2.9.6 and fixes the build. * gnu/packages/sssd.scm (sssd): Update to 2.9.6. [#:configure-flags]: Point to docbook catalog. [#:phases 'patch-samba-pkgconfig]: Correct library path. [#:phases ‘disable-active-directory-tests]: Disable tests that require AD running in a VM. [#:inputs]: Update docbook-xml to 4.5. Change-Id: I13effcd34995e2e9c7fdc6d95d0fa2e35cf15bae Reviewed-by: Maxim Cournoyer --- gnu/packages/sssd.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index d0dd0c400a..20107aef8a 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -139,7 +139,7 @@ (define-public ding-libs (define-public sssd (package (name "sssd") - (version "2.9.4") + (version "2.9.6") (source (origin (method git-fetch) @@ -148,7 +148,7 @@ (define-public sssd (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11qchs59f8y8w5ns9mqg16nrv1kglfavzvqway0aj2z6ssfxk5al")) + (base32 "056l6b067bc5yi3dvlv41kg1a5hl3j3fq2xll3yfwwz4phcx8qd9")) (patches (search-patches "sssd-system-directories.patch")))) (build-system gnu-build-system) (arguments @@ -180,9 +180,15 @@ (define-public sssd #$output "/etc/init.d") (string-append "--with-ldb-lib-dir=" #$output "/lib/ldb/modules/ldb") + ;; Upstream defaults to /etc/xml/catalog, and despite the "path" + ;; name, only expects one file -- so we can't use + ;; $XML_CATALOG_FILES, which has docbook-xml and docbook-xsl + ;; entries. (string-append "--with-xml-catalog-path=" #$(this-package-native-input "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) + "/xml/docbook/" + #$(package-version (this-package-native-input "docbook-xml")) + "/catalog.xml")) #:modules '((guix build gnu-build-system) (guix build utils) ((guix build python-build-system) @@ -193,6 +199,13 @@ (define-public sssd #~(modify-phases %standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) + ;; sssd looks in lib/samba, but the Guix package puts things in lib/ + ;; Patch the path before we autoreconf. + (add-before 'bootstrap 'patch-samba-pkgconfig + (lambda _ + (substitute* '("src/external/samba.m4") + (("(sambalibdir=.*/)samba" _ prefix) + prefix)))) (add-after 'patch-source-shebangs 'patch-more-shebangs (lambda _ (substitute* '("src/tools/analyzer/sss_analyze" @@ -218,6 +231,12 @@ (define-public sssd ;; This test fails for unknown reason. (substitute* "src/tests/responder_socket_access-tests.c" (("tcase_add_test\\(tc_utils, resp_str_to_array_test\\);") "")))) + (add-before 'configure 'disable-active-directory-tests + ;; These tests require Active Directory running in a VM. + (lambda _ + (substitute* "Makefile.am" + (("ad_gpo_tests") "") + (("ad_common_tests") "")))) (add-before 'check 'set-libpython-path (lambda _ (setenv "LD_LIBRARY_PATH" @@ -286,7 +305,7 @@ (define-public sssd bc ; for tests check ; for tests cmocka ; for tests - docbook-xml-4.4 + docbook-xml-4.5 docbook-xsl doxygen gettext-minimal