main/openjdk7: upgrade to icedtea 2.6.1

S8043202, CVE-2015-2808: Prohibit RC4 cipher suites
S8067694, CVE-2015-2625: Improved certification checking
S8071715, CVE-2015-4760: Tune font layout engine
S8071731: Better scaling for C1
S8072490: Better font morphing redux
S8072887: Better font handling improvements
S8073334: Improved font substitutions
S8073773: Presume path preparedness
S8073894: Getting to the root of certificate chains
S8074330: Set font anchors more solidly
S8074335: Substitute for substitution formats
S8074865, CVE-2015-2601: General crypto resilience changes
S8074871: Adjust device table handling
S8075374, CVE-2015-4748: Responding to OCSP responses
S8075378, CVE-2015-4749: JNDI DnsClient Exception Handling
S8075738: Better multi-JVM sharing
S8075833, CVE-2015-2613: Straighter Elliptic Curves
S8075838: Method for typing MethodTypes
S8075853, CVE-2015-2621: Proxy for MBean proxies
S8076328, CVE-2015-4000: Enforce key exchange constraints
S8076376, CVE-2015-2628: Enhance IIOP operations
S8076397, CVE-2015-4731: Better MBean connections
S8076401, CVE-2015-2590: Serialize OIS data
S8076405, CVE-2015-4732: Improve serial serialization
S8076409, CVE-2015-4733: Reinforce RMI framework
S8077520, CVE-2015-2632: Morph tables into improved form
PR2487, CVE-2015-4000: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize

2 files changed, 46 insertions, 51 deletions

diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 2991660fb7..0969b26092 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk7
-_icedteaver=2.5.5
+_icedteaver=2.6.1
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
-pkgver=7.79.$_icedteaver
+pkgver=7.85.$_icedteaver
 pkgrel=0
 pkgdesc="Sun OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
@@ -18,7 +18,7 @@ makedepends="findutils tar zip file paxmark gawk util-linux libxslt
 	     nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev
 	     lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
 	     libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
-	     gtk+2.0-dev krb5-dev attr-dev"
+	     gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev"
 install=""
 
 # upstream binary versions
@@ -228,54 +228,54 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-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
+md5sums="efac44117a94b9d3278988959e336e05  icedtea-2.6.1.tar.gz
+d330560d5e9f443aa0e26130ca111a3f  openjdk-2.6.1.tar.bz2
+0de3ec4198c437e3cbc58420c65146e1  corba-2.6.1.tar.bz2
+8fa2bf64a4c27fea33f5fa60df6bcce6  jaxp-2.6.1.tar.bz2
+ebb952f8d77498fd8e5f0a1f27e2a6a2  jaxws-2.6.1.tar.bz2
+e242c40b5d7f4cfa52a0071c2836ba34  jdk-2.6.1.tar.bz2
+1bf69ee4265e49516283aa9126ceb80d  langtools-2.6.1.tar.bz2
+1a2fae086d50fc1ad69b72b4cf5baa3a  hotspot-2.6.1.tar.bz2
 9a2826a1819aa128629778217af36c55  apache-ant-1.9.2-bin.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
 f87dd2c4c3c97fc3ac33080a65ca9e14  icedtea-hotspot-musl.patch
-aefe00f7f9b91805f402efad9208dd53  icedtea-hotspot-noagent-musl.patch
+bf8b50e157d80a8b884c1aa4f8124812  icedtea-hotspot-noagent-musl.patch
 43023861c5f6efc3139a834aa3ec0476  icedtea-hotspot-uclibc-fixes.patch
 07c7ab583808e8c8ceb46aff9c265aa4  icedtea-jdk-fix-build.patch
 bd623081d5d2e63694c3649975b12412  icedtea-jdk-execinfo.patch
 250b0807b59762670954b132e8f8dfba  icedtea-jdk-fix-ipv6-init.patch
 66f6e66eb135f0d88847910f6581d323  icedtea-jdk-musl.patch
 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
+sha256sums="491866e57199b0bc99d716be3eabaab97d9f6a698d1a652d748baeddeedfe963  icedtea-2.6.1.tar.gz
+0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f  openjdk-2.6.1.tar.bz2
+cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8  corba-2.6.1.tar.bz2
+c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb  jaxp-2.6.1.tar.bz2
+2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f  jaxws-2.6.1.tar.bz2
+a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363  jdk-2.6.1.tar.bz2
+6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43  langtools-2.6.1.tar.bz2
+00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3  hotspot-2.6.1.tar.bz2
 cab1b8754e5f1f2aa869e2ba603903ae5e81a585de4eafd00f173531a11b5a45  apache-ant-1.9.2-bin.tar.gz
 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1  rhino1_7R3.zip
 a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e  icedtea-hotspot-musl.patch
-afed589db3dbd89513fc890d5b315ca2a5953e8915ff2f24d38448ec145266e9  icedtea-hotspot-noagent-musl.patch
+1d937de95323094294c33dd490fc460f78502259eee3bf4b352ac7c7c6cf626f  icedtea-hotspot-noagent-musl.patch
 0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745  icedtea-hotspot-uclibc-fixes.patch
 33b18e827a13cc46be11a4491deefac171c8c2c4fbdd3e0cb4a5fdafa560f958  icedtea-jdk-fix-build.patch
 6cebef19d8eec5a4623a96c37ae71b79d124a10478c1db33ad5fc71bc04b30e9  icedtea-jdk-execinfo.patch
 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5  icedtea-jdk-fix-ipv6-init.patch
 b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc  icedtea-jdk-musl.patch
 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
+sha512sums="6e3df56f605fa026cf028cd3e2ff22215b78b86fea6231e9e5229d43b04f82d91103506c4ca572d953ab0d52fab8b8846077244f3be32b9be5bd9ccdf848fc40  icedtea-2.6.1.tar.gz
+b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28  openjdk-2.6.1.tar.bz2
+16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12  corba-2.6.1.tar.bz2
+1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493  jaxp-2.6.1.tar.bz2
+0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0  jaxws-2.6.1.tar.bz2
+d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c  jdk-2.6.1.tar.bz2
+38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f  langtools-2.6.1.tar.bz2
+ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c  hotspot-2.6.1.tar.bz2
 618c0c3d80f7c44c2bb8cdfdc2b5278ccd926ab1aa0c8f7099bd0ad5cb4c090f023c0b86c8267052a0a6b1ac57076296fcc16042b9e7a72a1482af63c99e0e49  apache-ant-1.9.2-bin.tar.gz
 77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36  rhino1_7R3.zip
 994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933  icedtea-hotspot-musl.patch
-2b2cdf2c27f95ba5557748bcc49c27e498a1e2efb3526da8dea847f3b0a0776dfdd403e898c9bec9187135750183c89bde183c6fc6112109e39d984df77e9b44  icedtea-hotspot-noagent-musl.patch
+e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc  icedtea-hotspot-noagent-musl.patch
 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a  icedtea-hotspot-uclibc-fixes.patch
 213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458  icedtea-jdk-fix-build.patch
 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb  icedtea-jdk-execinfo.patch
diff --git a/main/openjdk7/icedtea-hotspot-noagent-musl.patch b/main/openjdk7/icedtea-hotspot-noagent-musl.patch
index 627149fd46..37604acca0 100644
--- a/main/openjdk7/icedtea-hotspot-noagent-musl.patch
+++ b/main/openjdk7/icedtea-hotspot-noagent-musl.patch
@@ -1,7 +1,6 @@
-diff -ru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2014-06-05 21:19:11.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/defs.make	2014-07-15 07:16:37.789777380 +0000
-@@ -306,6 +306,9 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make
++++ openjdk/hotspot/make/linux/makefiles/defs.make
+@@ -327,6 +327,9 @@
  
  # Serviceability Binaries
  # No SA Support for PPC, IA64, ARM or zero
@@ -11,20 +10,19 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/mak
  ADD_SA_BINARIES/x86   = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
                          $(EXPORT_LIB_DIR)/sa-jdi.jar 
  ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
-@@ -323,6 +326,10 @@
+@@ -343,6 +346,10 @@
+       endif
      endif
    endif
- endif
++endif
 +else
 +ADD_SA_BINARIES/x86   =
 +ADD_SA_BINARIES/sparc =
-+endif
+ endif
  ADD_SA_BINARIES/ppc   = 
  ADD_SA_BINARIES/ppc64 = 
- ADD_SA_BINARIES/ia64  = 
-diff -ru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
---- openjdk.orig/hotspot/make/linux/makefiles/sa.make	2014-06-05 21:19:11.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/sa.make	2014-07-15 07:16:37.789777380 +0000
+--- openjdk.orig/hotspot/make/linux/makefiles/sa.make
++++ openjdk/hotspot/make/linux/makefiles/sa.make
 @@ -59,9 +59,11 @@
  
  # if $(AGENT_DIR) does not exist, we don't build SA
@@ -35,13 +33,12 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/
 -	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
 +	if [ -d $(AGENT_DIR) -a -f /usr/include/thread_db.h \
 +             -a "$(SRCARCH)" != "ia64" \
-              -a "$(SRCARCH)" != "zero" ] ; then \
+              -a "$(SRCARCH)" != "zero"  \
+              -a "$(SRCARCH)" != "aarch64" ] ; then \
  	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
- 	fi
-diff -ru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make	2014-06-05 21:19:11.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make	2014-07-15 07:16:37.789777380 +0000
-@@ -65,12 +65,15 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -65,10 +65,13 @@
  
  # if $(AGENT_DIR) does not exist, we don't build SA
  # also, we don't build SA on Itanium or zero.
@@ -49,11 +46,9 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/m
  
 +ifneq ($(wildcard /usr/include/thread_db.h),)
  ifneq ($(wildcard $(AGENT_DIR)),)
- ifneq ($(filter-out ia64 zero,$(SRCARCH)),)
+ ifneq ($(filter-out ia64 zero aarch64,$(SRCARCH)),)
    BUILDLIBSAPROC = $(LIBSAPROC)
++endif
  endif
  endif
-+endif
  
- ifneq ($(ALT_SASRCDIR),)
- ALT_SAINCDIR=-I$(ALT_SASRCDIR)