main/openjdk7: security upgrade to icedtea 2.4.7

S8023046: Enhance splashscreen support
S8025005: Enhance CORBA initializations
S8025010, CVE-2014-2412: Enhance AWT contexts
S8025030, CVE-2014-2414: Enhance stream handling
S8025152, CVE-2014-0458: Enhance activation set up
S8026067: Enhance signed jar verification
S8026163, CVE-2014-2427: Enhance media provisioning
S8026188, CVE-2014-2423: Enhance envelope factory
S8026200: Enhance RowSet Factory
S8026716, CVE-2014-2402: (aio) Enhance asynchronous channel handling
S8026736, CVE-2014-2398: Enhance Javadoc pages
S8026797, CVE-2014-0451: Enhance data transfers
S8026801, CVE-2014-0452: Enhance endpoint addressing
S8027766, CVE-2014-0453: Enhance RSA processing
S8027775: Enhance ICU code.
S8027841, CVE-2014-0429: Enhance pixel manipulations
S8028385: Enhance RowSet Factory
S8029282, CVE-2014-2403: Enhance CharInfo set up
S8029286: Enhance subject delegation
S8029699: Update Poller demo
S8029730: Improve audio device additions
S8029735: Enhance service mgmt natives
S8029740, CVE-2014-0446: Enhance handling of loggers
S8029745, CVE-2014-0454: Enhance algorithm checking
S8029750: Enhance LCMS color processing (in-tree LCMS)
S8029760, CVE-2013-6629: Enhance AWT image libraries (in-tree libjpeg)
S8029844, CVE-2014-0455: Enhance argument validation
S8029854, CVE-2014-2421: Enhance JPEG decodings
S8029858, CVE-2014-0456: Enhance array copies
S8030731, CVE-2014-0460: Improve name service robustness
S8031330: Refactor ObjectFactory
S8031335, CVE-2014-0459: Better color profiling (in-tree LCMS)
S8031352, CVE-2013-6954: Enhance PNG handling (in-tree libpng)
S8031394, CVE-2014-0457: (sl) Fix exception handling in ServiceLoader
S8031395: Enhance LDAP processing
S8032686, CVE-2014-2413: Issues with method invoke
S8033618, CVE-2014-1876: Correct logging output
S8034926, CVE-2014-2397: Attribute classes properly
S8036794, CVE-2014-0461: Manage JavaScript instances

A myriad of regular bug fixes. And ARM JIT is now enabled by default.

3 files changed, 69 insertions, 51 deletions

diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 81087c22c..781192562 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk7
-_icedteaver=2.4.5
-_openjdkupdate=51
+_icedteaver=2.4.7
+_openjdkupdate=55
 pkgver=7.$_openjdkupdate.$_icedteaver
 pkgrel=0
 pkgdesc="Sun OpenJDK 7 via IcedTea"
@@ -22,14 +22,14 @@ install=""
 RHINO_VER=1_7R3
 ANT_VER=1.9.2
 # hashes from $_builddir/Makefile.am
-_CORBA_CHANGESET=3594dbde270d
-_JAXP_CHANGESET=8fe156ad49e2
-_JAXWS_CHANGESET=32ea8b1ed91a
-_JDK_CHANGESET=9db88c18e114
-_LANGTOOLS_CHANGESET=dabd37b7e295
-_OPENJDK_CHANGESET=410eb7fef869
+_CORBA_CHANGESET=e6ad5b912691
+_JAXP_CHANGESET=94b7e8e0d96f
+_JAXWS_CHANGESET=bd9a50a78d04
+_JDK_CHANGESET=9448fff93286
+_LANGTOOLS_CHANGESET=8c26a3c39128
+_OPENJDK_CHANGESET=13970e76b784
 # hash from $_builddir/hotspot.map
-_HOTSPOT_CHANGESET=2cb58882dac3
+_HOTSPOT_CHANGESET=69b542696e5b
 
 case $CARCH in
 x86)	_jarch=i386;;
@@ -70,6 +70,7 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
 	ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino$RHINO_VER.zip
 
 	fix-paxctl-args.patch
+	icedtea-build-paxmark.patch
 	icedtea-hotspot-musl.patch
 	icedtea-hotspot-noagent-musl.patch
 	icedtea-hotspot-uclibc-fixes.patch
@@ -228,17 +229,18 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-md5sums="6dcc544657ade213d01017354a6f9858  icedtea-2.4.5.tar.gz
-09b9db8ca0b833070326573c3dac56e2  openjdk-410eb7fef869.tar.gz
-adf888756629bdcb37f71451269ac42e  corba-3594dbde270d.tar.gz
-1c42344779d49baed24724535a7e2c9b  jaxp-8fe156ad49e2.tar.gz
-256148d7e7f5619addde91fd14bc3361  jaxws-32ea8b1ed91a.tar.gz
-3370074398071b4104e0e89efc9a4a56  jdk-9db88c18e114.tar.gz
-7605555236ffd8ac6bdedc6bc9b61c26  langools-dabd37b7e295.tar.gz
-67bb16313215e6da72bda7dc0090bb6a  hotspot-2cb58882dac3.tar.gz
+md5sums="3e2c46f5b0bce2821af79bb286b451b8  icedtea-2.4.7.tar.gz
+b0295fd54825d3f47d47de81d81a475a  openjdk-13970e76b784.tar.gz
+0a8f2235307b68553865ac38192690c7  corba-e6ad5b912691.tar.gz
+ba7a21a3ef2ce5d0d47c7015e43c5dcf  jaxp-94b7e8e0d96f.tar.gz
+9ef2ea5b1e87777c75a72e1dca6fab1d  jaxws-bd9a50a78d04.tar.gz
+cea74e96852bf017f73222fa7045daee  jdk-9448fff93286.tar.gz
+449cec19b80ab70935d02d03e3cbc568  langools-8c26a3c39128.tar.gz
+0381ef3920f1ff5c8ac6c8860974d8cc  hotspot-69b542696e5b.tar.gz
 9a2826a1819aa128629778217af36c55  apache-ant-1.9.2-bin.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
-8139e04d07c765d6255a373985b45eb7  fix-paxctl-args.patch
+7ea70e69d307dfb801a198bce51405b0  fix-paxctl-args.patch
+86829ac37f02f0d631ddde5f164a0015  icedtea-build-paxmark.patch
 f87dd2c4c3c97fc3ac33080a65ca9e14  icedtea-hotspot-musl.patch
 573e12eeae80a34541f00d5be75d6c0f  icedtea-hotspot-noagent-musl.patch
 43023861c5f6efc3139a834aa3ec0476  icedtea-hotspot-uclibc-fixes.patch
@@ -248,17 +250,18 @@ bd623081d5d2e63694c3649975b12412  icedtea-jdk-execinfo.patch
 7c0814181e5adc0763c5c0a24b01d4cb  icedtea-jdk-iconv-uclibc.patch
 5b1b624b7127434c0c6329d733c917c9  icedtea-jdk-musl.patch
 d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch"
-sha256sums="10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d  icedtea-2.4.5.tar.gz
-2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707  openjdk-410eb7fef869.tar.gz
-d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d  corba-3594dbde270d.tar.gz
-0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3  jaxp-8fe156ad49e2.tar.gz
-08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0  jaxws-32ea8b1ed91a.tar.gz
-285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e  jdk-9db88c18e114.tar.gz
-86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f  langools-dabd37b7e295.tar.gz
-d8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9  hotspot-2cb58882dac3.tar.gz
+sha256sums="754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1  icedtea-2.4.7.tar.gz
+bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b  openjdk-13970e76b784.tar.gz
+cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674  corba-e6ad5b912691.tar.gz
+3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea  jaxp-94b7e8e0d96f.tar.gz
+3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d  jaxws-bd9a50a78d04.tar.gz
+9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be  jdk-9448fff93286.tar.gz
+5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b  langools-8c26a3c39128.tar.gz
+e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65  hotspot-69b542696e5b.tar.gz
 cab1b8754e5f1f2aa869e2ba603903ae5e81a585de4eafd00f173531a11b5a45  apache-ant-1.9.2-bin.tar.gz
 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1  rhino1_7R3.zip
-3d9b9647931b96c6eac2ac23f94f3a6e072ee500613a45ee08ab88c259e24fe0  fix-paxctl-args.patch
+2c515d2664a3792561bd635b6df0dd24918feb3095ed938b1ec807b005928e69  fix-paxctl-args.patch
+b81a5e40ce9a93409e8226fe73a228d1c277343fc4f8a888277beb0d5bf0f551  icedtea-build-paxmark.patch
 a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e  icedtea-hotspot-musl.patch
 fb33409f6700f4ab69ca35f0684a5138f2afe0726ba5de7f9eaf16a18a25a77c  icedtea-hotspot-noagent-musl.patch
 0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745  icedtea-hotspot-uclibc-fixes.patch
@@ -268,17 +271,18 @@ fb33409f6700f4ab69ca35f0684a5138f2afe0726ba5de7f9eaf16a18a25a77c  icedtea-hotspo
 a36ff13d81a1f1415bedd595b77f2c43574c546938cce7882cb33bbe63464865  icedtea-jdk-iconv-uclibc.patch
 6a9f2e7e5f12db53feecaf5bb0afa977e45439722c040842db023c12209c0df2  icedtea-jdk-musl.patch
 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch"
-sha512sums="66d34c858fb477a105c163de4b9d7ecaa086bb2a8f5a45e0e721db8e1b49ce670dd56b36b5dd9db7df80438e03ea9aafb41ebadb911e9de2179c8b4be1713d61  icedtea-2.4.5.tar.gz
-135a87d7831d5803b495d8908cab13d9f87134a3eb696684b27aea7fc1ef35677594d4037b44f19b317300555d42c05a569a3a3928458e9787f34cbcf8fce300  openjdk-410eb7fef869.tar.gz
-06bfd82b188dbfeb2f05bc4fdc8585a9ce66762f835052a8bfe5f4ebc2d4eb90c966bd6766825b9d68b7425a2d7af27311da1f3c7c37ce4a36e81b85745cb447  corba-3594dbde270d.tar.gz
-5bc6e75482976e014e191a4952b6598a979fb440643916f5de741be8662e6dcdb224ac7dcca848cb80f2181e9d175d7cfa6cc678c1472ec5bec1adf249324815  jaxp-8fe156ad49e2.tar.gz
-4eaf5af04e65033ad65b04e5d6dd4c91c007d314230990856abb9a551b54c03dc7c26cb8e2da070558b6d2ff5a1c6d5af53dbc966eda352d873771629aca51a6  jaxws-32ea8b1ed91a.tar.gz
-3aeacd02af8263b1168c238045973d57e33aea94a13e95527911f993ffd941423d0db667cd5dd786509c7625ceafdc021cb410573744a93b876a8717d47cfc50  jdk-9db88c18e114.tar.gz
-f6b650431f20758b0f17bc2760e1426e622def620fff80874146e865e2d87d2ce265926c20282489a245df575a87618265dd83a3eb3d8443938f175a89f2c302  langools-dabd37b7e295.tar.gz
-c27c90ab523a0cd438d4850e8762e7047478332fbbee0cf61b07214dafff5db9d6d41c95cc165993458c83ffd91458f1b2f0ff7578f34bfe74a1ff912a587127  hotspot-2cb58882dac3.tar.gz
+sha512sums="e03bf4b521f8d11ac5b703b7959b8ee4688f4df486da8cb754cc88546e4f912dafb865f2f32bc37f6327417d928772870f2b6fd32c817298efdd33190c35f929  icedtea-2.4.7.tar.gz
+3898815c8c7b99e8b25d710f48ef25d9e0a5ac2c332ce3c1f870b30bfe1198492029767b75f0f8cb85f6b55e2432b14e8c71b0ceab0d25e6c047bfcde766a6f5  openjdk-13970e76b784.tar.gz
+ab787baa78e9494fc7a9d12351121a64392b5490409fabb6d343fcf78191e0a7f838d14e2251b35d6b8ac15df950e259bb6ae7a191934cf391a0c00774c4ce4c  corba-e6ad5b912691.tar.gz
+b604b7e52453680a20bd303ffa389f937d9f31bb50016b9b359d39b7f4af6deca6cd1e5b3e13f2d40f0d0c46ae9c0370a31afd30b8cc64c5854020804dd38855  jaxp-94b7e8e0d96f.tar.gz
+2a1ccdcdf4f6058649514f98c718a542cbdb5e76e997ad77fbcc1a8a7efdf2f787d04909ef0434af07c97373626b5d439718161defe537eea8a2eb56b5405de5  jaxws-bd9a50a78d04.tar.gz
+498434ee55cd0ff0f9522b5e7ef6f69c7a54750ca24b336519e24822185e6311ad84ae84b40a470a34b870a19c0191433b49bfb195c5bc6f28f2d4f1f3ee4ac7  jdk-9448fff93286.tar.gz
+96a0d00bc7992d84bec61999e158f9a955233a1a15671a5496fed4fd270b40b6526bb11dc70e1e5c85f2fdbdf0df06efd3e805c910d2b7410d78c9c4fe78da8a  langools-8c26a3c39128.tar.gz
+6480f7df5f139d5ade06fd949e7daaa258d7a8db972ac36690092fbedb3702b8a92e51d9504d445c6c4ed07fb47e088ccf6efc01b96e292e602eaf8f246b98ed  hotspot-69b542696e5b.tar.gz
 618c0c3d80f7c44c2bb8cdfdc2b5278ccd926ab1aa0c8f7099bd0ad5cb4c090f023c0b86c8267052a0a6b1ac57076296fcc16042b9e7a72a1482af63c99e0e49  apache-ant-1.9.2-bin.tar.gz
 77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36  rhino1_7R3.zip
-25b4414f522251529b9f8d69dccac7323abe12bb526d5ad02abf7e9f82b9b49383d6a24f4c1a07c86a0f6b9a44f740c4f7cc58ebdfb44f99915eb965bd1ab5f1  fix-paxctl-args.patch
+f4be5689f72e333bda03d9e89aacfd7cd9bd79601d34bdd03fd2935b46efdc277168d8195e27d35c6dff814712a80c832cab2ff02b186c6cb701de3d2a89c6c8  fix-paxctl-args.patch
+be5410260f05642d592ad16945041505277e3cda48e4693a74ab5d432e1c70976d873fa61510b03c6b5fa2b22178e234628a1c72bd568bb82b39c25fddc0ebec  icedtea-build-paxmark.patch
 994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933  icedtea-hotspot-musl.patch
 22eb55b0910d51ff2f3f2ad2d7951d2c1d60ea07e0e9561e1110cc57d75a42cc7629ebdaf70722f3f3b76eb2d977b614249b3383118f7b295648bdfda97c9d95  icedtea-hotspot-noagent-musl.patch
 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a  icedtea-hotspot-uclibc-fixes.patch
diff --git a/main/openjdk7/fix-paxctl-args.patch b/main/openjdk7/fix-paxctl-args.patch
index 3e8d22772..f9cdec3a2 100644
--- a/main/openjdk7/fix-paxctl-args.patch
+++ b/main/openjdk7/fix-paxctl-args.patch
@@ -1,15 +1,15 @@
---- icedtea-2.4.5/acinclude.m4.orig
-+++ icedtea-2.4.5/acinclude.m4
-@@ -2324,10 +2324,10 @@
-     xpaxctl)
-       case "${host_cpu}" in
-         i?86)
--          PAX_COMMAND_ARGS="-msp"
-+          PAX_COMMAND_ARGS="-c -msp"
-           ;;
-         *)
--          PAX_COMMAND_ARGS="-m"
-+          PAX_COMMAND_ARGS="-c -m"
-           ;;
-       esac
-       ;;
+--- icedtea-2.4.7/acinclude.m4.orig	2014-04-17 13:41:57.548895009 +0000
++++ icedtea-2.4.7/acinclude.m4	2014-04-17 13:45:29.752728702 +0000
+@@ -2376,10 +2376,10 @@
+     AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
+     case "${host_cpu}" in
+       i?86)
+-        PAX_COMMAND_ARGS="-msp"
++        PAX_COMMAND_ARGS="-c -msp"
+         ;;
+       *)
+-        PAX_COMMAND_ARGS="-m"
++        PAX_COMMAND_ARGS="-c -m"
+         ;;
+     esac
+     AC_MSG_RESULT(${PAX_COMMAND_ARGS})
diff --git a/main/openjdk7/icedtea-build-paxmark.patch b/main/openjdk7/icedtea-build-paxmark.patch
new file mode 100644
index 000000000..46217e681
--- /dev/null
+++ b/main/openjdk7/icedtea-build-paxmark.patch
@@ -0,0 +1,14 @@
+--- openjdk/make/Defs-internal.gmk.orig	2014-04-17 16:35:03.218100233 +0000
++++ openjdk/make/Defs-internal.gmk	2014-04-17 16:35:18.085038258 +0000
+@@ -308,9 +308,9 @@
+   PAX_COMMAND = /usr/sbin/paxmark.sh
+ endif
+ ifeq ($(ARCH), i586)
+-  PAX_COMMAND_ARGS="-msp"
++  PAX_COMMAND_ARGS="-c -msp"
+ else
+-  PAX_COMMAND_ARGS="-m"
++  PAX_COMMAND_ARGS="-c -m"
+ endif
+ 
+ # Common make arguments (supplied to all component builds)