From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +LtVFCitrGU2HQEA62LTzQ:P1 (envelope-from ) for ; Sun, 21 Jan 2024 06:35:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id +LtVFCitrGU2HQEA62LTzQ (envelope-from ) for ; Sun, 21 Jan 2024 06:35:36 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Hm+DlG6O; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705815336; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9LPNUzJiCM4PLca4GMNiSwj7QQziKVzKRhH7Z0LQAE4=; b=toBuJEHnqwDtS02AXqKkes8o0Ed8/tN5+ReZoeAJ3VU8RMhWuGU09Ajfx0CTJjF3Rj6S/0 k4Ok5WpHbWFGx9EP2e4LcoITRqhlpNWoiGVfc182cyGCrXGYfaH59nAD9M6X8e7xA0sz4N YvUE1ohODdzg3X1+Qh365rgF5/w8IJ3HrDz6D6boWeAaRYAJJ0BhvuFP8tlOzDLFRuTXXI sqjvSId3XLKr05xd1Ko+1SsBZAXo/+oKitpqYxhilr7Db2V8DoLjcaHL72x48jKry/OPmc +HqCCdYltrR+eAZEO3Mr13Yp0sEh85A8pbDsxNRh8ebdJaaoUcoCYfCo2JAfRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Hm+DlG6O; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705815336; a=rsa-sha256; cv=none; b=uvrYI2CFhMqNjOVkLdvKo5O/Dl5EpUyxFlL4huspYmzW3RE4IOQ4JlfHxbyEoov2E3bod0 4bMOrdJaQRgiEXPiBRThN/avMrnSNRxgiXMp6F44ZrxtLcbw3mK9jVAlENd7cCcW5tdb4s bybB6U1L1We8aoiiapOwI54ZWRZViQununErmlUeOhdIN1ar6+LqDX4I9IT0MNlJB9y2CM 1RJIqV4BHDDQ8JCkq7t7zcTRNcoR24+rgv/ZlRTCnaGS0ozAVjk4Pt1z3l+4EL38y4vMph tbWsp2FwlB8UNEFNDo2PGcN9mx6WOca8smRNceVE15lB7sy1ligLSO+KMUGH3g== 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 071D813D4D for ; Sun, 21 Jan 2024 06:35:36 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRQU2-00037V-UI; Sun, 21 Jan 2024 00:35:02 -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 1rRQU0-00037A-NN for bug-guix@gnu.org; Sun, 21 Jan 2024 00:35:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRQTz-0001mZ-Bw for bug-guix@gnu.org; Sun, 21 Jan 2024 00:34:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRQU2-0002Ll-Jj for bug-guix@gnu.org; Sun, 21 Jan 2024 00:35:02 -0500 Subject: bug#65926: package openjdk 20.0.2 and release-candidate 21+35 and add helpers for that Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Date: Sun, 21 Jan 2024 05:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65926 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: "Dr. Arne Babenhauserheide" Cc: 65926-done@debbugs.gnu.org Mail-Followup-To: 65926@debbugs.gnu.org, maxim.cournoyer@gmail.com, arne_bab@web.de Received: via spool by 65926-done@debbugs.gnu.org id=D65926.17058152638971 (code D ref 65926); Sun, 21 Jan 2024 05:35:02 +0000 Received: (at 65926-done) by debbugs.gnu.org; 21 Jan 2024 05:34:23 +0000 Received: from localhost ([127.0.0.1]:36395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRQTO-0002Kd-Cm for submit@debbugs.gnu.org; Sun, 21 Jan 2024 00:34:22 -0500 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:46377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRQTL-0002KQ-Pq for 65926-done@debbugs.gnu.org; Sun, 21 Jan 2024 00:34:20 -0500 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-78324e302d4so208360385a.1 for <65926-done@debbugs.gnu.org>; Sat, 20 Jan 2024 21:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705815250; x=1706420050; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9LPNUzJiCM4PLca4GMNiSwj7QQziKVzKRhH7Z0LQAE4=; b=Hm+DlG6OqM1gTIIKWDk0Pi8LljUcLH0WNnfp1CPlj5KIHdaDA4NHhuoInktOrLFabW EmgLrXfNbGwEgNRDv/XdNMZeaX3e65+UG6ddI1X8i8qP4cX8yq9gWM2W05hqnuTPz97D wzBENLtuC8BngNoqxJxE01OcbkZXkxfkf9OVjUt1HgbR3ZBXGKtbyX+llwxjycxBI+Mh 2hjyVT1bS2dFimnV0kOtLdmhdFY5ajhsHjNqvkbvBC8Yf0GD4MMmisC0OCGZ1cn7N1qB dlNc1boEgsMi+ESlilA5UquZBwbsasDEykrUAPjCzACB9pwN9eaUdmZgjvnOTnEP4fTh cPjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705815250; x=1706420050; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9LPNUzJiCM4PLca4GMNiSwj7QQziKVzKRhH7Z0LQAE4=; b=E8tS6vBhT2fNnqb9yLOxk1vCBAUZFwltMwSBB99P8Z7saWwmrfbjxFC5OS4x/rrkqg sgNvWowbl3Td9VWu5PbLBYbnxBnQHj6xG5vtGStudunnp8fYH5Iru379ifF+4uZlHLEZ R97t91SSUMKxIAodCA2G5SFTML8SQgjvRbT6Q+rIWWRdGdrjJu2X68d5TPVeyBijuiaC tF3qGLESXtEciuUhcfj6zD5u9mVCeTJSr3AiAozAW1w9uXpKVX/6PXVecWpktPC0T/C5 XgSPSaTSIjOwkAvmk1HGeEI3d4bDv7xFl8eyZmPmkd4bqxy6B8G7aaZtNPIJVg2ZuWi8 RV8w== X-Gm-Message-State: AOJu0YzdGeOb58asLRN/vr0bXBgcLQRiOiDh2tt5YxNuElUG+gUmmKDq I4f9qRdJmj+p9JIbZpRT2SGPlmhEcLhs0AmOjfVqQOxL/yisoJ9iO9FSmk4fdwg= X-Google-Smtp-Source: AGHT+IHs2yy1oxKj0IX81oYqm//ikQ7HUSzYxGo3EgTM1yDrYVwTIDK09KVfadMQ1diojrbsZOJU6g== X-Received: by 2002:a05:620a:c4c:b0:783:3823:4d4a with SMTP id u12-20020a05620a0c4c00b0078338234d4amr2770734qki.62.1705815250597; Sat, 20 Jan 2024 21:34:10 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id t15-20020a05620a034f00b0078397c1fb9esm551377qkm.102.2024.01.20.21.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 21:34:10 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <87cyylu9bi.fsf@web.de> (Arne Babenhauserheide's message of "Wed, 13 Sep 2023 22:04:37 +0200") References: <87cyylu9bi.fsf@web.de> Date: Sun, 21 Jan 2024 00:34:09 -0500 Message-ID: <87v87n9rn2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 2.33 X-Migadu-Scanner: mx13.migadu.com X-Spam-Score: 2.33 X-Migadu-Queue-Id: 071D813D4D X-TUID: G3/eePzHsBba Hello! "Dr. Arne Babenhauserheide" writes: > Hi, > > attached are patches to add helpers and package openjdk 20.0.2 and > 21+35. > > The 21+35 package skips the validation of the runpath, because that > fails. I don=E2=80=99t know why. > > From e72a8ec42a4d4a199711c0abf7960f8caeab5c1e Mon Sep 17 00:00:00 2001 > Message-ID: > From: Arne Babenhauserheide > Date: Wed, 13 Sep 2023 21:59:25 +0200 > Subject: [PATCH 1/4] Add version-prefix-+ for versions with + as separato= r of > the build > > * guix/utils.scm (version-prefix-+): new procedure It seems all of your series got sent as a single diff, instead of multiple messages. Apply it with 'git am' only applies the first commit. Am I missing something? > --- > guix/utils.scm | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/guix/utils.scm b/guix/utils.scm > index e9af33bdeb..2993b31a5c 100644 > --- a/guix/utils.scm > +++ b/guix/utils.scm > @@ -116,6 +116,7 @@ (define-module (guix utils) > version>? > version>=3D? > version-prefix > + version-prefix-+ > version-major+minor+point > version-major+minor > version-major > @@ -822,6 +823,11 @@ (define (version-major version-string) > "Return the major version number as string from the version-string." > (version-prefix version-string 1)) >=20=20 > +(define (version-prefix-+ version-string) > + "Truncate version-string to leave out a suffix appended with +. > +For example, (version-prefix-+ \"21+35\" returns \"21\"" > + (string-join (take (string-split version-string #\+) 1) "+")) This is probably odd enough to be better defined in java.scm, but see below. [...] > Subject: [PATCH 2/4] Add syntax make-openjdk-release-candidate for versio= ns > like 21+35 > > * gnu/packages/java.scm (make-openjdk-release-candidate): new procedure I'm not sure we want this in Guix proper; it'd be good for a bleeding edge java channel, perhaps? ] > gnu/packages/java.scm | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index f7464e2168..0c22f4def9 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1431,6 +1431,45 @@ (define-syntax make-openjdk > field > ...))))))) >=20=20 > +(define-syntax make-openjdk-release-candidate > + ;; Return an OpenJDK package at VERSION with checksum HASH, using BOOT= STRAP, > + ;; the bootstrap package. One or more FIELD can be provided to further > + ;; refine the package definition; for convenience, the BASE, NAME and > + ;; VERSION are defined in their scope. > + (lambda (x) > + (syntax-case x () > + ((_ bootstrap version* hash field ...) > + (with-syntax ((base (datum->syntax x 'base)) > + (name (datum->syntax x 'name)) > + (version (datum->syntax x 'version))) > + #'(let ((base (package > + (inherit bootstrap) > + (name "openjdk") > + (version version*) > + (source > + (origin > + (inherit (package-source bootstrap)) > + (method git-fetch) > + (uri (git-reference > + (url (format > + #f "https://github.com/openjdk/j= dk~au" > + (version-prefix-+ version*))) > + (commit (string-append "jdk-" version*= )))) > + (file-name (git-file-name name version)) > + (sha256 (base32 hash)))) > + (native-inputs > + (modify-inputs (package-native-inputs bootstra= p) > + (replace "openjdk" bootstrap))) > + (home-page (string-append > + "https://openjdk.java.net/projects/= jdk/" > + (version-major version))))) > + (name "openjdk") > + (version version*)) > + (package > + (inherit base) > + field > + ...))))))) > + Especially since this mostly duplicates the macro from make-openjdk. > Subject: [PATCH 3/4] Add openjdk 20.0.2 > > * gnu/packages/java.scm (openjdk20): new package > --- > gnu/packages/java.scm | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 0c22f4def9..d541242b73 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1590,6 +1590,22 @@ (define-public openjdk19 > ;;; Convenience alias to point to the latest version of OpenJDK. > (define-public openjdk openjdk19) > > +(define-public openjdk20 > + (make-openjdk openjdk19 "20.0.2" > + "1af1v2c3d8x4c6shzl6cv9qwq7a4hn5map5pjh9vjcky0hkzd489" > + (arguments > + (substitute-keyword-arguments (package-arguments openjdk19) > + ((#:phases phases) > + #~(modify-phases #$phases > + (replace 'fix-java-shebangs > + (lambda _ > + ;; Update file path. > + (substitute* "src/java.base/share/data/blockedcertsconver= ter/blocked.certs.pem" > + (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))) > + (add-before 'configure 'define-java-environment-variables > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Fix for "valid range 1980-01-01T00:00:02Z to 2099-12-3= 1T23:59:59Z". > + (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) I see we already have 20 on master. We could simply update it to 20.0.2 with its hash. The two phases above need not be duplicated; they are attached to the openjdk19 package and inherited. --=20 Thanks, Maxim