From 243643b43828fc7be9cb93d64dfe0dcff0967755 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 19 Nov 2011 12:01:21 -0600
Subject: main/openjdk6: build java security certificates store from alpine
 ca-certificates package

---
 main/openjdk6/APKBUILD | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'main/openjdk6/APKBUILD')

diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index e38f48cff5..f2bb026b2f 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=openjdk6
 pkgver=1.6.0_p22
 icedteaver=1.10.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Sun OpenJDK 6 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="all"
@@ -13,7 +13,7 @@ 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"
+	     gtk+2.0-dev ca-certificates"
 install=""
 subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
 	     $pkgname-doc:doc"
@@ -41,6 +41,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-
 	icedtea-jdk-iconv-uclibc.patch
 	icedtea-jdk-execinfo.patch
 	icedtea-jdk-no-lib-nsl.patch
+	icedtea6-1.9.7-generate_cacerts-1.patch
 	"
 
 _builddir="$srcdir/icedtea6-$icedteaver"
@@ -69,6 +70,7 @@ prepare() {
 
 	cp ../icedtea-*.patch patches
 	patch -p0 < ../build-paxctl.patch
+	patch -p1 < ../icedtea6-1.9.7-generate_cacerts-1.patch
 }
 
 build() {
@@ -84,12 +86,15 @@ build() {
 	fi
 
 	cd "$_builddir"
+	sh autogen.sh
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-dependency-tracking \
+		--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 \
@@ -101,7 +106,7 @@ build() {
 		--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 \
+		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
 		  || return 1
 
 	make || return 1
@@ -182,4 +187,5 @@ bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
 dc6a1e28a97d897d7a1057c11696727d  icedtea-hotspot-uclibc-fixes.patch
 7c0814181e5adc0763c5c0a24b01d4cb  icedtea-jdk-iconv-uclibc.patch
 dae2ba8b87e2106b53974ace07e4ca72  icedtea-jdk-execinfo.patch
-c4bb40d5b1ff690b27900c5cd06bc1e5  icedtea-jdk-no-lib-nsl.patch"
+c4bb40d5b1ff690b27900c5cd06bc1e5  icedtea-jdk-no-lib-nsl.patch
+01bdddb8adb0af0938bc9eeee79ba150  icedtea6-1.9.7-generate_cacerts-1.patch"
-- 
cgit v1.2.3