Ian Eure <ian@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 77789) by debbugs.gnu.org; 14 Apr 2025 14:45:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 14 10:45:12 2025
Received: from localhost ([127.0.0.1]:48462 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u4L3f-0000EC-IS
for submit <at> debbugs.gnu.org; Mon, 14 Apr 2025 10:45:12 -0400
Received: from fout-a1-smtp.messagingengine.com ([103.168.172.144]:55401)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ian@HIDDEN>) id 1u4L3c-00008P-6G
for 77789 <at> debbugs.gnu.org; Mon, 14 Apr 2025 10:45:09 -0400
Received: from phl-compute-07.internal (phl-compute-07.phl.internal
[10.202.2.47])
by mailfout.phl.internal (Postfix) with ESMTP id 9EA05138020E;
Mon, 14 Apr 2025 10:45:02 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
by phl-compute-07.internal (MEProxy); Mon, 14 Apr 2025 10:45:02 -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:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to; s=fm1; t=1744641902;
x=1744728302; bh=R5QvxLPCcs6miRsyoItanRyE/jw5vVVsuSPNZizKU8A=; b=
iEOylpUzbKoMQWUjrjcN5xDc5HKMAQWFvdUM9TuUtfh76sjUJjFNwEe3mY6MEPUG
OBluYlaPYab7QBubl5Kp7gZ6gXt/lAeOA5E7HvYdkj9GC6Z7YDoolV4wmz5ECncO
GqqCwimI5KIqWSZvh7AHyDB737rR189y6XaQaK/gk7CRs9Cx691M/UwykhX0IJmm
0JQwFJAU+hq07dO8zGtT1Tp9oDunM2/g6U8m+qqz1ddd1UjmiQIcBTFBz+WyZQbP
GKzbmuignHuPRkqkxu79oULxTwqfgQXg+DSBu3iyxofqfJhfn4X9H82Y7wSUVFe9
1pBjetAfzwuEBbKjWjRiAQ==
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:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to:x-me-proxy
:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744641902; x=
1744728302; bh=R5QvxLPCcs6miRsyoItanRyE/jw5vVVsuSPNZizKU8A=; b=C
+El2pCMIE17yoCwaJ15bPOdTmIEAz4Fie7GJujSPvJ0IRu9wwkZRwUaBZiyMFJCW
SLh3tt9XAeHPrkthFmG2+qxDFGtXlih9ahc0CI/BQb2+6oSvv9hSzJC5s/YFBBBK
Jm01Nubw+uaTIlF8DDcFsS9c3Z51SG2t/4aH8KTGNdqQX8jLtw3E2KhaXXrTeOGg
47+oU11A6M3CcM6YSUHt3i3y8FM+wlrsbGs3g4bWGE5GMWHNtPluzzCXmy52lX/U
v/IPXPAYnd8+va1EwkuZrOQdUBALeww3zPuuj3JgMhyZSmfOLfIu1jGwh9bzL5Pj
VqmuHdU4xmWyKFDEcdbBg==
X-ME-Sender: <xms:bh_9Z0jPVz8XbuhMPTz9hsvHTRMBMqBO6lGzjx5q6vDE9xrUCJ6DYg>
<xme:bh_9Z9AN9KrUelYhgKsClWEpGcV54MvFXAg7CW-rCVgkJUgWrbixoACll0usKvNvv
XEbLvhGDPIaxaRD2g>
X-ME-Received: <xmr:bh_9Z8EZcyHFR3mtYY6NaI2-5DQSe23FyTj5iwk56R0CcXbm6OmBZB-w4W3Qs9KWiKqpLZdJ8OKn4F8GrbDAYbaHeW4HwQMWNUE>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvvddtkedvucetufdoteggodetrf
dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih
gvnhhtshculddquddttddmnecujfgurhephffvvefujghffgffkfggtgfgsehtqhertddt
reejnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvh
eqnecuggftrfgrthhtvghrnhepuefgheekkefhvddtueffkeevffeludegtedvtedvtdek
veekgffhkeevfeejieehnecuffhomhgrihhnpehsshhsugdrihhonecuvehluhhsthgvrh
fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgv
tgdrthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtth
hopeejjeejkeelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepmhgrgihi
mhdrtghouhhrnhhohigvrhesghhmrghilhdrtghomh
X-ME-Proxy: <xmx:bh_9Z1TJ9AeSSxp6IPWg308ti2PBpZGRKvYfTYosDkDNgwIkpHd86g>
<xmx:bh_9Zxz1zv2cjMkyICci0QAtz1lSNTk6q392rRhtcjzmm7cqGarZjQ>
<xmx:bh_9Zz4hDMDX-lqzdM3XJ1xiDySauWNg1xGcx5fMKqAml810hDa1jQ>
<xmx:bh_9Z-xszYbPbK2g7oGRjxJ1SkdD52bnJNQARyKl4SggiJSPjBLAsA>
<xmx:bh_9Z3IOVv8_5kArlpp0axW6dj_n7bYRmNomIP_T0xTYo-LkoLuW9xQy>
Feedback-ID: id9014242:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
14 Apr 2025 10:45:01 -0400 (EDT)
From: Ian Eure <ian@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#77789] [PATCH] gnu: sssd: Update to 2.9.6.
In-Reply-To: <87h62rutqm.fsf@HIDDEN> (Maxim Cournoyer's message of "Mon, 14
Apr 2025 15:45:05 +0900")
References: <20250414014244.20425-1-ian@HIDDEN>
<87h62rutqm.fsf@HIDDEN>
User-Agent: mu4e 1.12.9; emacs 29.4
Date: Mon, 14 Apr 2025 07:45:00 -0700
Message-ID: <87bjsydcpf.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 77789
Cc: 77789 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes:
> Hi,
>
> Ian Eure <ian@HIDDEN> writes:
>
>> This package has been broken since Samba was updated from=20
>> 4.17.x to 4.18.x in
>> 744e973de361fed498cdcf9725fe36aef3d7a73d. This patch updates=20
>> sssd to 2.9.6
>> and fixes the build.
>
> Thanks.
>
>> * gnu/packages/sssd.scm (sssd): Update to 2.9.6.
>> [#:configure-flags]: Point to docbook catalog.
>> [#:phases 'patch-samba-pkgconfig]: Correct library path.
>> [#:phases =E2=80=98disable-active-directory-tests]: Disable tests that=20
>> require AD
>> running in a VM.
>> [#:inputs]: Update docbook-xml to 4.5.
>>
>> Change-Id: I13effcd34995e2e9c7fdc6d95d0fa2e35cf15bae
>> ---
>> 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=20
>> "11qchs59f8y8w5ns9mqg16nrv1kglfavzvqway0aj2z6ssfxk5al"))
>> + (base32=20
>> "056l6b067bc5yi3dvlv41kg1a5hl3j3fq2xll3yfwwz4phcx8qd9"))
>> (patches (search-patches=20
>> "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=3D"
>> #$output "/lib/ldb/modules/ldb")
>> + ;; Upstream defaults to /etc/xml/catalog, and=20
>> despite the "path"
>> + ;; name, only expects one file -- so we can't=20
>> use
>> + ;; $XML_CATALOG_FILES, which has docbook-xml and=20
>> docbook-xsl
>> + ;; entries.
>> (string-append "--with-xml-catalog-path=3D"
>> #$(this-package-native-input=20
>> "docbook-xml")
>> - "/xml/dtd/docbook/catalog.xml"))
>> + "/xml/docbook/"
>> + #$(package-version=20
>> (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=20
>> puts things in lib/
>> + ;; Patch the path before we autoreconf.
>> + (add-before 'bootstrap 'patch-samba-pkgconfig
>> + (lambda _
>> + (substitute* '("src/external/samba.m4")
>> + (("(sambalibdir=3D.*/)samba" _ prefix)
>> + prefix))))
>
> Ah, it seems this is caused by the use of '--libdir' in Samba.=20
> If this
> breaks common expectation, perhaps we should revert that bit and=20
> find a
> better fix for the samba build system not linking correctly to=20
> its
> own libraries (thus missing RPATH entries, IIUC).
It=E2=80=99s a bit more complicated than that. The version in master=20
(2.9.4) finds the Samba libs okay, but fails on the Active=20
Directory tests, which require AD running in a VM to work[1]. I=E2=80=99m=
=20
not sure exatly what happened here, but I suspect the AD tests=20
have some conditionality which prevented them from running on=20
Samba 4.17, so we never saw those failures.
On sssd 2.9.5 or 2.9.6, the `configure' phase can=E2=80=99t find the Samba=
=20
libs without the fix I added. After addressing that, they suffer=20
from the same failing AD tests, so I disabled those, based on what=20
I read in the sssd developer docs.
I also have a patch to update to 2.10.2 (the latest), and it=20
builds, but it likely needs more work. Its install tries to=20
create an additional directory in /var, I pointed this at the=20
package output, but suspect it wants to write stuff into it, which=20
isn=E2=80=99t going to work. I opted for 2.9.6 because that seems safer;=20
happy to share the 2.10.2 WIP patch if you=E2=80=99d like to finish that=20
update.
> Otherwise feel free to push!
I=E2=80=99ll push a bit later today, but this definitely isn=E2=80=99t eith=
er/or,=20
if we have leverage to make consumers of Samba libs work better,=20
that ought to get pursued. I might be wrong, but I assume other=20
packages which depend on Samba libs would need similar changes.
Thanks,
-- Ian
[1]: https://tests.sssd.io/en/latest/running-tests.html
guix-patches@HIDDEN:bug#77789; Package guix-patches.
Full text available.
Received: (at 77789) by debbugs.gnu.org; 14 Apr 2025 06:45:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 14 02:45:36 2025
Received: from localhost ([127.0.0.1]:45455 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u4DZY-0004zA-6P
for submit <at> debbugs.gnu.org; Mon, 14 Apr 2025 02:45:36 -0400
Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:58534)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1u4DZU-0004d3-MN
for 77789 <at> debbugs.gnu.org; Mon, 14 Apr 2025 02:45:33 -0400
Received: by mail-pl1-x630.google.com with SMTP id
d9443c01a7336-2264aefc45dso57032885ad.0
for <77789 <at> debbugs.gnu.org>; Sun, 13 Apr 2025 23:45:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744613125; x=1745217925; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=uzrJcrLp+Ukhe2XBWFpiKE7hSjfBPKez8ibFdlrybhc=;
b=cSpVp6Xqj+RA/gZ/JZW4IIY5BZhGbNuY8SHUGJcbco1ossWS9D/j6GTgv231VwEpmu
zPbfshABAzRMv5B3mn+9ZZPbPktvuSGHZVlSxtnJbE5koNz3cxhYFLp9XsRIgL6q4IVh
06AYWdxbO8N2HfCWuaHnySvbLHSXoQj9hxnA6Mv6a1CTfLRj+RS6zqmovVkN+vpHUeNW
vWe6oKQNoJVut2JE4Bc6Dd9OpK3WyTdawcwov01vAxr8LzbFAXZeOvRPU8DRvTB8DmzO
lGxWn5RW62RbOKSkJ+8HT9P7xeML7hp4nN3G4pEqri/OVtnW8i9KI/bDyYvt8FIr+Xlr
0PtA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744613125; x=1745217925;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:x-gm-message-state:from
:to:cc:subject:date:message-id:reply-to;
bh=uzrJcrLp+Ukhe2XBWFpiKE7hSjfBPKez8ibFdlrybhc=;
b=pkX5K2KeR4oyV8YFe/Vo8vVQRVuUu4PFhw3Mu8DcU5ra6xlg6y5ZC8tKEmDEL5/IWo
VjXy2lJJbdWwl/pN8X5r29N855dhu4MyDswTWvL7EIQKFlVcYXEa/WhOJquxr1JO6LhX
kHXuqqBnR1+3rfZ0lrTSX4Xa+ETZJmdCsFb/3DQtPCvKfnlaz649tgSjZ+6S1cGvvcZ/
odJrj80BDCvMEu/+7XaJ7bi5JqPgI5O/sQcRNmYmy35v4IJ+YjiqA7+ai9LpJNwFf8xy
fSgdEQl58Y3zJ9RvvlWAnkTJTGJhJ1Rl+Bfq00b8qgumJHhbL1cly+qjtKESKOIPlzEa
ZQZw==
X-Gm-Message-State: AOJu0YwShMDIlc68svuVRJITrlI7dqJ07Bj++oMBRbo8x/EQYeE2FbMZ
py5NVNEm438Owk7+XPF4xD+7I7V6Z/fK0pa6Emocmp0CnIftteFpW3DsXIPO
X-Gm-Gg: ASbGncv8aZmVU7yQEqVrVsUt4Ynctk54+xT67+TaKDPU6sKIfOv1wrWFEzwyOH5kyn7
zgkGj4hw2LsNJqq3jAuBe5DRNUep9Jy4cC0B1aAnaWZkQWZgV2Nt3Fsu4e9Epr1a8w686hTfwim
zSO4eA3+dFdx6dGZOxrbirdrlrlhKhfPgzAvzBsEtRFW34blxosYGtv+iZHRBmUBZwvkcPDowrg
pnteSv3GIhOIWklBL1h5Ey5WPNqSQxtdlVJxvc4TQeUMZmXq1culxwHvlQfgfIVEqo8o7EHwhVB
ArhDsWKn2HqbSdFtCJGjAQ0XLAsdDCBqP//YnDM=
X-Google-Smtp-Source: AGHT+IHTBVJRbIwjKLb+OjRA9FVuYlrkIuFBiy0QS6lSFgHyyqilVMOBNEl0y1aUDCRaSnFE4bn2xg==
X-Received: by 2002:a17:902:ebc1:b0:224:13a4:d61e with SMTP id
d9443c01a7336-22bea4fea1emr164833835ad.51.1744613125372;
Sun, 13 Apr 2025 23:45:25 -0700 (PDT)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22ac7c9c59dsm92010005ad.151.2025.04.13.23.45.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 13 Apr 2025 23:45:24 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ian Eure <ian@HIDDEN>
Subject: Re: [bug#77789] [PATCH] gnu: sssd: Update to 2.9.6.
In-Reply-To: <20250414014244.20425-1-ian@HIDDEN> (Ian Eure's message of
"Sun, 13 Apr 2025 18:42:44 -0700")
References: <20250414014244.20425-1-ian@HIDDEN>
Date: Mon, 14 Apr 2025 15:45:05 +0900
Message-ID: <87h62rutqm.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 77789
Cc: 77789 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Ian Eure <ian@HIDDEN> writes:
> 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.
Thanks.
> * gnu/packages/sssd.scm (sssd): Update to 2.9.6.
> [#:configure-flags]: Point to docbook catalog.
> [#:phases 'patch-samba-pkgconfig]: Correct library path.
> [#:phases =E2=80=98disable-active-directory-tests]: Disable tests that re=
quire AD
> running in a VM.
> [#:inputs]: Update docbook-xml to 4.5.
>
> Change-Id: I13effcd34995e2e9c7fdc6d95d0fa2e35cf15bae
> ---
> 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=3D"
> #$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-x=
sl
> + ;; entries.
> (string-append "--with-xml-catalog-path=3D"
> #$(this-package-native-input "docbook-xml")
> - "/xml/dtd/docbook/catalog.xml"))
> + "/xml/docbook/"
> + #$(package-version (this-package-native-inp=
ut "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 i=
n lib/
> + ;; Patch the path before we autoreconf.
> + (add-before 'bootstrap 'patch-samba-pkgconfig
> + (lambda _
> + (substitute* '("src/external/samba.m4")
> + (("(sambalibdir=3D.*/)samba" _ prefix)
> + prefix))))
Ah, it seems this is caused by the use of '--libdir' in Samba. If this
breaks common expectation, perhaps we should revert that bit and find a
better fix for the samba build system not linking correctly to its
own libraries (thus missing RPATH entries, IIUC).
Otherwise feel free to push!
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#77789; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 14 Apr 2025 01:43:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 13 21:43:15 2025
Received: from localhost ([127.0.0.1]:44739 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u48qw-0000uw-SH
for submit <at> 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 <ian@HIDDEN>) id 1u48qt-0000uc-Qp
for submit <at> 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 <ian@HIDDEN>) id 1u48qo-00046a-7H
for guix-patches@HIDDEN; 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 <ian@HIDDEN>) id 1u48qm-0005aZ-3r
for guix-patches@HIDDEN; 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: <xms:JWj8Z-nIZ2-vbRdCtETxvdM20VtcpmELD6l8cBoFU_OwHPwlOtKDLw>
<xme:JWj8Z139czq-XiG4seV7NrW5nXLGJiufuf98nftK5kbs2mD329wYkPPFOGVJGSyU-
TcorCCfddg6YnyTgQ>
X-ME-Received: <xmr:JWj8Z8rGIEgnusYbcna5X4oLmimuhT6lQ1mBIvA1N8AGOV3kFkcsD4cpZQw3b7YPcf_6YfC56qNDWUL3ssLmlrwWjGqVt7OpuBB9AwG5qK_oLYus>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvudelvdeiucetufdoteggodetrf
dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf
evufffkffogggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr
nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgueekffejudfgvd
evteelteeitdeuuddufffhuefhiefhjeetuefhgfettedvteenucevlhhushhtvghrufhi
iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrd
htvhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohep
ghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvth
hrohhsphgvtgdrthhv
X-ME-Proxy: <xmx:JWj8ZymMqduesEvH2LXQISnmJljriTfMfJOEDxtdEpRdWSRrMILP6g>
<xmx:JWj8Z81HLdvefyr5kkOXykqSFGGo66qyx8i6_AxfZws9ugWcM96HoA>
<xmx:JWj8Z5tcrHg4Z-PZelCVotDjWniySL5LVSzJUjyKyKEWrIqyjOfbSg>
<xmx:JWj8Z4VBGHj_4x0aQGuM0_L28e3pk9aOM0JzMqyOD7o99IOZIv9O6Q>
<xmx:JWj8Z2Wh4eQQVL5CTVFMSHZQJEFQ_nNFKZlDQH8V-9QDaOOGqBVsI4ln>
Feedback-ID: id9014242:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
13 Apr 2025 21:43:00 -0400 (EDT)
From: Ian Eure <ian@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: sssd: Update to 2.9.6.
Date: Sun, 13 Apr 2025 18:42:44 -0700
Message-ID: <20250414014244.20425-1-ian@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=103.168.172.144; envelope-from=ian@HIDDEN;
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-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: submit
Cc: Ian Eure <ian@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)
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
---
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
--
2.49.0
Ian Eure <ian@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#77789; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.