me/guix
Archived
1
0
Fork 0
Code Activity

gnu: icedtea-6: Modify certificate import to not fail for icedtea-8.

Browse source 
Co-authored-by: Roel Janssen <roel@gnu.org>

* gnu/packages/java.scm (icedtea-6)[arguments]: Do not fail install-keystore
phase when attempting to import unsupported certificate types.  Also ensure
that the keystore is able to be written to before copying it.
(icedtea-8)[arguments]: Restore "install-keystore" phase.
This commit is contained in:
Carlo Zancanaro 2017-02-26 11:34:44 +11:00 • committed by Ricardo Wurmus
parent 428af2c683
commit ea9e58ef66
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/java.scm
View file

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -706,7 +707,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
"-file" temp))) "-file" temp)))
(display "yes\n" port) (display "yes\n" port)
(when (not (zero? (status:exit-val (close-pipe port)))) (when (not (zero? (status:exit-val (close-pipe port))))
(error "failed to import" cert))) (format #t "failed to import ~a\n" cert)))
(delete-file temp))) (delete-file temp)))
;; This is necessary because the certificate directory contains ;; This is necessary because the certificate directory contains
@ -719,6 +720,15 @@ build process and its dependencies, whereas Make uses Makefile format.")
"/lib/security")) "/lib/security"))
(mkdir-p (string-append (assoc-ref outputs "jdk") (mkdir-p (string-append (assoc-ref outputs "jdk")
"/jre/lib/security")) "/jre/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")
"/jre/lib/security/" keystore) #o644)
(install-file keystore (install-file keystore
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/security")) "/lib/security"))
@ -1023,9 +1033,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(find-files "openjdk.src/jdk/src/solaris/native" (find-files "openjdk.src/jdk/src/solaris/native"
"\\.c|\\.h")) "\\.c|\\.h"))
#t))) #t)))
;; FIXME: This phase is needed but fails with this version of
;; IcedTea.
(delete 'install-keystore)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc") (let ((doc (string-append (assoc-ref outputs "doc")