From 7760d28920a920791645c4485f1345af45ee7787 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Jul 2021 14:07:00 +0300 Subject: gnu: java-xz: Mark source as zipbomb. * gnu/packages/java-compression.scm (java-xz)[source]: Download source as zipbomb. [argments]: Remove custom 'chdir phase. --- gnu/packages/java-compression.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 5f653bcc94..19b11954c1 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -291,7 +291,7 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / (name "java-xz") (version "1.6") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://tukaani.org/xz/xz-java-" version ".zip")) (sha256 (base32 @@ -301,12 +301,6 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / `(#:tests? #f; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - ;; Our build system enters the first directory in the archive, but - ;; the package is not contained in a subdirectory - (chdir "..") - #t)) (add-before 'install 'generate-pom (lambda _ (copy-file "maven/pom_template.xml" "pom.xml") -- cgit v1.2.3 From 998712606557a2ee80dc3e113da5fb15ad1886cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Jul 2021 14:47:24 +0300 Subject: gnu: java-xz: Update to 1.9. * gnu/packages/java-compression.scm (java-xz): Update to 1.9. [arguments]: Build with openjdk9. --- gnu/packages/java-compression.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 19b11954c1..033b55c988 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -289,16 +290,17 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / (define-public java-xz (package (name "java-xz") - (version "1.6") + (version "1.9") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://tukaani.org/xz/xz-java-" version ".zip")) (sha256 (base32 - "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x")))) + "007d9f83277qn70swz9inqhyf0qxq6ygajpq5rqg0xgsyh1sdndi")))) (build-system ant-build-system) (arguments `(#:tests? #f; no tests + #:jdk ,openjdk9 #:phases (modify-phases %standard-phases (add-before 'install 'generate-pom -- cgit v1.2.3