From patchwork Thu Nov 2 06:50:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55813 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 545C927BBE9; Thu, 2 Nov 2023 06:51:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C08C827BBE2 for ; Thu, 2 Nov 2023 06:51:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYF-0005CA-LC; Thu, 02 Nov 2023 02:51:36 -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 1qyRYA-0005AS-IO for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 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 1qyRYA-0001PD-AE for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYg-0004ra-Es; Thu, 02 Nov 2023 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 1/5] gnu: openjdk9: Install default certificates. References: <20231101135338.2634f780@tachikoma.lepiller.eu> In-Reply-To: <20231101135338.2634f780@tachikoma.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890788118595 (code B ref 66879); Thu, 02 Nov 2023 06:52:02 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:21 +0000 Received: from localhost ([127.0.0.1]:53781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXw-0004pc-5L for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:20 -0400 Received: from lepiller.eu ([89.234.186.109]:36628 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXp-0004pB-8g for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:14 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 3cbc7c85 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=73/qEaF38kKDR/OUVHMsOGaEe7SXodtGIjOIKdcAnmE=; b=P3h/ 0Tb2ecdb/ddYoijoRsXSBL/71IOXQQ1XrmVMZnqlDwWealK23PmgFg9wf/AcH7wZ wIbWYi72DoirxljIdk9t4PDHc/PZRIxaAzKhLEkRibWyve/M2MppTsnEJKP155un qGC7QJQDaazrjsYF3fmNvAwR23cP2ZajBRYGcb1njPE7UTuG1dOM4xpjRSU/JgWO LxoJBZHrTMs9B307RMQFITh7ZULYDVm+BkKFInuHNKM8KzaJXtUtNf/W47V4f9mj YqriqdIofzJZNHzOcTrJak3nGkXgM18XBvfDxA5XKoD7PwHJ6UGp16POid2N1Ej+ xGAjL5Tnl2XX9H6jdA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id a116e4e4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:31 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:09 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (openjdk9)[arguments]: Add a phase to install certificates from nss-certs to the expected location. (openjdk10, openjdk11): Adapt to also install the certificates. Change-Id: I6ef626324386419e84a9c0eace5a278ca11c573c --- gnu/packages/java.scm | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) base-commit: c95104c2e96f660d482e603c497c1e01968788d3 diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f482c4c16d..567fb05f77 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -878,7 +878,14 @@ (define-public openjdk9 (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments - `(#:tests? #f; require jtreg + `(#:imported-modules + ((guix build ant-build-system) + ,@%gnu-build-system-modules) + #:modules + ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen)) + #:tests? #f; require jtreg #:make-flags '("all") #:disallowed-references ,(list (gexp-input icedtea-8) (gexp-input icedtea-8 "jdk")) @@ -971,6 +978,80 @@ (define-public openjdk9 (find-files "." "\\.c$|\\.h$")) #t))) + ;; By default OpenJDK only generates an empty keystore. In order to + ;; be able to use certificates in Java programs we need to generate a + ;; keystore from a set of certificates. For convenience we use the + ;; certificates from the nss-certs package. + (add-after 'install 'install-keystore + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (ice-9 rdelim)) + (let* ((keystore "cacerts") + (certs-dir (search-input-directory inputs + "etc/ssl/certs")) + (keytool (string-append (assoc-ref outputs "jdk") + "/bin/keytool"))) + (define (extract-cert file target) + (call-with-input-file file + (lambda (in) + (call-with-output-file target + (lambda (out) + (let loop ((line (read-line in 'concat)) + (copying? #f)) + (cond + ((eof-object? line) #t) + ((string-prefix? "-----BEGIN" line) + (display line out) + (loop (read-line in 'concat) #t)) + ((string-prefix? "-----END" line) + (display line out) + #t) + (else + (when copying? (display line out)) + (loop (read-line in 'concat) copying?))))))))) + (define (import-cert cert) + (format #t "Importing certificate ~a\n" (basename cert)) + (let ((temp "tmpcert")) + (extract-cert cert temp) + (let ((port (open-pipe* OPEN_WRITE keytool + "-import" + "-alias" (basename cert) + "-keystore" keystore + "-storepass" "changeit" + "-file" temp))) + (display "yes\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (format #t "failed to import ~a\n" cert))) + (delete-file temp))) + + ;; This is necessary because the certificate directory contains + ;; files with non-ASCII characters in their names. + (setlocale LC_ALL "en_US.utf8") + (setenv "LC_ALL" "en_US.utf8") + + (copy-file (string-append (assoc-ref outputs "out") + "/lib/security/cacerts") + keystore) + (chmod keystore #o644) + (for-each import-cert (find-files certs-dir "\\.pem$")) + (mkdir-p (string-append (assoc-ref outputs "out") + "/lib/security")) + (mkdir-p (string-append (assoc-ref outputs "jdk") + "/lib/security")) + + ;; The cacerts files we are going to overwrite are chmod'ed as + ;; read-only (444) in icedtea-8 (which derives from this + ;; package). We have to change this so we can overwrite them. + (chmod (string-append (assoc-ref outputs "out") + "/lib/security/" keystore) #o644) + (chmod (string-append (assoc-ref outputs "jdk") + "/lib/security/" keystore) #o644) + + (install-file keystore + (string-append (assoc-ref outputs "out") + "/lib/security")) + (install-file keystore + (string-append (assoc-ref outputs "jdk") + "/lib/security"))))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1044,6 +1125,7 @@ (define-public openjdk9 ("icedtea-8:jdk" ,icedtea-8 "jdk") ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) @@ -1126,6 +1208,7 @@ (define-public openjdk10 `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))))) @@ -1152,6 +1235,7 @@ (define-public openjdk11 #:modules `((guix build gnu-build-system) (guix build utils) (ice-9 match) + (ice-9 popen) (srfi srfi-1) (srfi srfi-26)) #:disallowed-references (list (gexp-input openjdk10) @@ -1394,6 +1478,7 @@ (define-public openjdk11 openjdk10 `(,openjdk10 "jdk") gnu-make-4.2 + nss-certs pkg-config unzip which From patchwork Thu Nov 2 06:50:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55817 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 9239827BBEA; Thu, 2 Nov 2023 06:52:09 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 8435227BBE9 for ; Thu, 2 Nov 2023 06:52:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYG-0005Ck-D2; Thu, 02 Nov 2023 02:51:36 -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 1qyRYA-0005AR-I0 for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 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 1qyRYA-0001PB-9X for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYg-0004rh-S6; Thu, 02 Nov 2023 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 2/5] guix: ant: Optionally build with java modules. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890788518612 (code B ref 66879); Thu, 02 Nov 2023 06:52:02 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:25 +0000 Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY0-0004px-Uu for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:25 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:44222 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXr-0004pD-KG for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:15 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 406e33c1 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=4z51zshDp9ll2plgeopuz24ND meOJlB72NJ5nPE43oE=; b=IOOKA0YbG9QZKqhOamEJ42jYN2fnwQ3JKm5X3YpfL DLPoxKu6pH7VBSUsPOHk6MNZqpyKWfeFqoADgFH/0/tJC6yPZnCnM/UId+UHDJC7 wIawxzWMJBZLd8/SS0UB/ndWaEZE1LS6t0L6QGsBiKMLB68dEesRjsnsvkcOpz2O W4LJKqQgK/m4d1vmujAu+NbmjN8fOs/AspDhbkOyqC729hawqXNe84vp/2Uwwj3A d0aOLMk6LNsWRDDEtBmENS+Ib/wTkel5QQUGGQGuLlywf9Bw3t5a865ORPiDvTjo uIPWc2iAKadacpJGocKAxfJXvQ5ppy23aMVLjCQzwkqHg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 8d6b222d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:10 +0100 Message-ID: <22eb344213118281d23de74102ba475ca7f33b20.1698907813.git.julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Modules were introduced in Java 9 and are not supported by the default icedtea compiler, so this feature is disabled by default. * guix/build-system/ant.scm (ant-build): Add use-java-modules? parameter. * guix/build/ant-build-system.scm (default-build.xml) (configure): Use it. Change-Id: I3b99238e4cd262332fa5c818be1af5477c7374fd --- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index e191fd3c99..84bf951fab 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -103,6 +103,7 @@ (define* (ant-build name inputs (build-target "jar") (jar-name #f) (main-class #f) + (use-java-modules? #f) (test-include (list "**/*Test.java")) (test-exclude (list "**/Abstract*.java")) (source-dir "src") @@ -131,6 +132,7 @@ (define* (ant-build name inputs #:build-target #$build-target #:jar-name #$jar-name #:main-class #$main-class + #:use-java-modules? #$use-java-modules? #:test-include (list #$@test-include) #:test-exclude (list #$@test-exclude) #:source-dir #$source-dir diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d29912bf59..ced34177f4 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -37,6 +37,7 @@ (define-module (guix build ant-build-system) (define* (default-build.xml jar-name prefix #:optional (source-dir ".") (test-dir "./test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*Test.java"))) "Create a simple build.xml with standard targets for Ant." @@ -65,7 +66,7 @@ (define* (default-build.xml jar-name prefix #:optional (value "first"))) (property (@ (environment "env"))) (path (@ (id "classpath")) - (pathelement (@ (location "${env.CLASSPATH}")))) + (pathelement (@ (path "${env.CLASSPATH}")))) (target (@ (name "manifest")) (mkdir (@ (dir "${manifest.dir}"))) @@ -79,18 +80,30 @@ (define* (default-build.xml jar-name prefix #:optional (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,source-dir) - (destdir "${classes.dir}") - (classpath (@ (refid "classpath")))))) + (destdir "${classes.dir}")) + ,(if use-java-modules? + `((modulepath (@ (refid "classpath")))) + '()) + (classpath (@ (refid "classpath"))))) (target (@ (name "compile-tests")) (mkdir (@ (dir "${test.classes.dir}"))) (javac (@ (includeantruntime "false") (srcdir ,test-dir) (destdir "${test.classes.dir}")) - (classpath - (pathelement (@ (path "${env.CLASSPATH}"))) - (pathelement (@ (location "${classes.dir}"))) - (pathelement (@ (location "${test.classes.dir}")))))) + ,(if use-java-modules? + `((classpath + (pathelement + (@ (path "${env.CLASSPATH}"))) + (pathelement + (@ (location "${classes.dir}"))) + (pathelement + (@ (location "${test.classes.dir}"))))) + '()) + (classpath + (pathelement (@ (path "${env.CLASSPATH}"))) + (pathelement (@ (location "${classes.dir}"))) + (pathelement (@ (location "${test.classes.dir}")))))) (target (@ (name "check") (depends "compile-tests")) @@ -156,13 +169,15 @@ (define* (configure #:key inputs outputs (jar-name #f) (source-dir "src") (test-dir "src/test") (main-class #f) + (use-java-modules? #f) (test-include '("**/*Test.java")) (test-exclude '("**/Abstract*.java")) #:allow-other-keys) (when jar-name (default-build.xml jar-name (string-append (assoc-ref outputs "out") "/share/java") - source-dir test-dir main-class test-include test-exclude)) + source-dir test-dir main-class use-java-modules? + test-include test-exclude)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs)) #t) From patchwork Thu Nov 2 06:50:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55814 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 E86F927BBE2; Thu, 2 Nov 2023 06:51:55 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 0A68D27BBEA for ; Thu, 2 Nov 2023 06:51:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYB-0005Ax-7h; Thu, 02 Nov 2023 02:51:31 -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 1qyRY9-0005A9-K0 for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:29 -0400 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 1qyRY9-0001Nw-Bd for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYh-0004rn-7c; Thu, 02 Nov 2023 02:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 3/5] gnu: Add java-jakarta-json. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890788918624 (code B ref 66879); Thu, 02 Nov 2023 06:52:03 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:29 +0000 Received: from localhost ([127.0.0.1]:53786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY5-0004q9-28 for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:29 -0400 Received: from lepiller.eu ([89.234.186.109]:36636 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXt-0004pM-1w for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:18 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 23935cdb for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=awwLLdcfv7CmBaB3mBrEWOL3D ANCNH1YhP2rEU2/E+k=; b=IdOcq5XyxIwT/hK2/DL5ghZ16tOvbOMXqf2kIpGLL qGdVWYcBhrbEOURO1Oeu4K+cSPvJeZbs/sodzVkEW4dZSAASO7WrTlrmNESAB+tt 2gZ4GbC0pUgDez8HzQCyT9yZaTiwIwGEjJXa7XRPjdT+VhebNYovWbvlba+EnwRC /TTXhwXDF7hIvNrbHJcI9L1es467rm1eKv42bxIu5J4duBuGs4K/aSzXJv1d2ufn izm0ktTiBlkLGAU0eovyZEcGCsr7grvEv+02XlPACwTZE4sPjYpjFDS9tpiS7Rxh LR6ffs3RW/RbT29OAHrUBhmRUlI1BfzJbA1JEOqH7znpA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 64f50238 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:32 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:11 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-jakarta-json): New variable. Change-Id: I2c123710f9d31bf71e8fb86ff0d336b6fcfa9674 --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 567fb05f77..d80e0e9be8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13653,6 +13653,33 @@ (define-public java-jsonp-impl parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) +(define-public java-jakarta-json + (package + (name "java-jakarta-json") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jakartaee/jsonp-api") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q600harqfhlf763l75j4fx7ai7ybp7ga06aiky2a2hg8mhz0s5f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jakarta-json.jar" + #:source-dir "api/src/main/java" + #:tests? #f; no tests + #:jdk ,openjdk11)) + (home-page "https://github.com/jakartaee/jsonp-api") + (synopsis "Portable API for JSON handling in Java") + (description "This project contains API and Compatible Implementation of +Jakarta JSON Processing specification. Jakarta JSON Processing provides +portable APIs to parse, generate, transform, and query JSON documents.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") From patchwork Thu Nov 2 06:50:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55815 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 C7F6327BBE9; Thu, 2 Nov 2023 06:52:00 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2F77B27BBE2 for ; Thu, 2 Nov 2023 06:51:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYD-0005Bb-EW; Thu, 02 Nov 2023 02:51:33 -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 1qyRYA-0005AQ-Gu for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 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 1qyRYA-0001PA-8O for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYh-0004ru-MW; Thu, 02 Nov 2023 02:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 4/5] gnu: Add java-parsson. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890789318634 (code B ref 66879); Thu, 02 Nov 2023 06:52:03 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:33 +0000 Received: from localhost ([127.0.0.1]:53788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRY9-0004qQ-7u for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:33 -0400 Received: from lepiller.eu ([89.234.186.109]:36628 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXu-0004pB-NN for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:19 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 14bba3c1 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +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=vbj+Kd8Pw+jNV/DwcrixkS9Jc NBAXP7J1pX1wvmC8iA=; b=UDqhRpspB3pJLvxnlHR56dIpbjIFmCH/ZNmcy9WAV iQNici5unjwG25yOvUEGMZDNfdIJmZcHeudgQ9ZWbPV0xuJlQL/+AugMZdLm0LTf P7Oe7t+tvqeBK605tue69J8l3G4S9gbk1Vi//OOkiwrCcuVSaxl+8i8GqQM7V8jB znGiAH+0iiOzZzvk7IxaAC4uvm3Fkw+eL8RgKbKT8XwQTenbc1QoGb/ToHAOSklY NO0j0jhQ5EZM06eqG4IYOZ7NcRwHDuKfHYaPUWVGU4nEQUPoQIqPreZlPc1lbbMS ZHZ0JkLOlygYl+oR2Chw9DKVn3gZxX6O9XkmHaotuMeCw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 4d885adb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:12 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-parsson): New variable. Change-Id: Ie564924329e4e0a866e6ed5fe9135c841fb66ae8 --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d80e0e9be8..13b5961c3c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13680,6 +13680,43 @@ (define-public java-jakarta-json ;; with classpath exception (license license:epl2.0))) +(define-public java-parsson + (package + (name "java-parsson") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/parsson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06vvr6qv1ihnk212gdxg4x0sd61lgxk7wf062s7gym5k2h7fms0p")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "parsson.jar" + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test" + #:use-java-modules? #t + #:jdk ,openjdk11 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-resources + (lambda _ + (copy-recursively "impl/src/main/resources" + "build/classes")))))) + (inputs + (list java-jakarta-json)) + (native-inputs + (list java-junit)) + (home-page "https://github.com/eclipse-ee4j/parsson") + (synopsis "Implementation of Jakarta JSON API") + (description "Eclipse Parsson is an implementation of the Jakarta JSON +Processing specification.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") From patchwork Thu Nov 2 06:50:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 55816 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 E0FE327BBE9; Thu, 2 Nov 2023 06:52:04 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 127EF27BBE2 for ; Thu, 2 Nov 2023 06:52:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyRYC-0005B0-I8; Thu, 02 Nov 2023 02:51:32 -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 1qyRYA-0005AP-GZ for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 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 1qyRYA-0001P9-89 for guix-patches@gnu.org; Thu, 02 Nov 2023 02:51:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyRYi-0004s6-5Y; Thu, 02 Nov 2023 02:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66879] [PATCH v2 5/5] gnu: josm: Update to 18822. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 06:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66879@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66879-submit@debbugs.gnu.org id=B66879.169890789718650 (code B ref 66879); Thu, 02 Nov 2023 06:52:04 +0000 Received: (at 66879) by debbugs.gnu.org; 2 Nov 2023 06:51:37 +0000 Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRYD-0004qa-DT for submit@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:37 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:44222 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyRXw-0004pD-2y for 66879@debbugs.gnu.org; Thu, 02 Nov 2023 02:51:22 -0400 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id af636de8 for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:34 +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=P8cvRSeKGn839Hs7EUqLusdWF KESq7eEFOcAH72V+KM=; b=XQoWR7KQfHzHaxH30++7/UWC1LedRn+hx3mCQkgbV lhU9ZNxMAP/84o/tFTkN8AkhWgajMUrFWQBXxBCczTp+j4aRXzkhAbUENpFtBZSo 6Y+fF7JPFDSYfTTrZlpEUUt5kEVFhh7lDxm1/DiOSZx+lt2viCNhMlMF3zvntiJ8 QxcharEKqHHBLll50XjcbYw3qmQyL+3xka7PsAFl9cSGJG00hweFUou/36TE0mBA DNhsDe1D4UVqsGmxZ0t2RyrEJNUq8OZiaxnCcC89obEysbY9r5Rw3SK6PIYslAPM d2gpBvGw338WdwI6aUes4K6tAk8iMdqSG3EEik6jP/6MQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 61a240bc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66879@debbugs.gnu.org>; Thu, 2 Nov 2023 06:50:33 +0000 (UTC) From: Julien Lepiller Date: Thu, 2 Nov 2023 07:50:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (josm): Update to 18822. [inputs]: Use new json implementation. [arguments]: Use openjdk11 to prevent warning at startup. Change-Id: I393e0ed765d1d0da7870595d2eccefae17836eb9 --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a33d446201..dbc8440141 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1940,7 +1940,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18646") + (version "18822") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) + "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,17 +1963,18 @@ (define-public josm (list java-commons-jcs java-commons-compress java-jmapviewer - java-jsonp-api - java-jsonp-impl ; runtime dependency + java-jakarta-json java-jsr305 java-metadata-extractor java-opening-hours-parser java-openjfx-media + java-parsson ; runtime dependency java-signpost-core java-svg-salamander)) (arguments `(#:tests? #f #:jar-name "josm.jar" + #:jdk ,openjdk11 #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-build.xml