[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.install)

Jan de Groot jgc at archlinux.org
Sun May 10 20:30:43 UTC 2009


    Date: Sunday, May 10, 2009 @ 16:30:43
  Author: jgc
Revision: 38911

Add changes to use ca-certificates-java

Modified:
  openjdk6/trunk/PKGBUILD
  openjdk6/trunk/openjdk6.install

------------------+
 PKGBUILD         |    6 +++++-
 openjdk6.install |    5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-10 20:27:27 UTC (rev 38910)
+++ PKGBUILD	2009-05-10 20:30:43 UTC (rev 38911)
@@ -14,7 +14,7 @@
 _openjdk_version=b16
 _openjdk_date=13_apr_2009
 _hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
-depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme')
+depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java')
 makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
 conflicts=('java-environment' 'java-runtime')
 provides=('java-environment=6' 'java-runtime=6')
@@ -148,6 +148,10 @@
       ${pkgdir}/usr/bin || return 1
   done
   popd
+
+  # link JKS keystore from ca-certificates-java
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
  
   # set some variables
   install -m755 -d ${pkgdir}/etc/profile.d

Modified: openjdk6.install
===================================================================
--- openjdk6.install	2009-05-10 20:27:27 UTC (rev 38910)
+++ openjdk6.install	2009-05-10 20:30:43 UTC (rev 38911)
@@ -1,5 +1,8 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/sbin/init-jks-keystore
+  fi
 }
 
 post_upgrade() {
@@ -8,5 +11,5 @@
 
 
 post_remove() {
-  post_install
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
 }




More information about the arch-commits mailing list