main/openjdk6: upgrade to icedtea6-1.11

based on openjdk6 b24 14_nov_2011

2 files changed, 21 insertions, 28 deletions

diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 27c8d9ec51..c819deecf5 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk6
-pkgver=1.6.0_p22
-icedteaver=1.10.4
-pkgrel=4
+pkgver=1.6.0_p24
+icedteaver=1.11
+pkgrel=0
 pkgdesc="Sun OpenJDK 6 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="all"
@@ -13,25 +13,21 @@ makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux-
 	     autoconf automake nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev
 	     libxp-dev libxtst-dev libxinerama-dev libiconv-dev
 	     libxrender-dev alsa-lib-dev freetype-dev xulrunner-dev
-	     gtk+2.0-dev ca-certificates"
+	     gtk+2.0-dev ca-certificates libxslt"
 install=""
 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=b22
-OPENJDK_DATE=28_feb_2011
-XALAN2_VER=2_7_1
-XERCES_VER=2.9.0
+OPENJDK_VERSION=b24
+OPENJDK_DATE=14_nov_2011
 RHINO_VER=1_7R3
 ANT_VER=1.8.2
-JAXWS_DROP_ZIP=jdk6-jaxws-b20.zip
-JAXP_DROP_ZIP=jaxp144_01.zip
+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://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
-	http://archive.apache.org/dist/xml/xalan-j/xalan-j_$XALAN2_VER-bin-2jars.tar.gz
-	http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.$XERCES_VER.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
@@ -57,8 +53,6 @@ unpack() {
 	msg "Unpacking sources..."
 	tar -C "$srcdir" -zxf icedtea6-$icedteaver.tar.gz || return 1
 	tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1
-	tar -C "$srcdir" -zxf xalan-j_$XALAN2_VER-bin-2jars.tar.gz || return 1
-	tar -C "$srcdir" -zxf Xerces-J-bin.$XERCES_VER.tar.gz || return 1
 	unzip -o -q "rhino$RHINO_VER.zip" -d "$srcdir" || return 1
 }
 
@@ -67,6 +61,8 @@ prepare() {
 
 	# 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
 
 	cp ../icedtea-*.patch patches
 	patch -p0 < ../build-paxctl.patch
@@ -102,9 +98,6 @@ build() {
 		--with-jaxws-drop-zip=$srcdir/$JAXWS_DROP_ZIP \
 		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
 		--with-ant-home=$srcdir/apache-ant-$ANT_VER \
-		--with-xalan2-jar=$srcdir/xalan-j_$XALAN2_VER/xalan.jar \
-		--with-xalan2-serializer-jar=$srcdir/xalan-j_$XALAN2_VER/serializer.jar \
-		--with-xerces2-jar=$srcdir/xerces-${XERCES_VER//./_}/xercesImpl.jar \
 		--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
 		  || return 1
@@ -146,9 +139,11 @@ jrebase() {
 	# rest of the jre subdir (which were not taken by -jre subpkg)
 	mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
 
-	# java vm needs mprotect disabled
-	paxctl -c -m "$subpkgdir"/$INSTALL_BASE/bin/java
-	paxctl -c -m "$subpkgdir"/$INSTALL_BASE/jre/bin/java
+	# all java stuff seems to need mprotect and randomization off
+	# or otherwise the vm fails to allocate enough memory
+	paxctl -c -mr \
+		"$subpkgdir"/$INSTALL_BASE/bin/* \
+		"$subpkgdir"/$INSTALL_BASE/jre/bin/*
 }
 
 jre() {
@@ -174,16 +169,14 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-md5sums="2d2bbbb0f9b81f1fec41ec730da8a933  openjdk-6-src-b22-28_feb_2011.tar.gz
-c381d987f8d2facece8c54e98fd547f8  icedtea6-1.10.4.tar.gz
+md5sums="0eabdd360169144336e50081b8d01001  openjdk-6-src-b24-14_nov_2011.tar.gz
+10c1cea1d24c064572abfe9687567948  icedtea6-1.11.tar.gz
 afb0c7950a663f94e65da9f3be676d8f  apache-ant-1.8.2-bin.tar.gz
-3ccda39bcd08b780436dfd2f22fb23d5  xalan-j_2_7_1-bin-2jars.tar.gz
-138f2d1cddd823281d5dfb700f2bd7d4  Xerces-J-bin.2.9.0.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
-91adfd41e6f001add4f92ae31216b1e3  jdk6-jaxws-b20.zip
-ef7a8b3624ea904bf584bc46d79b5e75  jaxp144_01.zip
+8fd91b09b643a19a912b8a75e7a7a9d5  jdk6-jaxws2_1_6-2011_06_13.zip
+9eea471ad474040265c688858fcf09aa  jaxp144_03.zip
 bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
-6379a15ae0f4c374c34b908d80e8e4a1  build-paxctl.patch
+3ed492a33c1439ead4ada0462dd621ca  build-paxctl.patch
 dc6a1e28a97d897d7a1057c11696727d  icedtea-hotspot-uclibc-fixes.patch
 7c0814181e5adc0763c5c0a24b01d4cb  icedtea-jdk-iconv-uclibc.patch
 dae2ba8b87e2106b53974ace07e4ca72  icedtea-jdk-execinfo.patch
diff --git a/main/openjdk6/build-paxctl.patch b/main/openjdk6/build-paxctl.patch
index 9cd4eebda3..4461a380c7 100644
--- a/main/openjdk6/build-paxctl.patch
+++ b/main/openjdk6/build-paxctl.patch
@@ -4,7 +4,7 @@
  	mkdir -p bootstrap
  	rm -f $(BOOT_DIR)
  	ln -sf $(ICEDTEA_HOME) $(BOOT_DIR); \
-+	paxctl -c -m $(BOOT_DIR)/bin/java ; \
++	paxctl -c -mr $(BOOT_DIR)/bin/* $(BOOT_DIR)/jre/bin/* ; \
  	if ! $(BOOT_DIR)/bin/java -version ; \
           then \
             echo "$(BOOT_DIR)/bin/java" \