main/openjdk6: upgrade to icedtea6 1.12.6

* use --with-pax from upstream instead of our patches
* build without bootstrapping by default to speed up compiles
  (define BOOTSTRAP=yes to do bootstrap build with gcj)

4 files changed, 62 insertions, 49 deletions

diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index eebd3ca840..2db61425d9 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk6
-_icedteaver=1.11.13
-_openjdkbuild=24
+_icedteaver=1.12.6
+_openjdkbuild=27
 pkgver=6.$_openjdkbuild.$_icedteaver
 pkgrel=0
 pkgdesc="Sun OpenJDK 6 via IcedTea"
@@ -11,18 +11,27 @@ arch="x86 x86_64"
 license="GPL-2 with Classpath"
 depends="$pkgname-jre"
 options="sover-namecheck"
-makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux
+makedepends="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 libxslt zip"
 install=""
 
-BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
+INSTALL_BASE=/usr/lib/jvm/java-1.6-openjdk
+
+if [ "$BOOTSTRAP" = "yes" ]; then
+	makedepends="$makedepends java-gcj-compat"
+	BOOTSTRAP_JAVA_HOME="/usr/lib/jvm/java-1.5-gcj/"
+else
+	makedepends="$makedepends $pkgname"
+	BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
+fi
+
 OPENJDK_VERSION=b$_openjdkbuild
-OPENJDK_DATE=14_nov_2011
+OPENJDK_DATE=26_oct_2012
 RHINO_VER=1_7R3
-ANT_VER=1.8.2
+ANT_VER=1.9.2
 
 case $CARCH in
 x86)	_jarch=i386;;
@@ -30,8 +39,6 @@ x86_64)	_jarch=amd64;;
 arm)	_jarch=arm;;
 esac
 
-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
@@ -45,7 +52,6 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-
 	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
-	build-paxctl.patch
 	icedtea-hotspot-uclibc-fixes.patch
 	icedtea-jdk-fix-ipv6-init.patch
 	icedtea-jdk-iconv-uclibc.patch
@@ -53,7 +59,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-
 	icedtea-jdk-no-lib-nsl-uclibc.patch
 	icedtea6-1.9.7-generate_cacerts-1.patch
 	icedtea-jdk-no-soname.patch
-	icedtea-jdk-early-paxctl.patch
+	fix-with-pax.patch
 	"
 
 _builddir="$srcdir/icedtea6-$_icedteaver"
@@ -105,6 +111,9 @@ build() {
 	done
 	echo "icedtea patches: $DISTRIBUTION_PATCHES"
 
+	local _bootstrap=""
+	[ "$BOOTSTRAP" != "yes" ] && _bootstrap="--disable-bootstrap"
+
 	cd "$_builddir"
 	sh autogen.sh
 	./configure \
@@ -116,14 +125,18 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-dependency-tracking \
+		--disable-downloading \
 		--with-parallel-jobs=${JOBS:-2} \
 		--enable-cacerts \
 		--with-ca-dir=/etc/ssl/certs \
-		--with-openjdk-src-zip=$srcdir/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz \
 		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
+		--with-pax=paxctl \
+		$_bootstrap \
+		--with-openjdk-src-zip=$srcdir/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz \
 		--with-ant-home=$srcdir/apache-ant-$ANT_VER \
 		--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
+		--with-abs-install-dir="$INSTALL_BASE" \
 		|| return 1
 
 	make || return 1
@@ -198,11 +211,10 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-md5sums="0eabdd360169144336e50081b8d01001  openjdk-6-src-b24-14_nov_2011.tar.gz
-d89b34cc7b525593b6efb8af32b132f4  icedtea6-1.11.13.tar.gz
-afb0c7950a663f94e65da9f3be676d8f  apache-ant-1.8.2-bin.tar.gz
+md5sums="3a0963158e07c8829c8bd31a698bd23d  openjdk-6-src-b27-26_oct_2012.tar.gz
+486f49fa302c52d3f28e6cde5dd37e4f  icedtea6-1.12.6.tar.gz
+9a2826a1819aa128629778217af36c55  apache-ant-1.9.2-bin.tar.gz
 99d94103662a8d0b571e247a77432ac5  rhino1_7R3.zip
-f8a7c115a478ba784353606b8607a34d  build-paxctl.patch
 dc6a1e28a97d897d7a1057c11696727d  icedtea-hotspot-uclibc-fixes.patch
 250b0807b59762670954b132e8f8dfba  icedtea-jdk-fix-ipv6-init.patch
 7c0814181e5adc0763c5c0a24b01d4cb  icedtea-jdk-iconv-uclibc.patch
@@ -210,12 +222,11 @@ dae2ba8b87e2106b53974ace07e4ca72  icedtea-jdk-execinfo.patch
 c4bb40d5b1ff690b27900c5cd06bc1e5  icedtea-jdk-no-lib-nsl-uclibc.patch
 0bc0131c87fcc0d1046e3ba20d205c73  icedtea6-1.9.7-generate_cacerts-1.patch
 d014431e70cdabb82a75e4b9ae4c28a9  icedtea-jdk-no-soname.patch
-7eda2c7837b14793076e7675c756be0c  icedtea-jdk-early-paxctl.patch"
-sha256sums="f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227  openjdk-6-src-b24-14_nov_2011.tar.gz
-3101efa8dd7c0470c375e41cd2adbaae63f6fb65d357b2033069f4f468b3ea08  icedtea6-1.11.13.tar.gz
-664f48cfc9c4a9a832ec1dd9d2bed5229c0a9561e489dcb88841d75d3c2c7cf9  apache-ant-1.8.2-bin.tar.gz
+d2999b5b67afe485554d14ecd1aa6046  fix-with-pax.patch"
+sha256sums="044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0  openjdk-6-src-b27-26_oct_2012.tar.gz
+18d98fd05ef8d5088b09c444e0b025a8295181c6ae2efb6ebefe0a0397062865  icedtea6-1.12.6.tar.gz
+cab1b8754e5f1f2aa869e2ba603903ae5e81a585de4eafd00f173531a11b5a45  apache-ant-1.9.2-bin.tar.gz
 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1  rhino1_7R3.zip
-b7d6bab5394cd0023b6737aeb0ff90569058d151185916ac2f80f5266c468312  build-paxctl.patch
 f4b06c01b664922a6d7785d90bb888fe4665ae9ed6ae76c5484314821fd2cc2d  icedtea-hotspot-uclibc-fixes.patch
 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5  icedtea-jdk-fix-ipv6-init.patch
 a36ff13d81a1f1415bedd595b77f2c43574c546938cce7882cb33bbe63464865  icedtea-jdk-iconv-uclibc.patch
@@ -223,12 +234,11 @@ a36ff13d81a1f1415bedd595b77f2c43574c546938cce7882cb33bbe63464865  icedtea-jdk-ic
 6bba2870af0c5eac7b6edb7351e8e1833db401b1bf6b4861a14dcb1fd45cbea6  icedtea-jdk-no-lib-nsl-uclibc.patch
 f83dea0ee1d11deceb45d643cf0cce84099775de88b972e3ea979a8529bf4c85  icedtea6-1.9.7-generate_cacerts-1.patch
 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82  icedtea-jdk-no-soname.patch
-13876be6f6ec792894d51b20f261b76db878d330eec7d4a2dcb17f0f1909a7e6  icedtea-jdk-early-paxctl.patch"
-sha512sums="a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05  openjdk-6-src-b24-14_nov_2011.tar.gz
-90970145e41a7caea2a6ebb1c5f92b72d544dc71b033568c72f981e4479722bc460eb09151304878277cb5632d39b15165ae6b9fb8628b6a700f0fce69516f4c  icedtea6-1.11.13.tar.gz
-869ab792b95c98ee62d748ffc991d78138482c8e2191f0a07c4d6629ad983768b40bef6f2d1370f6c0ab007c1de73f440293c1101eaf1fd82cf40de140c4b020  apache-ant-1.8.2-bin.tar.gz
+b6aab36220a1318f344573041c28885cfa5ab6e21f393995f47c19db9f09917c  fix-with-pax.patch"
+sha512sums="4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8  openjdk-6-src-b27-26_oct_2012.tar.gz
+a6e35936e8542f86ec41f1171f6ac1bf504313c6f163f0de400a8f8fd587d0758b9c73cb391fff77da2c26bcd3150d911f3e529e48dc7e2db964482c4adcbce0  icedtea6-1.12.6.tar.gz
+618c0c3d80f7c44c2bb8cdfdc2b5278ccd926ab1aa0c8f7099bd0ad5cb4c090f023c0b86c8267052a0a6b1ac57076296fcc16042b9e7a72a1482af63c99e0e49  apache-ant-1.9.2-bin.tar.gz
 77964485481e22d20459ea094c773e1930c5ef22d69bc449375a1ead31f340b3a652e2dd85c645e210be1abc8e623aeb560a5dc81629f388322af270ce868d36  rhino1_7R3.zip
-41bfdb08e74cbcc70eac9e6721d886d8e35cd77c19988bd812fa16f71819efa2e8101d8a41a9ae62094069282739a835209a66c8dea6e259a86aee8368c60643  build-paxctl.patch
 dc5a72ef92cd31e9ba4870ad2126f619932bae5918b6f6ad22af59dbc3e77a70fc27ba37909df0612f70922dfec6a58464469a18ed7a77d902c4a5038e086900  icedtea-hotspot-uclibc-fixes.patch
 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
 a6ee1c63a171859ab1350481bc3e5d464354f1105d80fc72c1d58620672ca5c1a550b954b35917f89537f0aeb28c49470b27522ce53588e42dedff41e074774c  icedtea-jdk-iconv-uclibc.patch
@@ -236,4 +246,4 @@ dd8d7edad8309d41881d92d173b7b86e37d833bdb9be0ae9dbc39844b226b77f0e2dc2a137a50738
 833ec90fa9d3d26191303201012e4b8ca220d634497277f7e8c703ca03753720343e22c97dd2f10cd3e3be79c84f95b8c7d0db21545b8a35761c0de7cb834e7a  icedtea-jdk-no-lib-nsl-uclibc.patch
 5fbf3571abd6e0eece8fecd45365996ff83368d674782da3435681afdd6cbb51c6da7e8e4d9ca3ba767a1d373a01d0a4109d1c9bf9b93109a34accaee134a8ab  icedtea6-1.9.7-generate_cacerts-1.patch
 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch
-866d4faf58a4892c113e779e59da590065c6a7f15f9262da82c356305a66ed5e14f4ba63865185b3e52656f8b4622ac243a54f939bc63ac9757dd09d312f622f  icedtea-jdk-early-paxctl.patch"
+7f8ce4b35856ec8c023bdca682773bebeebe9c11652259b968efad370be24885c22bf7bdd687c6665385ca89f75a7df38429e5a7ea4828cdd8be49fce3f8878c  fix-with-pax.patch"
diff --git a/main/openjdk6/build-paxctl.patch b/main/openjdk6/build-paxctl.patch
deleted file mode 100644
index 3e1af2d86c..0000000000
--- a/main/openjdk6/build-paxctl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am.orig
-+++ b/Makefile.am
-@@ -1334,6 +1334,7 @@
- 	mkdir -p bootstrap
- 	rm -f $(BOOT_DIR)
- 	ln -sf $(ICEDTEA_HOME) $(BOOT_DIR); \
-+	paxctl -c -mr $(BOOT_DIR)/bin/* $(BOOT_DIR)/jre/bin/* ; \
- 	if ! $(BOOT_DIR)/bin/java -version ; \
-          then \
-            echo "$(BOOT_DIR)/bin/java" \
diff --git a/main/openjdk6/fix-with-pax.patch b/main/openjdk6/fix-with-pax.patch
new file mode 100644
index 0000000000..c9125585b7
--- /dev/null
+++ b/main/openjdk6/fix-with-pax.patch
@@ -0,0 +1,26 @@
+--- icedtea6-1.12.6/acinclude.m4.orig
++++ icedtea6-1.12.6/acinclude.m4
+@@ -1948,10 +1948,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
+       ;;
+--- icedtea6-1.12.6/Makefile.am.orig
++++ icedtea6-1.12.6/Makefile.am
+@@ -2192,7 +2192,7 @@
+ 	fi
+ 	rm -f stamps/add-tzdata-support-ecj.stamp
+ 
+-stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
++stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp stamps/pax-mark-vm-ecj.stamp
+ if !ENABLE_JAMVM
+ if !ENABLE_CACAO
+ if !ZERO_BUILD
diff --git a/main/openjdk6/icedtea-jdk-early-paxctl.patch b/main/openjdk6/icedtea-jdk-early-paxctl.patch
deleted file mode 100644
index ce4cabef69..0000000000
--- a/main/openjdk6/icedtea-jdk-early-paxctl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./openjdk/jdk/make/java/main/java/Makefile.orig	2013-04-26 08:10:58.853977182 +0000
-+++ ./openjdk/jdk/make/java/main/java/Makefile	2013-04-26 08:15:20.819826501 +0000
-@@ -58,6 +58,10 @@
- OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
- OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
- 
-+# We need pax mark java early
-+$(ACTUAL_PROGRAM)::
-+	paxctl -c -mr $@
-+
- ifeq ($(PLATFORM), solaris)
- LDFLAGS += -R$(OPENWIN_LIB)
- endif