From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 UCj5ASkPJmMEsAAAbAwnHQ (envelope-from ) for ; Sat, 17 Sep 2022 20:17:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8NL0ASkPJmPEHQAA9RJhRA (envelope-from ) for ; Sat, 17 Sep 2022 20:17:13 +0200 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 78D762030E for ; Sat, 17 Sep 2022 20:17:12 +0200 (CEST) Received: from localhost ([::1]:34198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZcNL-0003iC-Dt for larch@yhetil.org; Sat, 17 Sep 2022 14:17:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZcNC-0003i2-TM for guix-patches@gnu.org; Sat, 17 Sep 2022 14:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZcNC-00016G-JZ for guix-patches@gnu.org; Sat, 17 Sep 2022 14:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZcNC-0000Hs-Dl for guix-patches@gnu.org; Sat, 17 Sep 2022 14:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57888] [PATCH] gnu: maven-slf4j-provider: Bugfix. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Sep 2022 18:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57888@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16634386051076 (code B ref -1); Sat, 17 Sep 2022 18:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2022 18:16:45 +0000 Received: from localhost ([127.0.0.1]:47173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZcMr-0000HD-8b for submit@debbugs.gnu.org; Sat, 17 Sep 2022 14:16:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:48764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZcMl-0000H2-1B for submit@debbugs.gnu.org; Sat, 17 Sep 2022 14:16:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZcMk-0003hY-HY for guix-patches@gnu.org; Sat, 17 Sep 2022 14:16:34 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:38759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZcMi-00015Y-1T for guix-patches@gnu.org; Sat, 17 Sep 2022 14:16:33 -0400 Received: by mail-lf1-x136.google.com with SMTP id f14so39562920lfg.5 for ; Sat, 17 Sep 2022 11:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date; bh=RmCUHg3tXlyDpt7Ggx1ut+f1zmMsRHWaSsptwNGSwXI=; b=DGjXY8Dv0SfT3Ih98MaxB8QBdBLDpsPk6aG1koiHjSlFNS1pmdXJ+h4dj2y32mCmNx Q+4PLqAO2f9alDbEnrp0gdsNmmNtSeRwcfmM4VQ5yZ8jst2Iwnk+v0f4YG6d7qckoNd1 xI4HQWhYE1EsbS9zDfS4K48cyfCEiVa8Ful21lPbtVYu0VJAPQLbolBQoMnSbsYb2PGZ bFXwQEG0w3DfGE7E5ns1T69FC8svaTOXQhFYdi1bJlgbIAL4cJ6YZYyoSuJksC4xRh7g HKf5dtzOYm5cE4JZc+d9DKEsol13esJTCCvLgPWBTbHzh7XkamTT9BOCICyLVR5B2ZVu TeJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date; bh=RmCUHg3tXlyDpt7Ggx1ut+f1zmMsRHWaSsptwNGSwXI=; b=4Ai/DOuueKGQ+wGU9dQ1X/dDiGfWUTnjHLT67ntQXX/DWQJlH0O9CRQt5BEt/Alm/7 Vt5yZR0EnUMp/ZOy7PlwRjKoq2P/WVSyqhzcOs3Rr8jXDo8JSDFPUXtvEKHNWG+6fxxT UcfJ1zU0n0DODyYf+L69ngHRPqcrH18rwEgPObBuh21W6Jd9iPHC7Kxp4t9YA0b11XNE 3NdXWagp8FbceSsL9bu0xOGsIOarI97sWG5MXEQ9DGiY/YdWpp/+cMpMk/5Pg9Ea+Rw/ cmDs4X/9K1nSbvQy0AKm+8bvKZlnF+KntDJHOk4/usBrdjYFTJ6k5MPq1i58ef/THKAB Jc9g== X-Gm-Message-State: ACrzQf3SPSHgBX3LBczJKDzsldJzECS3Jw2KJhWF04eXfInZxZz35Prz 9jl068kDtSj094pXP7z583fIMVRNRnI= X-Google-Smtp-Source: AMsMyM4/DP5JUtq44jPqdBTU9pU8w3Xj2RM7y6aOs8YcXzz+9d2rBH9ulb5KhJya0Lo8HSRep7Kr/A== X-Received: by 2002:a05:6512:36c9:b0:49f:6783:a22f with SMTP id e9-20020a05651236c900b0049f6783a22fmr963725lfs.84.1663438589177; Sat, 17 Sep 2022 11:16:29 -0700 (PDT) Received: from elephant ([5.166.205.177]) by smtp.gmail.com with ESMTPSA id w23-20020a194917000000b004946c3cf53fsm4207031lfa.59.2022.09.17.11.16.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Sep 2022 11:16:27 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 17 Sep 2022 21:16:23 +0300 Message-ID: <87edw9vpc8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x136.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, FREEMAIL_FROM=0.001, 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-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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663438632; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=RmCUHg3tXlyDpt7Ggx1ut+f1zmMsRHWaSsptwNGSwXI=; b=XBlkqchUfbMRFn/R02FYDGl/I7gHT7AAFuEB9RvZVJBlq31ROmKsNalYRVanXymxRrB3Y5 EGCHke4CAReOrAI5t7WTMJ2zkVGD57klProedj3PT1kvoIafd9e3aPxiehBO4nc5jRz5B2 xbWJx0IjAB6EgnehmwlavqEbJZKR/FxoS/dePeZEILjIG7dwpxg8h6Gq3PstKUWobA8kFf hWf66Ky5JtX3udgIWz5Hwzvq2yEXC6J92RqemhGGUkvf4kpsuDV3Px618wHUkXE9Aa+UXQ sLbL6uS2u8c5yzk5b4CsZh4huxV9Fh+bmFL9HZ7qj1tlDK5DD6FTA6FNOWD9FA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663438632; a=rsa-sha256; cv=none; b=RnM+moqFrDbzvOZzX+7NvwMvcMfOQjEYKjKYUbMOZ5orK8xr89ge7FZc7kH3NGQoqku2nN e9Vb/kAqHrmTacvuxp02AhD0wdidsNyzWVXMV1zxSFR5Ez7drE0WFKkgoP+1SONzr9R75H jErahGzyEH3U3qJZiwQaHZ9W8mWVweXSgy/d8oipbqSrc16CNpUMuS9TXQVr8zueq2/KP9 eSPpHHdqvwXfwUE7yb3wQPe90Jx4rc/KYTxbCQ/sEBr2/V9Yqa7W31jBdMOB/K4QoZGOSz XKVeQkG0/DFdNDS3uisN7/Vb7U+JsM3WeaGY9BoJJ6JRLopV02HzKFiRUYnghg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DGjXY8Dv; 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-Spam-Score: 3.86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DGjXY8Dv; 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-Queue-Id: 78D762030E X-Spam-Score: 3.86 X-Migadu-Scanner: scn1.migadu.com X-TUID: mReK7XYabbEF --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patch fixes a bug that was likely introduced in 8efed18128b8bda3d7e4db460998dc20e3d6dc2f by switching from "url-fetch" method to "git-fetch" in "java-slf4j-api" package. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-maven-slf4j-provider-Bugfix.patch Content-Transfer-Encoding: quoted-printable From=20c7a022bfc3b6b36990a17ecfa12332889ad5aaa6 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 17 Sep 2022 20:48:19 +0300 Subject: [PATCH 1/2] gnu: maven-slf4j-provider: Bugfix. * gnu/packages/maven.scm (maven-slf4j-provider): Bugfix: Don't use "tar" to extract "java-slf4j-simple-source" as it is already unpacked; recursively= copy the source instead. =2D-- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 28ec4eb9a8..50c4b457b5 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1786,8 +1786,8 @@ (define-public maven-slf4j-provider (add-after 'unpack 'unpack-slf4j (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "generated-sources") + (copy-recursively (assoc-ref inputs "java-slf4j-simple-source= ") "generated-sources") (with-directory-excursion "generated-sources" =2D (invoke "tar" "xf" (assoc-ref inputs "java-slf4j-simple-s= ource")) (for-each delete-file (find-files "." "StaticLoggerBinder.j= ava"))) (for-each (lambda (simple) =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-maven-slf4j-provider-Fix-style.patch Content-Transfer-Encoding: quoted-printable From=204c91c947e4cf069bdeb7312d308f0082dd6afa29 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 17 Sep 2022 21:10:04 +0300 Subject: [PATCH 2/2] gnu: maven-slf4j-provider: Fix style. * gnu/packages/maven.scm (maven-slf4j-provider): Fix style. =2D-- gnu/packages/maven.scm | 52 ++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 50c4b457b5..1b01116b88 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1780,31 +1780,33 @@ (define-public maven-slf4j-provider (arguments `(#:jar-name "maven-slf4j-provider.jar" #:source-dir "maven-slf4j-provider/src/main/java" =2D #:tests? #f; no tests =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'unpack-slf4j =2D (lambda* (#:key inputs #:allow-other-keys) =2D (mkdir-p "generated-sources") =2D (copy-recursively (assoc-ref inputs "java-slf4j-simple-sour= ce") "generated-sources") =2D (with-directory-excursion "generated-sources" =2D (for-each delete-file (find-files "." "StaticLoggerBinder= .java"))) =2D (for-each =2D (lambda (simple) =2D (for-each =2D (lambda (java) =2D (copy-file java =2D (string-append =2D "maven-slf4j-provider/src/main/java/or= g/slf4j/impl/" =2D (basename java)))) =2D (find-files (string-append simple "/src/main/java/") = "\\.java$"))) =2D (find-files "generated-sources" "slf4j-simple" #:director= ies? #t)))) =2D (replace 'install =2D (install-from-pom "maven-slf4j-provider/pom.xml"))))) =2D (inputs =2D `(("java-slf4j-api" ,java-slf4j-api) =2D ("java-slf4j-simple-source" ,(package-source java-slf4j-simple)) =2D ("maven-shared-utils" ,maven-shared-utils))) + #:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-slf4j + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "generated-sources") + (copy-recursively (assoc-ref inputs + "java-slf4j-simple-sour= ce") + "generated-sources") + (with-directory-excursion "generated-sources" + (for-each delete-file + (find-files "." "StaticLoggerBinder.java= "))) + (for-each (lambda (simple) + (for-each (lambda (java) + (copy-file java + (string-append + "maven-slf4j-pro= vider/src/main/java/org/slf4j/impl/" + (basename java))= )) + (find-files (string-append sim= ple + "/src/main/java/") + "\\.java$"))) + (find-files "generated-sources" "slf4j-sim= ple" + #:directories? #t)))) + (replace 'install + (install-from-pom "maven-slf4j-provider/pom.xml"))))) + (inputs `(("java-slf4j-api" ,java-slf4j-api) + ("java-slf4j-simple-source" ,(package-source java-slf4j-simp= le)) + ("maven-shared-utils" ,maven-shared-utils))) (native-inputs (list unzip)))) =20 (define-public maven-embedder =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks, =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmMmDvcZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigLwnlB/0Qnfqw3ormHJz8tn0NF5G+ Y6Cezx+rsLGIR1mziWALkK1TsqFNrGIW40+HZMteCdB16gEb60skO3kF647eK+Dr eQowrDcSGPF/Elhl9bBbkWMA9Co+bJ8Fyov5ZCvLaeIbc+nO3A0bgTuTWuW4LhDj SVvv3vQnz/ImBihDuAtbUiCCdQc4cIvBjDqhgqtn29cGn04Ex3NLamLANMhi1Jn3 XhETRw00eCXrCzXN7esWE36fcqjB5UMAbjKW62AToKJPgxjfE8h4e2v0iSSAmVXO 7SWu8Ka0hVgHSiXVQ4Iul90EWqjmYCKQ6U3bR2CX22O5oKgWICOnNr61CToqhNsA =6lYa -----END PGP SIGNATURE----- --==-=-=--