main/openjdk7: security update to icedtea 2.5.5

S8059064: Better G1 log caching
S8060461: Fix for JDK-8042609 uncovers additional issue
S8064601, CVE-2015-0480: Improve jar file handling
S8065286: Fewer subtable substitutions
S8065291: Improved font lookups
S8066479: Better certificate chain validation
S8067050: Better font consistency checking
S8067684: Better font substitutions
S8067699, CVE-2015-0469: Better glyph storage
S8068320, CVE-2015-0477: Limit applet requests
S8068720, CVE-2015-0488: Better certificate options checking
S8069198: Upgrade image library
S8071726, CVE-2015-0478: Better RSA optimizations
S8071818: Better vectorization on SPARC
S8071931, CVE-2015-0460: Return of the phantom menace

2 files changed, 30 insertions, 48 deletions

diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 23190b9849..2991660fb7 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk7
-_icedteaver=2.5.4
+_icedteaver=2.5.5
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
-pkgver=7.75.$_icedteaver
-pkgrel=2
+pkgver=7.79.$_icedteaver
+pkgrel=0
 pkgdesc="Sun OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="x86 x86_64"
@@ -72,7 +72,6 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
 	icedtea-jdk-fix-ipv6-init.patch
 	icedtea-jdk-musl.patch
 	icedtea-jdk-no-soname.patch
-	icedtea-jdk-giflib51.patch
 	"
 
 # icedtea6-1.9.7-generate_cacerts-1.patch
@@ -229,14 +228,14 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-md5sums="646064d7a8d57c2cae0ef35a05de57c8  icedtea-2.5.4.tar.gz
-90c83c73214a083b24adfee9a1be56a4  openjdk-2.5.4.tar.bz2
-06235b1e4b024402d6ec5cf0672cc353  corba-2.5.4.tar.bz2
-d3ffad8f8b415f002fd0f308279accbc  jaxp-2.5.4.tar.bz2
-03bb3aa6f03765816adf3d312feed05e  jaxws-2.5.4.tar.bz2
-4e848b426d98b60523f71e9f35edfff8  jdk-2.5.4.tar.bz2
-ffc690fecd801662d4b4f8874aecbc68  langtools-2.5.4.tar.bz2
-c3bbd2ff7bf67eae93f9c55ad3ff3b91  hotspot-2.5.4.tar.bz2
+md5sums="2b639a72a976c0cdc743ab5e18bd2369  icedtea-2.5.5.tar.gz
+6edc6aa04cb261ebc382d53e7072d946  openjdk-2.5.5.tar.bz2
+999fa486ab1eaddaba220c19d24d1b33  corba-2.5.5.tar.bz2
+139a569cf9d78ae7354fd407750a6fe2  jaxp-2.5.5.tar.bz2
+7bc5e8735d9db574caf1c658d248f69a  jaxws-2.5.5.tar.bz2
+81ee4210f1c4315af9069f8153a8e7a1  jdk-2.5.5.tar.bz2
+117ae9e846a00e287060035b930c299d  langtools-2.5.5.tar.bz2
+51b6547c4a27c4cf6a134dca0f59e3ae  hotspot-2.5.5.tar.bz2
 9a2826a1819aa128629778217af36c55  apache-ant-1.9.2-bin.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
 f87dd2c4c3c97fc3ac33080a65ca9e14  icedtea-hotspot-musl.patch
@@ -246,16 +245,15 @@ aefe00f7f9b91805f402efad9208dd53  icedtea-hotspot-noagent-musl.patch
 bd623081d5d2e63694c3649975b12412  icedtea-jdk-execinfo.patch
 250b0807b59762670954b132e8f8dfba  icedtea-jdk-fix-ipv6-init.patch
 66f6e66eb135f0d88847910f6581d323  icedtea-jdk-musl.patch
-d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch
-529dd5e5372112470dacc08c95b0c22a  icedtea-jdk-giflib51.patch"
-sha256sums="5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800  icedtea-2.5.4.tar.gz
-88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1  openjdk-2.5.4.tar.bz2
-7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b  corba-2.5.4.tar.bz2
-84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3  jaxp-2.5.4.tar.bz2
-4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b  jaxws-2.5.4.tar.bz2
-e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09  jdk-2.5.4.tar.bz2
-4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a  langtools-2.5.4.tar.bz2
-4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34  hotspot-2.5.4.tar.bz2
+d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch"
+sha256sums="f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619  icedtea-2.5.5.tar.gz
+5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d  openjdk-2.5.5.tar.bz2
+f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51  corba-2.5.5.tar.bz2
+293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256  jaxp-2.5.5.tar.bz2
+76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be  jaxws-2.5.5.tar.bz2
+c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483  jdk-2.5.5.tar.bz2
+71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660  langtools-2.5.5.tar.bz2
+d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb  hotspot-2.5.5.tar.bz2
 cab1b8754e5f1f2aa869e2ba603903ae5e81a585de4eafd00f173531a11b5a45  apache-ant-1.9.2-bin.tar.gz
 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1  rhino1_7R3.zip
 a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e  icedtea-hotspot-musl.patch
@@ -265,16 +263,15 @@ afed589db3dbd89513fc890d5b315ca2a5953e8915ff2f24d38448ec145266e9  icedtea-hotspo
 6cebef19d8eec5a4623a96c37ae71b79d124a10478c1db33ad5fc71bc04b30e9  icedtea-jdk-execinfo.patch
 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5  icedtea-jdk-fix-ipv6-init.patch
 b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc  icedtea-jdk-musl.patch
-6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch
-77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9  icedtea-jdk-giflib51.patch"
-sha512sums="2014afcde6c6798fd9ac2a39dc3515b152809bd888d5c1f69ce431f3e04d696de873e5a6aa085317a73efda2270ec6c4f8ac0eb255493f58c159d2c3560acd34  icedtea-2.5.4.tar.gz
-1f53421a3eae13003290b762150e6c24cceee11e1ff9c68f8097a7e88b6befe0b7f80f44e28f61f009c18991ea72cbda5514e6a884b982e630706c4c9afba64e  openjdk-2.5.4.tar.bz2
-d1d9b085d4f514a3a8ae01c61ee2f828fe35f78bf1a81ec481e33494e679870dad07518176f77188b9617973839259004a4b13f7815031e488bfc0302c260462  corba-2.5.4.tar.bz2
-85caaed404ab953481de90e4a50b29bf92eb3e676fd6cdc954fd8a9592f0d6ed9938c1390e7ce862ac48c6e502ae6dd4bd76294dbe1f56cd5362f3965a191eee  jaxp-2.5.4.tar.bz2
-461a49455176d35806e69a4f7585719f6d77adcb10966a4bf7b1bfbde86dae5117bb1c6a0f79eaf7f41d4b95ecc83255843d80d3fb7d39265bee844f8e7bfd22  jaxws-2.5.4.tar.bz2
-d3f3cedfd1532f5a64e5ab7e0c651ca16f7c98082d7d9c7c8961f348fde9d7a1c040d6361b515812098533c44dc44092d3467d096a5e73f76823062d06773730  jdk-2.5.4.tar.bz2
-2fd48f7c4fed57afe9058a3f012ef4ecbaa121bde43fade5d0795effef48dadc7e2f1735aa8b1a4df2784fa013c1c89082e19c4b7d41845f8c2b242a072a6d1d  langtools-2.5.4.tar.bz2
-3a55c4052861d6f736f41264588a461e0a97a2b820016499c5e4e15601e920f5f9024519948f21a22c17d9486ae408979044700d13e97f82317135c928c22659  hotspot-2.5.4.tar.bz2
+6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch"
+sha512sums="91b9b17556c03b4ec836d02e4b0a892a5638cdb7f125b5d203f59f5458acd28486b122d0809eb33709502beddff00130d05b8760549e223cb02fa172d7a7c138  icedtea-2.5.5.tar.gz
+7c652e8a441e7732ac62b1ffff26c9b6478232235207120c55de3fcf5246af96a7be1a3e89f8373f01ba915dd68d32f52a46dc970ec3a632966c400fc04279cf  openjdk-2.5.5.tar.bz2
+22da9802c9354a96ba1440568d698ae5fec14db89668d665e169a571d26627f7343f1a42bdbb84d4d647d4694380bb49a987ce2cf190507614b76493bc2cbd06  corba-2.5.5.tar.bz2
+1f3296081493324c410ff053195f4766918cb14ab62b3630cab22b84e00200b6a69f95bbd00bd3e98c6218c0bc63e3c71fc777aef3186d696dce4be34e9023b5  jaxp-2.5.5.tar.bz2
+21961675d9b7277e9b1285c4182ba9cef14dbff88fe80cffbcdfe3c0062d23b2296aa568571b68a35dbe46b6ab50a7eb63bedd4de422724239af79240ff67163  jaxws-2.5.5.tar.bz2
+e93864204ddc263caa1e8fc366723b5e3bf774040d9af3a49ab379f3d20888f3228d1712edd07c37d7e29b2fc6961e21aff106d4a91e2646aa45f082bb93c1cc  jdk-2.5.5.tar.bz2
+5a86c77bedd3a65d94ee7ef37eda4008bc07603b4085e63ae547b17c8c6d723441fc0919be63dd9530626ad02fb9fbdb6723cadfe0d25deb6c4044af2ba60546  langtools-2.5.5.tar.bz2
+ba6c9cca89537837fbb201a29a634a6775bcbcc988bb145aa661183c57498db586d24046ccc27df2cb84d6971a3830942cec669a764a295696391015592d5dbd  hotspot-2.5.5.tar.bz2
 618c0c3d80f7c44c2bb8cdfdc2b5278ccd926ab1aa0c8f7099bd0ad5cb4c090f023c0b86c8267052a0a6b1ac57076296fcc16042b9e7a72a1482af63c99e0e49  apache-ant-1.9.2-bin.tar.gz
 77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36  rhino1_7R3.zip
 994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933  icedtea-hotspot-musl.patch
@@ -284,5 +281,4 @@ d3f3cedfd1532f5a64e5ab7e0c651ca16f7c98082d7d9c7c8961f348fde9d7a1c040d6361b515812
 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb  icedtea-jdk-execinfo.patch
 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5  icedtea-jdk-musl.patch
-bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch
-b4a90ef63dbaec764569a671f850db42a2257b729858923a3831dafaa098c61a635462ee5c72e7fb3ddb2e54d6ee98ff69bf2b4b4f3ec9310f54caf7739e9e82  icedtea-jdk-giflib51.patch"
+bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch"
diff --git a/main/openjdk7/icedtea-jdk-giflib51.patch b/main/openjdk7/icedtea-jdk-giflib51.patch
deleted file mode 100644
index a9361573cf..0000000000
--- a/main/openjdk7/icedtea-jdk-giflib51.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig	2014-05-27 22:17:19.766866065 +0200
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2014-05-27 22:16:35.452894426 +0200
-@@ -310,7 +310,11 @@
-     free(pBitmapBits);
-     free(pOldBitmapBits);
- 
-+#if GIFLIB_MAJOR >= 5
-+    DGifCloseFile(gif, NULL);
-+#else
-     DGifCloseFile(gif);
-+#endif
- 
-     return 1;
- }