diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe index 407f6f0c0..0d5bb5994 100644 --- a/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe +++ b/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe @@ -24,9 +24,9 @@ SRC_URI_5="hg+http://bitbucket.org/hamishm/haiku-jdk7u-corba#58510ce" SRC_URI_6="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxp#jdk7u80-b32" SRC_URI_7="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxws#jdk7u80-b32" SRC_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot#43c8a75" -SRC_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk#dc36707" +SRC_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk#5d173cf" -REVISION="1" +REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -98,6 +98,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + ca_root_certificates cmd:cpio cmd:make cmd:gcc$secondaryArchSuffix @@ -162,6 +163,20 @@ INSTALL() addResourcesToBinaries $portDir/sources/jexec.rdef $jdkDir/lib/jexec + # set up the cacerts file + cacerts=$jdkDir/jre/lib/security/cacerts + certDir=certs + + mkdir -p $certDir + csplit -f $certDir/ /system/data/ssl/CARootCertificates.pem "/-----BEGIN CERTIFICATE-----/" {*} + + rm certs/00 + + for cert in $certDir/*; do + $jdkDir/bin/keytool -import -noprompt -keystore $cacerts \ + -storepass "changeit" -file $cert -alias "$cert" + done + # symlink the executables to binDir mkdir -p $prefix/bin symlinkRelative -s $jdkDir/bin/* $prefix/bin