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 ms5.migadu.com with LMTPS id 8NC9JuNDBGTrFwAAbAwnHQ (envelope-from ) for ; Sun, 05 Mar 2023 08:25:23 +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 sKaqJuNDBGRlIgAAauVa8A (envelope-from ) for ; Sun, 05 Mar 2023 08:25:23 +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 024BD27DF3 for ; Sun, 5 Mar 2023 08:25:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYijy-0006Ha-JO; Sun, 05 Mar 2023 02:25:06 -0500 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 1pYijv-0006HF-JO for guix-patches@gnu.org; Sun, 05 Mar 2023 02:25:03 -0500 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 1pYijv-0003ty-4i for guix-patches@gnu.org; Sun, 05 Mar 2023 02:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYiju-00059V-Qe for guix-patches@gnu.org; Sun, 05 Mar 2023 02:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61270] [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: "Danny O'Brien" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Mar 2023 07:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61270 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 61263@debbugs.gnu.org, Tobias Geerinckx-Rice , 61270@debbugs.gnu.org Received: via spool by 61270-submit@debbugs.gnu.org id=B61270.167800109019773 (code B ref 61270); Sun, 05 Mar 2023 07:25:02 +0000 Received: (at 61270) by debbugs.gnu.org; 5 Mar 2023 07:24:50 +0000 Received: from localhost ([127.0.0.1]:38338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYiji-00058r-6D for submit@debbugs.gnu.org; Sun, 05 Mar 2023 02:24:50 -0500 Received: from mail-pj1-f42.google.com ([209.85.216.42]:39468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYijd-00058K-KV for 61270@debbugs.gnu.org; Sun, 05 Mar 2023 02:24:48 -0500 Received: by mail-pj1-f42.google.com with SMTP id 6-20020a17090a190600b00237c5b6ecd7so10175204pjg.4 for <61270@debbugs.gnu.org>; Sat, 04 Mar 2023 23:24:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fil.org; s=google; t=1678001079; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from:from:to :cc:subject:date:message-id:reply-to; bh=SOEmkACam44YotiRxEJ4SdpyoSptDEMLtQ9Gi62G7GM=; b=JhqohNZ5XdF3ghTESXkTthPGhq6KjncQMWDEk4PLRZ27f/yyRA2o+LDYmRQFl4p5P4 W3KPmNVlC7jrT7GpnR0xSuJ3LH/7HwINDhcys9SCzs9RAu+CnUBIXR+QPpqPWkQwExy3 uU6voRQDrKNYlcHVkk1HVoiOT4aJnmXjMNUdLg3DnmmbPM1A5OL1oB4jJftLzICgyaBP xsqLB3srxNbMG0wkhmCa49FWoqWBB0ZY9gSRY/KklBu+pD8Mb3FrN37WPAIfYZtgClg/ QzMryOeDxkwI9XbmatqOaFtj8MpsCjj/0HKa4vTzl7rmx6p3qBWbIAPm7lhgV6QIeldj QeZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678001079; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SOEmkACam44YotiRxEJ4SdpyoSptDEMLtQ9Gi62G7GM=; b=OcJvQIcObeYLgi9czm0TEfkKyS1L3mmO8O2SHNksyckFtfWmkIJK+DUlQEir1XEiVU maslTb7h+bPB4QMVZg9cY9NhchGhbQ+W3SyYOy1fBVJDakEkswCV/69EBUe3YjAnCt6z +txEzX6GlWTzNws1vZScImBO0EO7Rw9XB0prHMijD+Xjg/M1VWeyn+U3nOr+IQ+Y9xfp 6n7Dx4NOwmLBa3VGCgvQO0fk/uFxEjpQ14Mwf2+H0dFguajOIsVczRYrPizzexsf0bHr T+eZRGShnJ8sLTQ1guV4A8P0C0Rbn2w346BSP2a3I1pDHK4xXwC4/F6gLi9HdvcFxLud 6iWA== X-Gm-Message-State: AO0yUKUT3v1TgpTrJwbMvS/oigpwWQTa79ygO1GkLMcf+hovaG9CemEV dMuk/rHcrgKEz7IFBhGkzOVAjQ== X-Google-Smtp-Source: AK7set+M2Botl5UGYbueYayBr+mihcOhx5r5qN5u8LjsqvghXeq0+Py0dfoZKRPBh5kSMIVzOmRU0Q== X-Received: by 2002:a17:902:bd93:b0:19c:be03:d1a3 with SMTP id q19-20020a170902bd9300b0019cbe03d1a3mr6623497pls.40.1678001079402; Sat, 04 Mar 2023 23:24:39 -0800 (PST) Received: from fil.org ([2601:645:8000:54:8ab0:71b9:4c14:8c94]) by smtp.gmail.com with ESMTPSA id ik15-20020a170902ab0f00b0019a95764e68sm4233073plb.294.2023.03.04.23.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 23:24:38 -0800 (PST) X-Google-Original-From: Danny O'Brien Date: Sat, 4 Mar 2023 23:24:37 -0800 Message-ID: References: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675487305.git.danny@spesh.com> <1FBBFFA5-565C-4CD2-8744-518652E1DC53@tobias.gr> <87ttz0scag.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Zv3i4G6JqBQZTvXa" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87ttz0scag.fsf_-_@gnu.org> 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: , Reply-to: Danny O'Brien X-ACL-Warn: , Danny O'Brien via Guix-patches From: Danny O'Brien via Guix-patches via 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=1678001123; a=rsa-sha256; cv=none; b=WawjzKOM78IYsx5ENHr/YIOdjd888anhYz8zS7aPqDGeIVyuwlQ65tRtHT1zxoxScmqHCr bdYNkuXGocXzzV6V3miGrdbng4RuB30rEIY4d/ANjf+ud/oVNYPAWrwGf7rCaoxeMzcDvl yk7uKkkwyLwPGSbH9ubLDxHYksNdfTQo0G73TECsyj9HDrbiRhIqUmOudvneRwqFinaC6R SOPNTuqD6Hwz5yHioFT9Z6Pz4A7K+6aFAQDSj/8QpT14pZBW6jt88P9ZAo4S90+fvaFFfQ d45blsER3KqM/zeLSM6XYUGkFEScpLWkp8+FwCEEQK3+A2OCSwh3Z7HwE/0qUQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fil.org header.s=google header.b=JhqohNZ5; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678001123; h=from:from:sender:sender:reply-to: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-cc: 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=SOEmkACam44YotiRxEJ4SdpyoSptDEMLtQ9Gi62G7GM=; b=qB8WnaEoldkQLeNwyivLZ9us0xIRNXB3MUbEb3SmM1xw+ehUQXlUuQOXAdKAYd4/Kl4pC6 ypqDzYITyVXq/zwt0tiQOj97VIbRYL/DFyquNBVHJleqTUApohEbzJlNcxlTTjiW3tSo6Y OlPfUVCHhgnHyO4UJnNZnplZ2u/XBXgKl8VmiFIXn+Qz87yomI3Is5WN+L4K5kfsPq1MGT S+NMguCvIPOWfaMkFGXXuOl+JOysP1gmVxKnkc8SBAqxLc/93BmsnIXLw6clhLF94Qgad+ kKAqJVLJBSxLBYNH5h6SSabPouJOJEZ+vBhW4Srl9ZwfP0m9EzNlYM21LrafuQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.21 X-Spam-Score: -2.21 X-Migadu-Queue-Id: 024BD27DF3 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fil.org header.s=google header.b=JhqohNZ5; 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"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: JManNSGiiItD --Zv3i4G6JqBQZTvXa Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Courtès wrote: > Hi Danny, > > "Danny O'Brien" skribis: > > > Yep, that was all due to `guix style` — the instructions say to run it, but > > that may be different if it's just tweaking an existing hand-crafted > > package description. I'll re-submit. > > Did you get a chance to look into it? We’re close to the finish line! > > TIA, > Ludo’. Let's try this: >From a235a39729579a7b0f49326fcfc6f5a291074b01 Mon Sep 17 00:00:00 2001 Message-Id: From: Danny O'Brien Date: Sat, 4 Mar 2023 23:09:27 -0800 Subject: [PATCH] gnu: dbacl: Fix failing check phase. * gnu/packages/textutils.scm (dbacl): New patch. * gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../dbacl-icheck-multiple-definitions.patch | 33 +++++++++++++++++++ gnu/packages/textutils.scm | 3 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.patch diff --git a/gnu/local.mk b/gnu/local.mk index 415955bd3f..dfd0448502 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1027,6 +1027,7 @@ dist_patch_DATA = \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ + %D%/packages/patches/dbacl-icheck-multiple-definitions.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch new file mode 100644 index 0000000000..e82d0819bb --- /dev/null +++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch @@ -0,0 +1,33 @@ +From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001 +From: Danny O'Brien +Date: Fri, 3 Feb 2023 16:48:59 -0800 +Subject: [PATCH] Fix failing build of icheck. + +Building icheck fails with a duplicate symbol definition +error. This allows the icheck executable to compile. + +Submitted upstream[1] but not yet moderated/accepted. + +[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/ + +--- + src/icheck.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/icheck.c b/src/icheck.c +index efbb6a5..12a3b7a 100644 +--- a/src/icheck.c ++++ b/src/icheck.c +@@ -39,9 +39,6 @@ extern regex_count_t regex_count; + extern empirical_t empirical; + + extern int cmd; +-char *progname = "icheck"; +-char *inputfile = ""; +-long inputline = 0; + + extern long system_pagesize; + extern void *in_iobuf; +-- +2.39.1 + 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 © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 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-icheck-multiple-definitions.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags -- 2.39.1 --Zv3i4G6JqBQZTvXa Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-dbacl-Fix-failing-check-phase.patch" Content-Transfer-Encoding: 8bit >From a235a39729579a7b0f49326fcfc6f5a291074b01 Mon Sep 17 00:00:00 2001 Message-Id: From: Danny O'Brien Date: Sat, 4 Mar 2023 23:09:27 -0800 Subject: [PATCH] gnu: dbacl: Fix failing check phase. * gnu/packages/textutils.scm (dbacl): New patch. * gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../dbacl-icheck-multiple-definitions.patch | 33 +++++++++++++++++++ gnu/packages/textutils.scm | 3 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.patch diff --git a/gnu/local.mk b/gnu/local.mk index 415955bd3f..dfd0448502 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1027,6 +1027,7 @@ dist_patch_DATA = \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ + %D%/packages/patches/dbacl-icheck-multiple-definitions.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch new file mode 100644 index 0000000000..e82d0819bb --- /dev/null +++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch @@ -0,0 +1,33 @@ +From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001 +From: Danny O'Brien +Date: Fri, 3 Feb 2023 16:48:59 -0800 +Subject: [PATCH] Fix failing build of icheck. + +Building icheck fails with a duplicate symbol definition +error. This allows the icheck executable to compile. + +Submitted upstream[1] but not yet moderated/accepted. + +[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/ + +--- + src/icheck.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/icheck.c b/src/icheck.c +index efbb6a5..12a3b7a 100644 +--- a/src/icheck.c ++++ b/src/icheck.c +@@ -39,9 +39,6 @@ extern regex_count_t regex_count; + extern empirical_t empirical; + + extern int cmd; +-char *progname = "icheck"; +-char *inputfile = ""; +-long inputline = 0; + + extern long system_pagesize; + extern void *in_iobuf; +-- +2.39.1 + 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 © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 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-icheck-multiple-definitions.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags -- 2.39.1 --Zv3i4G6JqBQZTvXa--