From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OAzgDYNkGmRA+wAASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 03:14:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gNOoDYNkGmS2WQEAauVa8A (envelope-from ) for ; Wed, 22 Mar 2023 03:14:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 118292092A for ; Wed, 22 Mar 2023 03:14:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1penzI-0001Zl-SG; Tue, 21 Mar 2023 22:14:04 -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 1penzH-0001Z6-FZ for guix-patches@gnu.org; Tue, 21 Mar 2023 22:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1penzH-0005NR-77 for guix-patches@gnu.org; Tue, 21 Mar 2023 22:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1penzH-0007EX-27 for guix-patches@gnu.org; Tue, 21 Mar 2023 22:14:03 -0400 Subject: bug#61263: bug#61270: [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 61263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Danny O'Brien" Cc: Tobias Geerinckx-Rice , Ludovic =?UTF-8?Q?Court=C3=A8s?= , 61263-done@debbugs.gnu.org, 61270-done@debbugs.gnu.org Mail-Followup-To: 61263@debbugs.gnu.org, maxim.cournoyer@gmail.com, danny@spesh.com Received: via spool by 61263-done@debbugs.gnu.org id=D61263.167945121227736 (code D ref 61263); Wed, 22 Mar 2023 02:14:02 +0000 Received: (at 61263-done) by debbugs.gnu.org; 22 Mar 2023 02:13:32 +0000 Received: from localhost ([127.0.0.1]:33079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1penyl-0007DB-FQ for submit@debbugs.gnu.org; Tue, 21 Mar 2023 22:13:31 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:37812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1penyi-0007Cs-PO; Tue, 21 Mar 2023 22:13:29 -0400 Received: by mail-qt1-f179.google.com with SMTP id r5so21113885qtp.4; Tue, 21 Mar 2023 19:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679451203; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0fxE0hcR92OzHYHs0d/A082HoySNU+12p+qeOF2PiEo=; b=kqyZL4tKhdi5BlqBUGmlU9JaEXulj8It+PNykbBqg45rBh+HB8ghOB9yUo5KIJmesM ALR3NCVXpFDtH2uDfi4v9zVCHnCmCJt2hLQqedjoZTaxNyj4M1ZKal+2sUIs6GqeN7BX Y/w62BN1zqH+IPXTKRz/OtLAQapXC4PJ09QLGrjlTW8hbaE3CGo/iKJ5FpH3loXEuMfS qkOEtQ2EypiW66tgbsv0NTxLtMmMJ8gsLLls1FHxygkdZ8olAVY2jG7jkrFXwhhANDer xOH2jVNb8PzS4zSaAk6pu9eG5EnwPnl8+3+nNa5nbTCQugCDGsNUIj0Z+MpYHqhY30wM MlDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679451203; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0fxE0hcR92OzHYHs0d/A082HoySNU+12p+qeOF2PiEo=; b=qvj+jPymJjOscC93MZCDtRrvorh5aDz0VHkqx/VRiPnYhsBhKrlLdSmmYV4+M8VW0b QrRyJ+/5gD2cMxBKN6rMs/sYIerlRgFK3ksy09CGB2LcVhSdtWQ2ENh73QlIDNmQDEOY XVNjps1NUMhVSlgPzDyR0pKONpfn18E7JNeZsbKh9NkxoReHah05VQUeJMRbYp0XbuLd xals6BrgdMPut86VkQBd5bsVQeqEx/ENBrrg0EKNRK6g2Wg+6bSNgmZsA2JbSeQslJhL YiZdNKx8A6zFlwqutMtMrp6Dae/UDaiU40KBQWIVZoDbMI9tbqz6mN9AnLO3VglGe33p bWBw== X-Gm-Message-State: AO0yUKWPnNffu8h0/CvHPG1X891HyxhyHNkN5laC//waBibcHofjaKiE 47ivUzzHpfTagBtEdPDbZYw4M1BJ/XAWqw== X-Google-Smtp-Source: AK7set+DMPn6WMdgXQkIqDlYwb9BCKbEqvc0XbnYiOZ8TJT0P7sUPEX2E6XavzJvv97KrxAA/yXgvg== X-Received: by 2002:a05:622a:345:b0:3d7:7d5b:84b0 with SMTP id r5-20020a05622a034500b003d77d5b84b0mr3935924qtw.6.1679451203064; Tue, 21 Mar 2023 19:13:23 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id 15-20020a05620a048f00b0074636e35405sm3021548qkr.65.2023.03.21.19.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 19:13:22 -0700 (PDT) From: Maxim Cournoyer References: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675487305.git.danny@spesh.com> <1FBBFFA5-565C-4CD2-8744-518652E1DC53@tobias.gr> <87ttz0scag.fsf_-_@gnu.org> Date: Tue, 21 Mar 2023 22:13:21 -0400 In-Reply-To: (Danny O'Brien's message of "Sat, 4 Mar 2023 23:24:37 -0800") Message-ID: <87sfdxildq.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679451267; a=rsa-sha256; cv=none; b=Fya/G4fzvEn5sVAmP6UIWn5wmbkdP2WVFwbK/hkb7kufi790lzxN9GDmIQ4qQiORz+qFs+ 1rhuM9QgFvuCDJurYHvMPJieAGaXQcxYf/lWsKf/HWUPNQdcvZNSNn7cGqk6EfK9mZGqQ0 75q5JtnHshS4XS3lLuawSDOarZfidSzArDY0ITnYNwvWqKnvhigK7FYEFtwf+TLFl6l7wQ VKMWYVbwEfNoUSHZKsbnfkPTYsgO6vI1/ihjF0vpBT4m8p2tkguhhvc4CRTqcz4LZeQZBl fUjBLjZNTJxwM7w4cIChneFve5CRr0MUffKoIHfC1SItc4FPvCFNTXe323jeQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kqyZL4tK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679451267; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0fxE0hcR92OzHYHs0d/A082HoySNU+12p+qeOF2PiEo=; b=PnP8byGvaduJRr8huVplITWIgMewOpiiHwhT+sM+CmRTVxSad4W/EEWOQIXO3OUf3qzKVG bdHwA2fZBRllGy//9UxLn1xpHiPD8MHGIhaaoqBNxVQ+IKUd5bBpeO6oZOrAmcq5ApaSR6 CBySEJCZ2zK7NX0CJk/DX+txEEYL+6DNORqlc66r4tNuCOq6XIHgtWVcSRJj1E7kZ+2HTg 11PPriD2MNb8IXY80PmwqjUlYdfuyPBc34DTNrKSANcTnq4p1ecj28/sF1ZA6llYcKDNFF SEkjXmhbZkKljojshej9JBUDdFvLQsHroms6O31pp3krOUGkUQNb8yjPn/kTkg== X-Migadu-Spam-Score: 5.75 X-Spam-Score: 5.75 X-Migadu-Queue-Id: 118292092A Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kqyZL4tK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: 8vTu/19sXmYc Hi, "Danny O'Brien" writes: > On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Court=C3=A8s wrote: >> Hi Danny, >>=20 >> "Danny O'Brien" skribis: >>=20 >> > Yep, that was all due to `guix style` =E2=80=94 the instructions say t= o run it, but >> > that may be different if it's just tweaking an existing hand-crafted >> > package description. I'll re-submit. >>=20 >> Did you get a chance to look into it? We=E2=80=99re close to the finish= line! >>=20 >> TIA, >> Ludo=E2=80=99. > > Let's try this: > [...] > diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm > index e5d3a0efc0..1092f1860b 100644 > --- a/gnu/packages/textutils.scm > +++ b/gnu/packages/textutils.scm > @@ -25,6 +25,7 @@ > ;;; Copyright =C2=A9 2021 Felix Gruber > ;;; Copyright =C2=A9 2021 Bonface Munyoki Kilyungi > ;;; Copyright =C2=A9 2022 Gabriel Wicki > +;;; Copyright =C2=A9 2022 Danny O'Brien > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -711,7 +712,7 @@ (define-public dbacl > "dbacl-" version ".tar.gz")) > (sha256 > (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz")) > - (patches (search-patches "dbacl-include-locale.h.patch")))) > + (patches (search-patches "dbacl-include-locale.h.patch" "dbacl-ic= heck-multiple-definitions.patch")))) > (build-system gnu-build-system) > (arguments > `(#:make-flags I've installed this change, but dropped your copyright line, as changes smaller than 10-15 lines of new code are not subjected to copyright. --=20 Thanks, Maxim