From patchwork Sat Dec 11 02:23:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35120 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D331F27BBEA; Sat, 11 Dec 2021 02:24:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9616727BBE9 for ; Sat, 11 Dec 2021 02:24:43 +0000 (GMT) Received: from localhost ([::1]:37866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvs42-0001sW-O9 for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 21:24:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvs3S-0001of-0L for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvs3P-0005D9-S6 for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvs3P-0007Mm-HJ for guix-patches@gnu.org; Fri, 10 Dec 2021 21:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52421] [PATCH 5/5] gnu: java-log4j-api: Update to 2.15.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 02:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52421@debbugs.gnu.org Received: via spool by 52421-submit@debbugs.gnu.org id=B52421.163918940728247 (code B ref 52421); Sat, 11 Dec 2021 02:24:03 +0000 Received: (at 52421) by debbugs.gnu.org; 11 Dec 2021 02:23:27 +0000 Received: from localhost ([127.0.0.1]:48273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2p-0007LS-Eg for submit@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:27 -0500 Received: from lepiller.eu ([89.234.186.109]:32802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvs2n-0007KV-2Y for 52421@debbugs.gnu.org; Fri, 10 Dec 2021 21:23:25 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id db87287f for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=x52/8jZZFsADjUmMn7r3L5Wef WG/4nztNYErNUPtLqo=; b=li7dMAXTzAbAIhaPsPlqm6rKhZmYL1QUK6paDtmsQ 4eXgzhu1K7nP0kQs+3O+ZY+QglqDQTBAWYQCYnKmtHx0Y2ICaT/TdtWek3OfcXZh XxC+r0Mn+Y5u+QAzIAy46aVGSOXKuN9ZwhGZe0KVUtlW389SUqOJ3IuQArNRzykb OrQEVufbd0vhoG7I3S7cLbBdcqCNpStQ8tHQiXWl7gRbwzP9DaA6uq0vUSJqAdYw pyFlSKTSn2/3FjIVXqpQO5lhg2H5mrvSjWHaJhfvjhK4qAVh+0iqG3ta+9UGxJy+ wTYzZBOlsjqSnsaiKIPZGMLp7KQYqRoGNBV8ef2ul/MPA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2cf37823 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52421@debbugs.gnu.org>; Sat, 11 Dec 2021 02:23:20 +0000 (UTC) From: Julien Lepiller Date: Sat, 11 Dec 2021 03:23:07 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211211031159.29aa79db@tachikoma.lepiller.eu> References: <20211211031159.29aa79db@tachikoma.lepiller.eu> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Includes fixes for CVE-2017-5645, CVE-2020-9488 and CVE-2021-44228. * gnu/packages/java.scm (java-log4j-api): Update to 2.15.0. (java-log4j-core, java-log4j-1.2-api)[inputs]: Adjust accordingly. --- gnu/packages/java.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 785e9f13e2..d295077113 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7840,14 +7840,14 @@ (define-public java-javax-mail (define-public java-log4j-api (package (name "java-log4j-api") - (version "2.4.1") + (version "2.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/logging/log4j/" version "/apache-log4j-" version "-src.tar.gz")) (sha256 (base32 - "0j5p9gik0jysh37nlrckqbky12isy95cpwg2gv5fas1rcdqbraxd")))) + "0h4ndw096h9cql0kyi1zd0ymp8hqxc1jdgdxkn0kxf8vd9b4dx14")))) (build-system ant-build-system) (arguments `(#:tests? #f ; tests require unpackaged software @@ -7869,6 +7869,7 @@ (define-public java-log4j-api `(("java-osgi-core" ,java-osgi-core) ("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit))) + (properties '((cpe-name . "log4j"))) (home-page "https://logging.apache.org/log4j/2.x/") (synopsis "API module of the Log4j logging framework for Java") (description @@ -7886,7 +7887,11 @@ (define-public java-log4j-core ("java-log4j-api" ,java-log4j-api) ("java-mail" ,java-mail) ("java-jboss-jms-api-spec" ,java-jboss-jms-api-spec) + ("java-conversant-disruptor" ,java-conversant-disruptor) ("java-lmax-disruptor" ,java-lmax-disruptor) + ("java-jctools-core" ,java-jctools-core-1) + ("java-stax2-api" ,java-stax2-api) + ("java-jansi" ,java-jansi) ("java-kafka" ,java-kafka-clients) ("java-datanucleus-javax-persistence" ,java-datanucleus-javax-persistence) ("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) @@ -7934,6 +7939,7 @@ (define-public java-log4j-1.2-api (inputs `(("log4j-api" ,java-log4j-api) ("log4j-core" ,java-log4j-core) + ("java-jboss-jms-api-spec" ,java-jboss-jms-api-spec) ("osgi-core" ,java-osgi-core) ("eclipse-osgi" ,java-eclipse-osgi) ("java-lmax-disruptor" ,java-lmax-disruptor)))))