amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: icedtea: Update to 1.13.11.

Browse source 
Fixes CVE-2016-{0686, 0687, 0695, 3425, 3427}.

* gnu/packages/patches/icedtea-remove-overrides.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (icedtea): Update to 1.13.11.
[source]: Use the patch.
[inputs]: Add libxcomposite.
This commit is contained in:
Leo Famulari 2016-05-27 23:50:51 -04:00
parent f0e60e89cb
commit 1c6303fae0
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
3 changed files with 298 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/java.scm
View file

@ -181,15 +181,16 @@ build process and its dependencies, whereas Make uses Makefile format.")
(define-public icedtea-6
(package
(name "icedtea")
(version "1.13.10")
(version "1.13.11")
(source (origin
(method url-fetch)
(uri (string-append
"http://icedtea.wildebeest.org/download/source/icedtea6-"
version ".tar.xz"))
(patches (search-patches "icedtea-remove-overrides.patch"))
(sha256
(base32
"1mq08sfyfjlfw0c1czjs47303zv4h91s1jc0nhdlra4rbbx0g2d0"))
"1grki39a4rf8n74zc0iglcggxxbpniyfh1gk1lb10p63zvvcsvjj"))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile.in"
@ -539,6 +540,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
("mit-krb5" ,mit-krb5)
("nss" ,nss)
("libx11" ,libx11)
("libxcomposite" ,libxcomposite)
("libxt" ,libxt)
("libxtst" ,libxtst)
("libxi" ,libxi)
@ -552,10 +554,10 @@ build process and its dependencies, whereas Make uses Makefile format.")
("openjdk6-src"
,(origin
(method url-fetch)
(uri "https://java.net/downloads/openjdk6/openjdk-6-src-b38-20_jan_2016.tar.gz")
(uri "https://java.net/downloads/openjdk6/openjdk-6-src-b39-03_may_2016.tar.gz")
(sha256
(base32
"1fapj9w4ahzf5nwvdgi1dsxjyh9dqbcvf9638r60h1by13wjqk5p"))))
"1brxbsgwcj4js26y5lk6capc3pvghgjidvv9cavw6z8n7c7aw8af"))))
("lcms" ,lcms)
("zlib" ,zlib)
("gtk" ,gtk+-2)