From unknown Thu Jun 19 14:00:47 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65926 <65926@debbugs.gnu.org> To: bug#65926 <65926@debbugs.gnu.org> Subject: Status: package openjdk 20.0.2 and release-candidate 21+35 and add helpers for that Reply-To: bug#65926 <65926@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:00:47 +0000 retitle 65926 package openjdk 20.0.2 and release-candidate 21+35 and add he= lpers for that reassign 65926 guix submitter 65926 "Dr. Arne Babenhauserheide" severity 65926 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 13 16:07:13 2023 Received: (at submit) by debbugs.gnu.org; 13 Sep 2023 20:07:13 +0000 Received: from localhost ([127.0.0.1]:36134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgW8m-0006qm-JT for submit@debbugs.gnu.org; Wed, 13 Sep 2023 16:07:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgW8h-0006qG-Jn for submit@debbugs.gnu.org; Wed, 13 Sep 2023 16:07:10 -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 1qgW8U-0006qh-Kl for bug-guix@gnu.org; Wed, 13 Sep 2023 16:06:54 -0400 Received: from mout.web.de ([217.72.192.78]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgW8N-0006lY-8i for bug-guix@gnu.org; Wed, 13 Sep 2023 16:06:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1694635602; x=1695240402; i=arne_bab@web.de; bh=lnF34QGfGCmJ2BNyyoEGQdAWQ2ZLWbxOBKarb4LOCUQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=KVFnqJhGWZFht6xYnWdIgVtcUPH4eglVT+VG5yzhfk/T/WemCTzHn705OUIXNPlsmvHKTjtvgKH RBjDjm8WgRSzL+Ms9ltbEWPjKrSQ3udLZHRH3q/GEESzcj+jgCBtCiL4txF7Cggr+gRQEDk7xRaBw vSSnPd37D3wY8aVb+Mn3URbdUEnHgn7Yei35+Lyd0tQluQ3KK84CawvXcfLgyGQdGx3g+IvdtZ/jK US3E/MYrp09CCZUMeaEMfrGRcGlT/dU2oWyiAIlczy+PZtTRr6jcazXsJei1I7KjjQwJFDYnYQrPm SoAgp1i2LQVmM26OJ9j4QjCy/K8uCjPOBSxA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from fluss ([80.136.24.98]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MidHZ-1rL3Th2sz9-00fg4B; Wed, 13 Sep 2023 22:06:42 +0200 User-agent: mu4e 1.10.5; emacs 29.0.92 From: "Dr. Arne Babenhauserheide" To: bug-guix@gnu.org Subject: package openjdk 20.0.2 and release-candidate 21+35 and add helpers for that Date: Wed, 13 Sep 2023 22:04:37 +0200 Message-ID: <87cyylu9bi.fsf@web.de> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Provags-ID: V03:K1:pBS+rMQucGY0zsIo48lUcGFLP/Z/x0hcAFiE7FPW/y4+E7CRqn3 LkDa2ZcHlQpU4I0P0P4Z+WhZtmRAAheK3iYuGfjKDh0At+IPnjGRCAitUgM7MjxwW29ucNm gdWOH8fHBr6b9BLX1DerVRz0Ctrokg+gnNozY92y57u4Ksspy/+wdxKoJXnTvClFov+BEmb vYQlEKuJXQPKEEq/o3AEw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:pQAslU/LDbI=;qzrLPlhCz7slxvrM3UZmEAbYz60 fN+6Tw30nHk8oRMBHnORCX3iglc+qXUDlQwRIbM6NMMyD1hChlz9FB7BMdcwUJgDdiiCXkCif iIiCuPem3xYxXVMNiUGvRgXt8Da826kc9dH1kd5Vy/XoD7MW6yhU0qUVUDdEoE9dTMpS4qGuc VyetXQV92QBEjLVgtxQxFrS8b8W1lv5Xyq06kp6h888lAiuM8c7wTbO1eAL03ZNb9SFLCNE0n vo4D+nsQEQlUYN3rdhGhOzsNgO4sgEr3UP34scX0tSbmNC2IHG3EXOex2EKtdADfcHhO/iZs3 p55g4r9Ml3Cu/z6LbrHmFAT6Z/T2WoiaSr7zbxNw1x0E3ANiza9oTr5Ne+LtTkgy9hiwH6yr8 tMoA7O7F8xX8AzeU8hryjPCS7SjLtTsfz1ViUI8QRHtcj5yq3rLLsCfQphJipb+CIbD7AjCLd hTdY5SULcwJMYilMEeh2WyHf8AUDEFFUG3/K8ciUSHFSx4cTQALIxLogwczCHTaEgEKPKHDZq RCUOUwVoz8/BWBv/r08Ci0WLD/HdANMwjs0DRloIxwX8pbObiY4MtCJHLDOQkKvXTJhyZfpXi S1wBqtu6K1eG3STttikQmtBkSQG2iab0bk6nnNOCb6yXRcw20Db3dPSVyAZeUpgLXrIkft39B mu/RA7q2Nkcgp5el1SMVhfvhGCaoX3VcdFSW43x8IV9owF3zU9mxafCPefrCUaaeWNa1sLMs8 CQpV/TeA+VsAaWqrJUJfscDcCq1LNb00drFkOomFu59NGvpBpQMmrKW5WBJUvqg+jMCXf/Z15 POo9uNK9DtX7PWWoJZxd8D6BUL+KdI7YMB3+ID7onvHmkvbbudlKf62tJFtbg9iVF0Xwp4P83 6AEmtLoRYvLy/4C0Vin52csalxTCPWxHU6mRF5UDR5/HA5vDyDUgUQOu3LdE3U9P5Fbr+V50Y dwPyquWwmL+126hPVwyNWLROpWM= Received-SPF: pass client-ip=217.72.192.78; envelope-from=arne_bab@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit 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: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Add-version-prefix-for-versions-with-as-separator-of.patch Content-Transfer-Encoding: quoted-printable From=20e72a8ec42a4d4a199711c0abf7960f8caeab5c1e 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 separator = of the build * guix/utils.scm (version-prefix-+): new procedure =2D-- guix/utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index e9af33bdeb..2993b31a5c 100644 =2D-- 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 +(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) "+")) + (define (version-unique-prefix version versions) "Return the shortest version prefix to unambiguously identify VERSION am= ong VERSIONS. For example: base-commit: e2a7c227dea5b361e2ebdbba24b923d1922a79d0 prerequisite-patch-id: e26acb8280f31db9b663b6fc444a2229fc5b588e prerequisite-patch-id: db5cc62f7d04f3ed3014ae984fe732f3b6db8d17 prerequisite-patch-id: 3a0bf9ef6f27f1d92537c5e9ee5c38c7d6ced99e prerequisite-patch-id: 088a72da8c11e5d1c7087b4a5e8bb9c4a3b9b2af prerequisite-patch-id: 1b4787e17ec6ab62978615e1d3804a1024c5e1a0 prerequisite-patch-id: f814d9756faa5d91a68b81654606c66b4cf389e5 prerequisite-patch-id: f2dbed3e6da49472bd141c9fa40de2d2208130fb prerequisite-patch-id: 2dbf557994da4a264566b67294f7f3f8e2931f5f prerequisite-patch-id: 912a76fac540b98d5683ba1886a7d62f0963cd9f prerequisite-patch-id: f6a9bfd16b8952c73b7a6d97be70013a290815d7 prerequisite-patch-id: e50c1aaa1d401bba32a49d2e1fb1661746543d09 prerequisite-patch-id: 1f63cb516bc5c9772ae808371528006fca20dcad prerequisite-patch-id: 1ac04f0120fb6c4f106d05bee88103debb815b41 prerequisite-patch-id: eeff242fb5e41c8c83b3daadd0965e58eb6670ba prerequisite-patch-id: 3812c9ac1252d9d20e8485462be155156f302a54 prerequisite-patch-id: 9d3dd155c91ab334999c03fefab04f361ea4d8b5 prerequisite-patch-id: f5b09b934b65fe45bdfd1273baa3bb949ed52cca prerequisite-patch-id: 61a9b3943bdbe5cb6a4aa978888ceb64088f9a14 prerequisite-patch-id: 3f9d50361fb537607c33d09115366aec05160688 prerequisite-patch-id: 765c77b7c31f24491149665a066d2906f8da8d33 prerequisite-patch-id: 2b92c37e3aa74152a7aa226e1fbd5f2735037dc0 prerequisite-patch-id: 2a3123ab0786108f26e25c45fc4c545b99b6dd27 prerequisite-patch-id: 891a2458a90ea90113c576df5029514f5143366e prerequisite-patch-id: 1a08957a2fd3e3637ed7f3cf3f44c9f8194d6668 prerequisite-patch-id: d382210c915c0a809cb709cba45a4542d60c4d20 prerequisite-patch-id: d424ad2c4c4bf14becb025c67757f48d4a6ae6b5 prerequisite-patch-id: 07e1c90231819e0b963645b041522e53891fd344 prerequisite-patch-id: 124009dec6dad63add19bf258f71bdb127078ecb prerequisite-patch-id: 0afa33c8e0e2aca07da2782e04d259d3f8c498c5 prerequisite-patch-id: 205bb6c05a145eb9137e8623687418089351e73e prerequisite-patch-id: 7138f72403701b9749a0a587f1807030d730c00d prerequisite-patch-id: 39bd665160a5e62aaa4ea94ad2e3ca30f31e2127 =2D-=20 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-Add-syntax-make-openjdk-release-candidate-for-versio.patch Content-Transfer-Encoding: quoted-printable From=2042b2dbb2d09ab5706523f25951f51289e3ad6181 Mon Sep 17 00:00:00 2001 Message-ID: <42b2dbb2d09ab5706523f25951f51289e3ad6181.1694635452.git.arne_b= ab@web.de> In-Reply-To: References: From: Arne Babenhauserheide Date: Wed, 13 Sep 2023 22:00:55 +0200 Subject: [PATCH 2/4] Add syntax make-openjdk-release-candidate for versions like 21+35 * gnu/packages/java.scm (make-openjdk-release-candidate): new procedure =2D-- 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 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1431,6 +1431,45 @@ (define-syntax make-openjdk field ...))))))) =20 +(define-syntax make-openjdk-release-candidate + ;; Return an OpenJDK package at VERSION with checksum HASH, using BOOTST= RAP, + ;; 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/jdk= ~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 bootstrap) + (replace "openjdk" bootstrap))) + (home-page (string-append + "https://openjdk.java.net/projects/jd= k/" + (version-major version))))) + (name "openjdk") + (version version*)) + (package + (inherit base) + field + ...))))))) + (define-public openjdk12 (make-openjdk openjdk11 "12.33" "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2" =2D-=20 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-Add-openjdk-20.0.2.patch Content-Transfer-Encoding: quoted-printable =46rom 823bf15aed65b6abe48ad28fb6bb94d7e9bc5db2 Mon Sep 17 00:00:00 2001 Message-ID: <823bf15aed65b6abe48ad28fb6bb94d7e9bc5db2.1694635452.git.arne_= bab@web.de> In-Reply-To: References: From: Arne Babenhauserheide Date: Wed, 13 Sep 2023 22:02:13 +0200 Subject: [PATCH 3/4] Add openjdk 20.0.2 * gnu/packages/java.scm (openjdk20): new package =2D-- 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 =2D-- 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/blockedcertsconvert= er/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-31= T23:59:59Z". + (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) =0C ;; This version of JBR is here in order to be able to build custom ;; IntelliJ plugins. Those usually need both jbr11 and jbr17 for =2D- 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-Add-openjdk-release-candidate-21-35.patch Content-Transfer-Encoding: quoted-printable =46rom cfcb798398c0cec64a6fa2bfaf2a0ad50612da21 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: Arne Babenhauserheide Date: Wed, 13 Sep 2023 22:02:36 +0200 Subject: [PATCH 4/4] Add openjdk release-candidate 21+35 * gnu/packages/java.scm (openjdk21): new package =2D-- gnu/packages/java.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d541242b73..0c0e6a717c 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1606,6 +1606,26 @@ (define-public openjdk20 (lambda* (#:key inputs #:allow-other-keys) ;; Fix for "valid range 1980-01-01T00:00:02Z to 2099-12-31= T23:59:59Z". (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) + +(define-public openjdk21 + (make-openjdk-release-candidate openjdk20 "21+35" + "06wjfwrkqykjdkis2s1nh91cy8vwincnmc699cxvyk3fc12jf3vw" + (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/blockedcertsconvert= er/blocked.certs.pem" + (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))) + (replace 'validate-runpath + (lambda _ #t)) ;; just do nothing because this validation fa= ils on libjava.so missing which is part of openjdk itself + (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-31= T23:59:59Z". + (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) + =0C ;; This version of JBR is here in order to be able to build custom ;; IntelliJ plugins. Those usually need both jbr11 and jbr17 for =2D- 2.41.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Best wishes, Arne =2D-=20 Unpolitisch sein hei=C3=9Ft politisch sein, ohne es zu merken. draketo.de --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmUCFlIQHGFybmVfYmFi QHdlYi5kZQAKCRAT741FJAPD66RyEAC6W0/f1f7J30pI/0cICC4Mj1bCVfg6aak8 xUfrfaUPHuHW9dHqXmMw1kVkGilwGhjVNXgi5FPVHWqqxm9JF6VTExrZhjPScKIh h487ZwKYRb+sH53VZkR13CY3pk8DkXRh8+YZE3aDvBdOiHYoYuDnPvkLwl+D8T1C taFqcr1uxxdv6tjLwwKJWNbFLFMrTtjPnyfQZENnbcggFr7/druQiwUGpyb38iDv WOoNtVH7t2Tq2SHisCyUoNuUuNGR/RhAm4hxAEWTT5GXc11y3JtDxnXTEl+RCkJc dkZnm6r1Hhtkb43+CciXkRKj61z/Pmy8FhlkN29h0UjVFnDVM6PjXtfQdpFsaMof 8F4sF1gSrC5Tewvj005QbuKLQ3LOPO73yW6y22+CCNDU4UI7Try53OrxDZg80pAJ 9qEdrhmUqcaPeSSVojheVVHQ8PRbD3KMFJ+6Nv2gBXhYj4Hi7eC2ycxUDLGX5QmR Qo5k2llL+1swSXx1aldRrwqDvVl7PS499PDdxpFcKsBoOsbxa80GdqIBG1ZcHKKw xa2QyHhkYW46/znRM3Q6s6V9hcqvoJiGpcAUDIdH4qoBI+pn1EOOIAtefrM9c2R4 Ctc7CVpUuKXrDTJ8EBEIMKk4A3FAmMKmRCliyy65BtKlFpObE5du9fxVdRNbeTKX bRer4oNtjYjEBAEBCAAuFiEE3Si95tmHXKvOSosd3M8NswvBBUgFAmUCFlIQHGFy bmVfYmFiQHdlYi5kZQAKCRDczw2zC8EFSFFXA/9ql/BSWgHKnr7X/WBwgOkWYsqP 3uwLSmnSw/QgNrOkYtK8jM2vviqimxueveknpFOIYwcpD3Qb+ZafPYPvC5aKQKQT N0XXiCz5PREiccFW2R4pcHHK2kT5JQe+iwmgrxgz/LRnun2pyiwXUD0t6UXraubT YzzozUvWnyjmd8h9Og== =TcOZ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 00:34:22 2024 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 To: "Dr. Arne Babenhauserheide" Subject: Re: bug#65926: package openjdk 20.0.2 and release-candidate 21+35 and add helpers for that 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65926-done Cc: 65926-done@debbugs.gnu.org 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 (-) 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 From unknown Thu Jun 19 14:00:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 18 Feb 2024 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator