From patchwork Wed May 4 06:39:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 39114 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 AEA4227BBEA; Wed, 4 May 2022 07:50:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,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 7611D27BBE9 for ; Wed, 4 May 2022 07:50:40 +0100 (BST) Received: from localhost ([::1]:37520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nm8qJ-0001uu-OQ for patchwork@mira.cbaines.net; Wed, 04 May 2022 02:50:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nm8j1-0007Ot-8t for guix-patches@gnu.org; Wed, 04 May 2022 02:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nm8j0-0003vc-Vs for guix-patches@gnu.org; Wed, 04 May 2022 02:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nm8j0-0007aY-Lp for guix-patches@gnu.org; Wed, 04 May 2022 02:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55255] [PATCH] gnu: openjdk: Update to 11.0.15. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 May 2022 06:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55255@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165164658229165 (code B ref -1); Wed, 04 May 2022 06:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2022 06:43:02 +0000 Received: from localhost ([127.0.0.1]:41536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nm8iz-0007aI-NK for submit@debbugs.gnu.org; Wed, 04 May 2022 02:43:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:42288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nm8ix-0007a9-Ta for submit@debbugs.gnu.org; Wed, 04 May 2022 02:43:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nm8in-0007NJ-Ml for guix-patches@gnu.org; Wed, 04 May 2022 02:42:57 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:51092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nm8il-0003uP-EQ for guix-patches@gnu.org; Wed, 04 May 2022 02:42:49 -0400 Received: from dayas.lan (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 6A2BA1120048; Wed, 4 May 2022 08:42:37 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 4 May 2022 08:39:01 +0200 Message-Id: <20220504063901.15818-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd30410.kasserver.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java (openjdk): Update to 11.0.15. [arguments]<#:phases>[fix-java-shebangs]: Adapt phase. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43422f383f..a644370821 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1768,7 +1768,7 @@ (define-public openjdk11 (define-public openjdk11 (package (name "openjdk") - (version "11.0.13") + (version "11.0.15") (source (origin (method url-fetch) (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-" @@ -1776,7 +1776,7 @@ (define-public openjdk11 (file-name (string-append name "-" version ".tar.bz2")) (sha256 (base32 - "0xavz7msaadprq65p5bhp6sxcyp12p0zlbhb3aaz0cvp21c9pdm9")) + "0di91nnms2iq1svgq72r5y17am17r4vh2lq43k0bkcwpc84d6nd8")) (modules '((guix build utils))) (snippet `(begin @@ -1819,8 +1819,8 @@ (define-public openjdk11 (lambda _ ;; This file was "fixed" by patch-source-shebangs, but it requires ;; this exact first line. - (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" - (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) + (substitute* "make/data/blockedcertsconverter/blocked.certs.pem" + (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")) #t)) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries.