From unknown Tue Aug 19 05:11:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61270] [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: danny@fil.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Feb 2023 07:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61270 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61270@debbugs.gnu.org Cc: Danny O'Brien X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167549680625270 (code B ref -1); Sat, 04 Feb 2023 07:47:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2023 07:46:46 +0000 Received: from localhost ([127.0.0.1]:40551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pODFv-0006ZJ-2k for submit@debbugs.gnu.org; Sat, 04 Feb 2023 02:46:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:40610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pO9Rk-0007Oq-Bx for submit@debbugs.gnu.org; Fri, 03 Feb 2023 22:42:39 -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 1pO9Rk-0005G2-3u for guix-patches@gnu.org; Fri, 03 Feb 2023 22:42:36 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pO9Rh-0005qz-QX for guix-patches@gnu.org; Fri, 03 Feb 2023 22:42:35 -0500 Received: by mail-pl1-x62d.google.com with SMTP id b5so7171055plz.5 for ; Fri, 03 Feb 2023 19:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fil.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/dfNG8R+9MFbCbFrA8m1rqeYr1D61/k2TyZIq4IsN9k=; b=FIPWwZWat1Ii2pTMhOAMtay1oJ5hCWtQ5ItLs03rDrXlUiIgrXPdaeIxJdKU0gsiGD kSQ0PywOHst3+qaXnsmz1q7/rYfj4YO4Vr/1Icrsax274EokAU10LnqTTAK8ft1Xk6Au Jlp1VivAfqJCmK3VfB02aR33B+6A2zHt/8NUKzZURLrCuEfm5lgy7jAWiS0kx5Xbdi+X c2hpa/BZybE24u8s9/2bB1K3bIiLj5bt/qrkL8mXajvzSXlHrqe/CpDwsu8TxKXpP6Gn DFCWV1gy1pDv0NaCxBRHnLgMgMMluLIPLxo2NfLxb/bE4iPtiMpUMvafJVoNL29q6hs7 g2uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/dfNG8R+9MFbCbFrA8m1rqeYr1D61/k2TyZIq4IsN9k=; b=J5ltmnASWuyw0h8Ae4h/zn6u3U+RXD16bRzrSVvJF+YJwu5ASiulzWp1ckbGOKwib9 BRgx6UPSN3sP4IJtWqMsJBf7yUsMx9QgF3mwyHSEcRCJV1ZYvAGX80zcOwBnyw+/3V+u ie1E6cGPizcRebCx7PeX2YeeLNDkjtdsmwum74D9ZC4Q1OvPcgO8Gr/hYpk2LJW3/GHQ wkA9ehjbVBc0wmfz95JbSTgAXcL77ur5QgkyYb5JciF7Jt57E017FMtvp/EtGu3eyXWg ZqlNSyrUpWz3RoCm7xrC4I5RjH5m8AXJkU5+03F7tt9Bzax3J9pOsYUuOHElb1BNZa75 xlPw== X-Gm-Message-State: AO0yUKW2vrxsLKblRDTsWkZOfwHoeOf05tMBCrzPmkiSprs2lCOkQKbt TRjw3gkDnZb16hXGD7RXJjXL9JKqlRwCaq5G X-Google-Smtp-Source: AK7set+cTyoN6n226KmLm9z7JrvWf/w2bOnVpnimt4V9Gys7w/oLuW2/SOJfl/geAuQUHISXTXPNVQ== X-Received: by 2002:a17:902:dac8:b0:196:59a0:bffe with SMTP id q8-20020a170902dac800b0019659a0bffemr15737812plx.17.1675482151174; Fri, 03 Feb 2023 19:42:31 -0800 (PST) Received: from fil.org ([2601:645:8000:d359:7f6b:6157:dd65:fada]) by smtp.gmail.com with ESMTPSA id q16-20020a170902edd000b001966308ca0dsm2375065plk.167.2023.02.03.19.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 19:42:30 -0800 (PST) From: danny@fil.org X-Google-Original-From: danny@spesh.com Date: Fri, 3 Feb 2023 19:42:18 -0800 Message-Id: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675482130.git.danny@spesh.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=danny@fil.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Mailman-Approved-At: Sat, 04 Feb 2023 02:46:33 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) From: Danny O'Brien * gnu/packages/textutils.scm (dbacl): New patch. * gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file. --- .../dbacl-icheck-multiple-definitions.patch | 33 +++++ gnu/packages/textutils.scm | 114 +++++++++--------- 2 files changed, 92 insertions(+), 55 deletions(-) create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.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 151add964e..5ead8dec96 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -705,59 +705,63 @@ (define-public dbacl (package (name "dbacl") (version "1.14.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/dbacl/dbacl/" version "/" - "dbacl-" version ".tar.gz")) - (sha256 - (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz")) - (patches (search-patches "dbacl-include-locale.h.patch")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dbacl/dbacl/" + version + "/" + "dbacl-" + version + ".tar.gz")) + (sha256 + (base32 + "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz")) + (patches (search-patches "dbacl-include-locale.h.patch" + "dbacl-icheck-multiple-definitions.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list - (string-append "-I" (assoc-ref %build-inputs "slang") - "/include/slang") - (string-append "-I" (assoc-ref %build-inputs "ncurses") - "/include/ncurses")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-sample6-and-japanese - (lambda _ - (substitute* "doc/Makefile.am" - (("sample6.txt") "") - (("japanese.txt") "")) - (delete-file "doc/sample6.txt") - (delete-file "doc/japanese.txt") - (substitute* (list "src/tests/Makefile.am" - "src/tests/Makefile.in") - (("dbacl-jap.shin") "") - (("dbacl-jap.sh") "")) - #t)) - (add-after 'unpack 'delete-test - ;; See comments about the license. - (lambda _ - (delete-file "src/tests/dbacl-jap.shin") - #t)) - (add-after 'unpack 'fix-test-files - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (substitute* (find-files "src/tests/" "\\.shin$") - (("PATH=/bin:/usr/bin") - "#PATH=/bin:/usr/bin") - (("diff") (string-append (which "diff"))) - (("tr") (string-append (which "tr")))) - #t))) - (replace 'bootstrap - (lambda _ - (invoke "autoreconf" "-vif") - #t))))) - (inputs - (list ncurses perl readline slang)) - (native-inputs - (list libtool autoconf automake pkg-config)) + `(#:make-flags (list (string-append "-I" + (assoc-ref %build-inputs "slang") + "/include/slang") + (string-append "-I" + (assoc-ref %build-inputs "ncurses") + "/include/ncurses")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-sample6-and-japanese + (lambda _ + (substitute* "doc/Makefile.am" + (("sample6.txt") + "") + (("japanese.txt") + "")) + (delete-file "doc/sample6.txt") + (delete-file "doc/japanese.txt") + (substitute* (list "src/tests/Makefile.am" + "src/tests/Makefile.in") + (("dbacl-jap.shin") + "") + (("dbacl-jap.sh") + "")) #t)) + (add-after 'unpack 'delete-test + ;; See comments about the license. + (lambda _ + (delete-file "src/tests/dbacl-jap.shin") #t)) + (add-after 'unpack 'fix-test-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* (find-files "src/tests/" "\\.shin$") + (("PATH=/bin:/usr/bin") + "#PATH=/bin:/usr/bin") + (("diff") + (string-append (which "diff"))) + (("tr") + (string-append (which "tr")))) #t))) + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif") #t))))) + (inputs (list ncurses perl readline slang)) + (native-inputs (list libtool autoconf automake pkg-config)) (home-page "https://www.lbreyer.com/dbacl.html") (synopsis "Bayesian text and email classifier") (description @@ -768,13 +772,13 @@ (define-public dbacl ;; The software is licensed as GPLv3 or later, but ;; includes various sample texts in the doc dir: ;; - sample1.txt, sample3 and sampe5.txt are in the public domain, - ;; by Mark Twain. + ;; by Mark Twain. ;; - sample2.txt, sample4.txt are in the public domain, by Aristotle. ;; - sample6.txt is a forwarded email, copyright unknown. - ;; Guix does exclude sample6.txt. + ;; Guix does exclude sample6.txt. ;; - japanese.txt is a Japanese unoffical translation of the - ;; GNU General Public License, (c) by the Free Software Foundation. - ;; Guix excludes this file. + ;; GNU General Public License, (c) by the Free Software Foundation. + ;; Guix excludes this file. (license (list license:gpl3+ license:public-domain)))) (define-public dotconf base-commit: c3e50c731d8c175133cae1869e445cbb7a3b4d6f -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 04 04:47:26 2023 Received: (at control) by debbugs.gnu.org; 4 Feb 2023 09:47:26 +0000 Received: from localhost ([127.0.0.1]:40701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOF8o-00063H-Dj for submit@debbugs.gnu.org; Sat, 04 Feb 2023 04:47:26 -0500 Received: from tobias.gr ([80.241.217.52]:43088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOF8n-000639-0U for control@debbugs.gnu.org; Sat, 04 Feb 2023 04:47:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=9rf+ZZYlLS6nd CdYVZuE6912E4qN4ZZ4NZjvWNZtkAI=; h=subject:to:from:date; d=tobias.gr; b=Ma+LtP7j5hzg2qyA0A8W3JyDjX7YatHOXp5TRQ2U9aOkOPZ6xO/MBO7/Wb9LGI+JzIYK 9hIKSiwy4K9HaIXeHw3sRYjT37JPJrj8lCPNGaqxAR5T0bztyIxFbchPOLzkV4pBD3hmOy ij6byut2JgZFa9ZoxWBiHylCxFrqHM0C2C+iv6NTDDokQubrb/0VAKtuQzdhhXSsGFkq0V XwexTviT2b/K6jURkIu9i4AAFktz1Wk2tIfLM0Xlo8fgBxibGBOmIesa4DAs0rYYk3NhJf BrnUP+nubBIvTyEKRBF/6vNldhqN9kPAl4LeCaZeWQ2Lz12g6ZX8ucOo7rCVzkEA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 7c78c65e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 4 Feb 2023 09:47:17 +0000 (UTC) Date: Sat, 04 Feb 2023 09:47:14 +0000 From: Tobias Geerinckx-Rice To: control@debbugs.gnu.org Subject: Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Autocrypt: addr=me@tobias.gr; prefer-encrypt=mutual; keydata= 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 XfzK2oNjknx1QApyTPvh X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 61263 61270 thanks Kind regards, T G-R Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) merge 61263 61270 thanks Kind regards, T G-R Sent on the go=2E Excuse or enjoy my brevity=2E From unknown Tue Aug 19 05:11:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61270] [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 16:38: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: "Danny O'Brien" Cc: 61263@debbugs.gnu.org, Tobias Geerinckx-Rice , 61270@debbugs.gnu.org Received: via spool by 61270-submit@debbugs.gnu.org id=B61270.167794785721223 (code B ref 61270); Sat, 04 Mar 2023 16:38:02 +0000 Received: (at 61270) by debbugs.gnu.org; 4 Mar 2023 16:37:37 +0000 Received: from localhost ([127.0.0.1]:37531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYUt7-0005W9-BG for submit@debbugs.gnu.org; Sat, 04 Mar 2023 11:37:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYUt5-0005Vo-B2; Sat, 04 Mar 2023 11:37:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYUsz-0002MH-RB; Sat, 04 Mar 2023 11:37:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=hARbPuoP8UZA1cpWqIUJ+xdE5gOxt4fNASxj4wljVW0=; b=S/AsUad5whnNNpSh+xnK qHDH3qM+MQWu+kfDE6/5vSn5hEIZC+tMDD90kAKvAzS6MjF8fXSZr1MKjuRKdCPkfwR5pCH6yE1wO sJZW1J1FC1C3dinhdYDwhmIXmbEhBl8JDtL1yID2E94hrlXlY9UVSzf9sbKn7O0/oI+Mp8+sOdN/m TLUJidJAXjf7G6yC8GN6aic01rmiLvRNgp7o43Evm5OMOoILxve9vWl0pQT4B++7+petObGDXRd46 J3jCI4Eql2PQ7K7SFIwySKkZXwwwnQn2HtGY3hmbcDht4TOAGT695GkSPVFJGg0g/4ntG90PxX8DE 3Bz5bnLUFgDQ5w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYUsy-00012z-Lv; Sat, 04 Mar 2023 11:37:29 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675487305.git.danny@spesh.com> <1FBBFFA5-565C-4CD2-8744-518652E1DC53@tobias.gr> Date: Sat, 04 Mar 2023 17:37:27 +0100 In-Reply-To: (Danny O'Brien's message of "Sat, 4 Feb 2023 23:53:29 -0500") Message-ID: <87ttz0scag.fsf_-_@gnu.org> 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-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Danny, "Danny O'Brien" skribis: > Yep, that was all due to `guix style` =E2=80=94 the instructions say to r= un 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=E2=80=99re close to the finish li= ne! TIA, Ludo=E2=80=99. From unknown Tue Aug 19 05:11:41 2025 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) From: "Danny O'Brien" 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --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-- From unknown Tue Aug 19 05:11:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61270] [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 02:14:03 +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: "Danny O'Brien" Cc: Tobias Geerinckx-Rice , Ludovic =?UTF-8?Q?Court=C3=A8s?= , 61263-done@debbugs.gnu.org, 61270-done@debbugs.gnu.org Received: via spool by 61270-done@debbugs.gnu.org id=D61270.167945121127728 (code D ref 61270); Wed, 22 Mar 2023 02:14:03 +0000 Received: (at 61270-done) by debbugs.gnu.org; 22 Mar 2023 02:13:31 +0000 Received: from localhost ([127.0.0.1]:33077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1penyl-0007D9-16 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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