From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 0/7] Fix maven package breakage. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: rostislav.svoboda@gmail.com, avityazew@gmail.com, liliana.prikler@gmail.com, julien@lepiller.eu, bjoern.hoefling@bjoernhoefling.de, guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 19:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal , rostislav.svoboda@gmail.com, avityazew@gmail.com, liliana.prikler@gmail.com, julien@lepiller.eu, bjoern.hoefling@bjoernhoefling.de X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: rostislav.svoboda@gmail.com, avityazew@gmail.com, liliana.prikler@gmail.com, julien@lepiller.eu, bjoern.hoefling@bjoernhoefling.de Received: via spool by submit@debbugs.gnu.org id=B.16885006591258 (code B ref -1); Tue, 04 Jul 2023 19:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2023 19:57:39 +0000 Received: from localhost ([127.0.0.1]:36643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGm9a-0000KD-VH for submit@debbugs.gnu.org; Tue, 04 Jul 2023 15:57:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:41528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGm9X-0000K2-O6 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 15:57:37 -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 1qGm9X-0002ZY-0t for guix-patches@gnu.org; Tue, 04 Jul 2023 15:57:35 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGm9V-0003qU-Ac for guix-patches@gnu.org; Tue, 04 Jul 2023 15:57:34 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id D85D221093 for ; Tue, 4 Jul 2023 21:57:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4130180099; Tue, 4 Jul 2023 21:57:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AAXL0Z3J3q7G; Tue, 4 Jul 2023 21:57:28 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B3A8380098; Tue, 4 Jul 2023 21:57:28 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:57:22 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.234; envelope-from=mirai@makinata.eu; helo=smtpm3.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.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: -2.3 (--) This patch-series fixes some maven build failures (in particular maven-settings-builder@3.0). Since sisu.sh and component.sh files are created by guix, the substitute approaches in #63094 and #64026 are unnecessary and have been reverted. Regarding #63145, it partially obsoletes some of the patches and will require a rebase. [1]: [2]: [3]: Bruno Victal (7): gnu: maven-pom: Add missing shebangs. Revert "gnu: maven-embedder: Fix build." Revert "gnu: maven-core-bootstrap: Fix build." Revert "gnu: maven-resolver-provider: Fix build." Revert "gnu: maven-model-builder: Fix build." Revert "gnu: maven-settings-builder: Fix build." Revert "gnu: maven-model-builder@3.0: Fix build." gnu/packages/maven.scm | 25 ------------------- .../maven-generate-component-xml.patch | 3 ++- .../maven-generate-javax-inject-named.patch | 3 ++- 3 files changed, 4 insertions(+), 27 deletions(-) base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4 -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 1/7] gnu: maven-pom: Add missing shebangs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008041636 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:04 +0000 Received: from localhost ([127.0.0.1]:36651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmBv-0000QJ-Ez for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:03 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmBs-0000PM-Cx for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 9CD7B20998 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 21:59:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0843080099; Tue, 4 Jul 2023 21:59:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id jY5M_fJ3JM0C; Tue, 4 Jul 2023 21:59:58 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6657980098; Tue, 4 Jul 2023 21:59:58 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:47 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) * gnu/packages/patches/maven-generate-component-xml.patch: Add missing shebang. * gnu/packages/patches/maven-generate-javax-inject-named.patch: Likewise. --- gnu/packages/patches/maven-generate-component-xml.patch | 3 ++- gnu/packages/patches/maven-generate-javax-inject-named.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/patches/maven-generate-component-xml.patch b/gnu/packages/patches/maven-generate-component-xml.patch index 6cb23c7858..289556fbef 100644 --- a/gnu/packages/patches/maven-generate-component-xml.patch +++ b/gnu/packages/patches/maven-generate-component-xml.patch @@ -17,7 +17,8 @@ new file mode 100755 index 0000000..c6748bd --- /dev/null +++ b/components.sh -@@ -0,0 +1,148 @@ +@@ -0,0 +1,149 @@ ++#!/bin/sh +## This script generates a rough plexus/components.xml file. It is meant to +## replace plexus-component-metadata as it eventually has a recursive dependency +## on itself. diff --git a/gnu/packages/patches/maven-generate-javax-inject-named.patch b/gnu/packages/patches/maven-generate-javax-inject-named.patch index b8eba5ab90..38c4565e81 100644 --- a/gnu/packages/patches/maven-generate-javax-inject-named.patch +++ b/gnu/packages/patches/maven-generate-javax-inject-named.patch @@ -13,7 +13,8 @@ new file mode 100755 index 0000000..979f373 --- /dev/null +++ b/sisu.sh -@@ -0,0 +1,12 @@ +@@ -0,0 +1,13 @@ ++#!/bin/sh +## This script generates a rough javax.inject.Named file. It is meant to +## replace sisu-maven-plugin as it eventually has a recursive dependency +## on maven. base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4 -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 2/7] Revert "gnu: maven-embedder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008121734 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:12 +0000 Received: from localhost ([127.0.0.1]:36654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmC3-0000Ru-To for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:12 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:43988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmC1-0000Rj-SK for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:11 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 20F6620EBC for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 620E980099; Tue, 4 Jul 2023 22:00:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Sitgwwpuctrj; Tue, 4 Jul 2023 22:00:04 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D9B7B80098; Tue, 4 Jul 2023 22:00:03 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:48 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit 87ba11eff1b7a1784c94c897d468ba28822b0609. --- gnu/packages/maven.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index dc25f7640e..c8767d423e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4,7 +4,6 @@ ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Artyom V. Poptsov -;;; Copyright © 2023 Aleksandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -1839,10 +1838,6 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 4/7] Revert "gnu: maven-resolver-provider: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008211763 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:21 +0000 Received: from localhost ([127.0.0.1]:36657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCD-0000SN-93 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:21 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCC-0000SC-2F for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 96D11209A8 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E72178009C; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7vA_rV8v9Cug; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5F75B8009A; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:50 +0100 Message-Id: <7b506b1cfe6c9585a3ed23e8efee72dfafc11c16.1688500745.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit 3d2ce30f6b4b505c9680369d118c2aa9f7bacff4. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 053884d901..e6cb02c744 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1509,10 +1509,6 @@ (define-public maven-resolver-provider #:tests? #f; dependency loop on maven-core (@Component RepositorySystem) #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 5/7] Revert "gnu: maven-model-builder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008251780 (code B ref 64466); Tue, 04 Jul 2023 20:01:03 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:25 +0000 Received: from localhost ([127.0.0.1]:36660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCH-0000Se-JT for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:25 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCG-0000SW-1Q for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:24 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 18479209B9 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6C8FE8009A; Tue, 4 Jul 2023 22:00:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id POPsAYwvQ0uD; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id AFA778009B; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:51 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit 04f9ac0cfaf86f9e590e0fdc62855d9c87245104. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e6cb02c744..5bbf37377f 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1410,10 +1410,6 @@ (define-public maven-model-builder (copy-recursively "src/main/resources" "build/classes") #t)) - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 6/7] Revert "gnu: maven-settings-builder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008381818 (code B ref 64466); Tue, 04 Jul 2023 20:01:03 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:36664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCT-0000TF-Sv for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:38 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCR-0000Sp-S9 for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:36 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 92265209A8 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DA5218009B; Tue, 4 Jul 2023 22:00:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ivMNZL2HqYxb; Tue, 4 Jul 2023 22:00:21 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4C7EF8009A; Tue, 4 Jul 2023 22:00:21 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:52 +0100 Message-Id: <756d3f2008069615d0ddd394d813ce13aa215a97.1688500745.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit c0a0cec87ff01ba3ee6f9baaafdb92b7ecc94489. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5bbf37377f..1a5962df36 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1365,10 +1365,6 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 7/7] Revert "gnu: maven-model-builder@3.0: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008381825 (code B ref 64466); Tue, 04 Jul 2023 20:01:04 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:36666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCU-0000TH-5M for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:38 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCS-0000T0-F6 for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:36 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id B35E220EBC for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 14B0A8009C; Tue, 4 Jul 2023 22:00:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id kNIaeUntrv0H; Tue, 4 Jul 2023 22:00:26 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8B3B08009B; Tue, 4 Jul 2023 22:00:26 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:53 +0100 Message-Id: <57c6858185fe7f6674d134645bbe235ae4ef02c2.1688500745.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit d54faf155aeeeb2aceb5cc19f141c2b8d0e0720a. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 1a5962df36..fc3a63c263 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2403,10 +2403,6 @@ (define-public maven-3.0-model-builder (substitute-keyword-arguments (package-arguments maven-model-builder) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'add-components-shebang - (lambda _ - (substitute* "components.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-components.xml (lambda _ (mkdir-p "build/classes/META-INF/plexus") -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 3/7] Revert "gnu: maven-core-bootstrap: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885012232585 (code B ref 64466); Tue, 04 Jul 2023 20:08:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:07:03 +0000 Received: from localhost ([127.0.0.1]:36677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmIh-0000fd-0e for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:07:03 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:50114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmIf-0000f9-0J for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:07:02 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 1B4CE20E32 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:06:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5E0DF80099; Tue, 4 Jul 2023 22:00:13 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zHY2QZylRCeQ; Tue, 4 Jul 2023 22:00:12 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8209A80098; Tue, 4 Jul 2023 22:00:12 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:49 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (-) This reverts commit 1a93ff9a8b0c64ccb0e365f4e5c199e0ac8b9de6. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c8767d423e..053884d901 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1603,10 +1603,6 @@ (define-public maven-core-bootstrap #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core -- 2.40.1 From unknown Sat Sep 06 02:32:24 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bruno Victal Subject: bug#64466: closed (Re: [bug#64466] [PATCH 0/7] Fix maven package breakage.) Message-ID: References: <66fb29510b676d03845063bb440a43ee54f06ebf.camel@gmail.com> X-Gnu-PR-Message: they-closed 64466 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64466@debbugs.gnu.org Date: Sun, 09 Jul 2023 05:37:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1688881023-21536-1" This is a multi-part message in MIME format... ------------=_1688881023-21536-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64466: [PATCH 0/7] Fix maven package breakage. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64466@debbugs.gnu.org. --=20 64466: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64466 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1688881023-21536-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64466-done) by debbugs.gnu.org; 9 Jul 2023 05:36:11 +0000 Received: from localhost ([127.0.0.1]:45555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIN5e-0005ZK-Ne for submit@debbugs.gnu.org; Sun, 09 Jul 2023 01:36:11 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIN5b-0005Z3-W4 for 64466-done@debbugs.gnu.org; Sun, 09 Jul 2023 01:36:09 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-51dec0b6fecso4206857a12.1 for <64466-done@debbugs.gnu.org>; Sat, 08 Jul 2023 22:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688880962; x=1691472962; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=cED+HlxpslQ9LgXXtJRCbCwvcqHn9wONLPA5oMmGZps=; b=dkavz2TLh1BR6GtsACFbnk06ZWQcOVW9Kzs8E4YFvniptg5+8SyFRM4qAYXyN/g3Uc d92vWEELtmbUviMW9Oe3H3kr/fVH6QsAyreFZNccEyKBK/AVhyc50mHl1/eSPnvM8LnQ m9JPc6kzqluNnSV7B4stRasqKGf9VmO2tAhJeoCWMKNmUrW2oVlz+oaYHSdGyXPdZRsu SkHwvWh7H/X8ocP2WZ99RStQpSBmTFLWBEIyTDFFVB0X+xrF4E0vqA0LFAp+/ysZhieL n2mR2j2ZYYjjjNsnb1r/LX+7kVn8RBTM9mjpNRP+RNy2n8YTFxcTP54in5PDRI7/6Dm/ SKWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688880962; x=1691472962; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cED+HlxpslQ9LgXXtJRCbCwvcqHn9wONLPA5oMmGZps=; b=NdRS+C9Zzj7OkooritDBze3X5C6jHwDx+gY8pO2Z8iq09bxXyuFnE2KV+nQDyjruVr Vaao6Vpnq5Xr/CEjsvWk6u9TNn21Gm8cV0oMJymQYFxEPB72pnZ/N0UZjlUyc5ceHsZm Ilrao6/sSpAUS1Iqlr9PaPQ45bLH4tJ4bfTN04T2i2MRhIu0fS7H4J8skx/0rnPzwqxR pQbcvU9UhvZ3IOXeCYmjEgZEERWej+e3ZCEX4NYUs6umUMAR/deHqfF463n0LIaOGTvc ZxeM6UKZy2qQSrWv92ngFZLJCkPddRCzQqidU1LQ8BcS5FNAzsY9VARkd+q0JCF/w6jU 1O7Q== X-Gm-Message-State: ABy/qLYOt0PPCRba2NG0tbSOMateWfbWh3vwu0wfHka8gnzoE1PNMvl5 Mk00gNY6UsmoaIRynm90AVU= X-Google-Smtp-Source: APBJJlG22H9wtdd6T3gnhIXDo3A9YT7qRbdyd78Ru1/XDZWBLNAIIUfLZTIIkwwhheIcrCEUMf4l3A== X-Received: by 2002:a50:ef14:0:b0:51d:e4c5:7910 with SMTP id m20-20020a50ef14000000b0051de4c57910mr7315917eds.14.1688880961694; Sat, 08 Jul 2023 22:36:01 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z13-20020aa7c64d000000b0051e0f21c43fsm4051659edr.31.2023.07.08.22.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 22:36:01 -0700 (PDT) Message-ID: <66fb29510b676d03845063bb440a43ee54f06ebf.camel@gmail.com> Subject: Re: [bug#64466] [PATCH 0/7] Fix maven package breakage. From: Liliana Marie Prikler To: Bruno Victal , 64466-done@debbugs.gnu.org Date: Sun, 09 Jul 2023 07:35:58 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64466-done Cc: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, rostislav.svoboda@gmail.com, avityazew@gmail.com 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 (-) Am Dienstag, dem 04.07.2023 um 20:57 +0100 schrieb Bruno Victal: > This patch-series fixes some maven build failures (in particular > maven-settings-builder@3.0). >=20 > Since sisu.sh and component.sh files are created by guix, the > substitute approaches in #63094 and #64026 are unnecessary and have > been reverted. Regarding #63145, it partially obsoletes some of the > patches and will require a rebase. >=20 > [1]: > [2]: > [3]: >=20 > Bruno Victal (7): > =C2=A0 gnu: maven-pom: Add missing shebangs. > =C2=A0 Revert "gnu: maven-embedder: Fix build." > =C2=A0 Revert "gnu: maven-core-bootstrap: Fix build." > =C2=A0 Revert "gnu: maven-resolver-provider: Fix build." > =C2=A0 Revert "gnu: maven-model-builder: Fix build." > =C2=A0 Revert "gnu: maven-settings-builder: Fix build." > =C2=A0 Revert "gnu: maven-model-builder@3.0: Fix build." Pushed, as it seems to unbreak packages on CI, at least on x86-64. For other arches, I'm not sure what is going on, but since the change is "Unknown", I guess it's some timeout elsewhere. Cheers ------------=_1688881023-21536-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Jul 2023 19:57:39 +0000 Received: from localhost ([127.0.0.1]:36643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGm9a-0000KD-VH for submit@debbugs.gnu.org; Tue, 04 Jul 2023 15:57:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:41528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGm9X-0000K2-O6 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 15:57:37 -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 1qGm9X-0002ZY-0t for guix-patches@gnu.org; Tue, 04 Jul 2023 15:57:35 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGm9V-0003qU-Ac for guix-patches@gnu.org; Tue, 04 Jul 2023 15:57:34 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id D85D221093 for ; Tue, 4 Jul 2023 21:57:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4130180099; Tue, 4 Jul 2023 21:57:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AAXL0Z3J3q7G; Tue, 4 Jul 2023 21:57:28 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B3A8380098; Tue, 4 Jul 2023 21:57:28 +0200 (CEST) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH 0/7] Fix maven package breakage. Date: Tue, 4 Jul 2023 20:57:22 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Debbugs-CC: rostislav.svoboda@gmail.com, avityazew@gmail.com, liliana.prikler@gmail.com, julien@lepiller.eu, bjoern.hoefling@bjoernhoefling.de Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.234; envelope-from=mirai@makinata.eu; helo=smtpm3.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Bruno Victal 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: -2.3 (--) This patch-series fixes some maven build failures (in particular maven-settings-builder@3.0). Since sisu.sh and component.sh files are created by guix, the substitute approaches in #63094 and #64026 are unnecessary and have been reverted. Regarding #63145, it partially obsoletes some of the patches and will require a rebase. [1]: [2]: [3]: Bruno Victal (7): gnu: maven-pom: Add missing shebangs. Revert "gnu: maven-embedder: Fix build." Revert "gnu: maven-core-bootstrap: Fix build." Revert "gnu: maven-resolver-provider: Fix build." Revert "gnu: maven-model-builder: Fix build." Revert "gnu: maven-settings-builder: Fix build." Revert "gnu: maven-model-builder@3.0: Fix build." gnu/packages/maven.scm | 25 ------------------- .../maven-generate-component-xml.patch | 3 ++- .../maven-generate-javax-inject-named.patch | 3 ++- 3 files changed, 4 insertions(+), 27 deletions(-) base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4 -- 2.40.1 ------------=_1688881023-21536-1--