main/openjdk6: upgrade to icedtea 1.11.13

* update pkgver to include java version, build and icedtea version
* do not build ecj, instead use the javac from java-gcj-compat
* remove jaxws, jaxp and jaf drop zips as they are not used
* enable x86_64 build again (apparently using java-gcj-compat fixes things)
* minor other clean ups

Includes also security fixes from 1.11.12 (2013-07-10)
 - S6741606, CVE-2013-2407: Integrate Apache Santuario
 - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
 - S7170730, CVE-2013-2451: Improve Windows network stack support.
 - S8000638, CVE-2013-2450: Improve deserialization
 - S8000642, CVE-2013-2446: Better handling of objects for transportation
 - S8001032: Restrict object access
 - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
 - S8001034, CVE-2013-1500: Memory management improvements
 - S8001038, CVE-2013-2444: Resourcefully handle resources
 - S8001043: Clarify definition restrictions
 - S8001309: Better handling of annotation interfaces
 - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
 - S8001330, CVE-2013-2443: Improve on checking order
 - S8003703, CVE-2013-2412: Update RMI connection dialog box
 - S8004584: Augment applet contextualization
 - S8005007: Better glyph processing
 - S8006328, CVE-2013-2448: Improve robustness of sound classes
 - S8006611: Improve scripting
 - S8007467: Improve robustness of JMX internal APIs
 - S8007471: Improve MBean notifications
 - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
 - S8008120, CVE-2013-2457: Improve JMX class checking
 - S8008124, CVE-2013-2453: Better compliance testing
 - S8008128: Better API coherence for JMX
 - S8008132, CVE-2013-2456: Better serialization support
 - S8008585: Better JMX data handling
 - S8008593: Better URLClassLoader resource management
 - S8008603: Improve provision of JMX providers
 - S8008611: Better handling of annotations in JMX
 - S8008615: Improve robustness of JMX internal APIs
 - S8008623: Better handling of MBeanServers
 - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
 - S8008982: Adjust JMX for underlying interface changes
 - S8009004: Better implementation of RMI connections
 - S8009013: Better handling of T2K glyphs
 - S8009034: Improve resulting notifications in JMX
 - S8009038: Improve JMX notification support
 - S8009067: Improve storing keys in KeyStore
 - S8009071, CVE-2013-2459: Improve shape handling
 - S8009235: Improve handling of TSA data
 - S8011243, CVE-2013-2470: Improve ImagingLib
 - S8011248, CVE-2013-2471: Better Component Rasters
 - S8011253, CVE-2013-2472: Better Short Component Rasters
 - S8011257, CVE-2013-2473: Better Byte Component Rasters
 - S8012375, CVE-2013-1571: Improve Javadoc framing
 - S8012421: Better positioning of PairPositioning
 - S8012438, CVE-2013-2463: Better image validation
 - S8012597, CVE-2013-2465: Better image channel verification
 - S8012601, CVE-2013-2469: Better validation of image layouts
 - S8014281, CVE-2013-2461: Better checking of XML signature
 - S8015997: Additional improvement in Javadoc framing
(cherry picked from commit 1f99ba57e5946f21d43f2d235856af8a174ccc74)

Conflicts:
	main/openjdk6/APKBUILD

1 files changed, 40 insertions, 66 deletions

diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 7e46ec429f..456100e752 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -1,9 +1,10 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk6
-pkgver=1.6.0_p24
-icedteaver=1.11.11
-pkgrel=8
+_icedteaver=1.11.13
+_openjdkbuild=24
+pkgver=6.$_openjdkbuild.$_icedteaver
+pkgrel=0
 pkgdesc="Sun OpenJDK 6 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="x86 x86_64"
@@ -17,36 +18,33 @@ makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux
 	     gtk+2.0-dev ca-certificates libxslt zip"
 install=""
 
+BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
+OPENJDK_VERSION=b$_openjdkbuild
+OPENJDK_DATE=14_nov_2011
+RHINO_VER=1_7R3
+ANT_VER=1.8.2
+
 case $CARCH in
-x86)	_arch=i386;;
-x86_64)	_arch=amd64;;
+x86)	_jarch=i386;;
+x86_64)	_jarch=amd64;;
+arm)	_jarch=arm;;
 esac
 
-_jrelib="/usr/lib/jvm/java-1.6-openjdk/jre/lib/$_arch"
+INSTALL_BASE=/usr/lib/jvm/java-1.6-openjdk
+
 # exclude xawt from ldpath to avoid duplicate provides for libmawt.so (also in
 # headless).
 # infuture this should be a virtual provides
+_jrelib="$INSTALL_BASE/jre/lib/$_jarch"
 ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
-
 somask="libjvm.so"
 
 subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
 	     $pkgname-doc:doc"
-BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
-OPENJDK_VERSION=b24
-OPENJDK_DATE=14_nov_2011
-RHINO_VER=1_7R3
-ANT_VER=1.8.2
-JAXWS_DROP_ZIP=jdk6-jaxws2_1_6-2011_06_13.zip
-JAXP_DROP_ZIP=jaxp144_03.zip
-JAF_DROP_ZIP=jdk6-jaf-b20.zip
 source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz
-	http://icedtea.classpath.org/download/source/icedtea6-$icedteaver.tar.gz
+	http://icedtea.classpath.org/download/source/icedtea6-$_icedteaver.tar.gz
 	http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
 	ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino$RHINO_VER.zip
-	http://icedtea.classpath.org/download/drops/$JAXWS_DROP_ZIP
-	http://icedtea.classpath.org/download/drops/$JAXP_DROP_ZIP
-	http://icedtea.classpath.org/download/drops/$JAF_DROP_ZIP
 	build-paxctl.patch
 	icedtea-hotspot-uclibc-fixes.patch
 	icedtea-jdk-fix-ipv6-init.patch
@@ -58,44 +56,30 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-
 	icedtea-jdk-early-paxctl.patch
 	"
 
-_builddir="$srcdir/icedtea6-$icedteaver"
-INSTALL_BASE=/usr/lib/jvm/java-1.6-openjdk
-CPU=`uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g'`
+_builddir="$srcdir/icedtea6-$_icedteaver"
 
 unpack() {
 	if [ -z "$force" ]; then
-		md5check || return 1
+		verify || return 1
 		initdcheck || return 1
 	fi
 	mkdir -p "$srcdir"
 	msg "Unpacking sources..."
-	tar -C "$srcdir" -zxf icedtea6-$icedteaver.tar.gz || return 1
+	tar -C "$srcdir" -zxf icedtea6-$_icedteaver.tar.gz || return 1
 	tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1
 	unzip -o -q "rhino$RHINO_VER.zip" -d "$srcdir" || return 1
 }
 
 prepare() {
 	cd "$_builddir"
+
         # Busybox sha256 does not support longopts
         sed -e "s/--check/-c/g" -i Makefile.am
-        # gcj is broke after strict linking
-        sed -e "s/-o native-ecj/-o native-ecj -lgcj/g" -i Makefile.am
 
         for patch in $source; do
                 case $patch in
 		icedtea-*.patch)
-			case $patch in
-			*uclibc*)
-				if [ "$ALPINE_LIBC" != "eglibc" ]; then
-					cp ../$patch patches
-					_dpatches="$_dpatches patches/$patch"
-				fi
-			;;
-			*)
-				cp ../$patch patches
-				 _dpatches="$_dpatches patches/$patch"
-			;;
-			esac
+			cp ../$patch patches
 			;;
                 *.patch)
                         msg "Applying patch $patch"
@@ -103,21 +87,23 @@ prepare() {
                         ;;
                 esac
         done
-	export DISTRIBUTION_PATCHES="$_dpatches"
 }
 
 build() {
+	[ -z "$JOBS" ] && export JOBS=`echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p'`
 	export JAVA_HOME=$BOOTSTRAP_JAVA_HOME
 	export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH
-	
-	if [ -z "$JOBS" ]; then
-		JOBS=`echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p'`
-	fi
-	if [ "$JOBS" ]; then
-		confjobs="--with-parallel-jobs=$JOBS"
-	else
-		confjobs=""
-	fi
+	export DISTRIBUTION_PATCHES=""
+
+	local patch
+	for patch in $source; do
+		case $patch in
+		icedtea-*.patch)
+			export DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
+			;;
+		esac
+	done
+	echo "icedtea patches: $DISTRIBUTION_PATCHES"
 
 	cd "$_builddir"
 	sh autogen.sh
@@ -127,13 +113,10 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-dependency-tracking \
+		--with-parallel-jobs=${JOBS:-2} \
 		--enable-cacerts \
 		--with-ca-dir=/etc/ssl/certs \
-		--with-gcj $confjobs \
 		--with-openjdk-src-zip=$srcdir/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz \
-		--with-jaxp-drop-zip=$srcdir/$JAXP_DROP_ZIP \
-		--with-jaf-drop-zip=$srcdir/$JAF_DROP_ZIP \
-		--with-jaxws-drop-zip=$srcdir/$JAXWS_DROP_ZIP \
 		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
 		--with-ant-home=$srcdir/apache-ant-$ANT_VER \
 		--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
@@ -197,8 +180,8 @@ jre() {
 	for A in jre/bin/policytool \
 		 bin/appletviewer \
 		 bin/policytool \
-		 jre/lib/$CPU/xawt \
-		 jre/lib/$CPU/libsplashscreen.so ; do
+		 jre/lib/$_jarch/xawt \
+		 jre/lib/$_jarch/libsplashscreen.so ; do
 		dirname=${A%/*}
 		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
 		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
@@ -213,12 +196,9 @@ doc() {
 }
 
 md5sums="0eabdd360169144336e50081b8d01001  openjdk-6-src-b24-14_nov_2011.tar.gz
-fd9749b16f88c4f67920d2ffc0964a83  icedtea6-1.11.11.tar.gz
+d89b34cc7b525593b6efb8af32b132f4  icedtea6-1.11.13.tar.gz
 afb0c7950a663f94e65da9f3be676d8f  apache-ant-1.8.2-bin.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
-8fd91b09b643a19a912b8a75e7a7a9d5  jdk6-jaxws2_1_6-2011_06_13.zip
-9eea471ad474040265c688858fcf09aa  jaxp144_03.zip
-bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
 f8a7c115a478ba784353606b8607a34d  build-paxctl.patch
 dc6a1e28a97d897d7a1057c11696727d  icedtea-hotspot-uclibc-fixes.patch
 250b0807b59762670954b132e8f8dfba  icedtea-jdk-fix-ipv6-init.patch
@@ -229,12 +209,9 @@ c4bb40d5b1ff690b27900c5cd06bc1e5  icedtea-jdk-no-lib-nsl-uclibc.patch
 d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch
 7eda2c7837b14793076e7675c756be0c  icedtea-jdk-early-paxctl.patch"
 sha256sums="f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227  openjdk-6-src-b24-14_nov_2011.tar.gz
-6db6124645686ab5e91d2952d8b601bc0789b8fd5f1af86e46a5242ec60dc8e6  icedtea6-1.11.11.tar.gz
+3101efa8dd7c0470c375e41cd2adbaae63f6fb65d357b2033069f4f468b3ea08  icedtea6-1.11.13.tar.gz
 664f48cfc9c4a9a832ec1dd9d2bed5229c0a9561e489dcb88841d75d3c2c7cf9  apache-ant-1.8.2-bin.tar.gz
 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1  rhino1_7R3.zip
-229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3  jdk6-jaxws2_1_6-2011_06_13.zip
-c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012  jaxp144_03.zip
-78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012  jdk6-jaf-b20.zip
 b7d6bab5394cd0023b6737aeb0ff90569058d151185916ac2f80f5266c468312  build-paxctl.patch
 f4b06c01b664922a6d7785d90bb888fe4665ae9ed6ae76c5484314821fd2cc2d  icedtea-hotspot-uclibc-fixes.patch
 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5  icedtea-jdk-fix-ipv6-init.patch
@@ -245,12 +222,9 @@ f83dea0ee1d11deceb45d643cf0cce84099775de88b972e3ea979a8529bf4c85  icedtea6-1.9.7
 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch
 13876be6f6ec792894d51b20f261b76db878d330eec7d4a2dcb17f0f1909a7e6  icedtea-jdk-early-paxctl.patch"
 sha512sums="a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05  openjdk-6-src-b24-14_nov_2011.tar.gz
-30afa752889f43dcf81b89e0e8c810894675f91ddae50cf38a034b53b5bd33be327bbf5eb21ece8ab0aafd088204827500fd5f160eb23d8d64857b38089a7891  icedtea6-1.11.11.tar.gz
+90970145e41a7caea2a6ebb1c5f92b72d544dc71b033568c72f981e4479722bc460eb09151304878277cb5632d39b15165ae6b9fb8628b6a700f0fce69516f4c  icedtea6-1.11.13.tar.gz
 869ab792b95c98ee62d748ffc991d78138482c8e2191f0a07c4d6629ad983768b40bef6f2d1370f6c0ab007c1de73f440293c1101eaf1fd82cf40de140c4b020  apache-ant-1.8.2-bin.tar.gz
 77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36  rhino1_7R3.zip
-643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6  jdk6-jaxws2_1_6-2011_06_13.zip
-fe65d396d0a57bc2b5dd2d8b00b0ecea860d4e5a5c9cb489bc5b9d7abd90861dedd26088184de93807646277c23d3712e8af79e56251f079ef22ed5a3b8f9a90  jaxp144_03.zip
-22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a  jdk6-jaf-b20.zip
 41bfdb08e74cbcc70eac9e6721d886d8e35cd77c19988bd812fa16f71819efa2e8101d8a41a9ae62094069282739a835209a66c8dea6e259a86aee8368c60643  build-paxctl.patch
 dc5a72ef92cd31e9ba4870ad2126f619932bae5918b6f6ad22af59dbc3e77a70fc27ba37909df0612f70922dfec6a58464469a18ed7a77d902c4a5038e086900  icedtea-hotspot-uclibc-fixes.patch
 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch