[arch-commits] Commit in java8-openjdk/trunk (3 files)

[Guillaume Alaux]

    Date: Sunday, November 16, 2014 @ 21:35:59
  Author: guillaume
Revision: 226334

Use ca-certificates-utils

Modified:
  java8-openjdk/trunk/PKGBUILD
  java8-openjdk/trunk/install_jdk8-openjdk.sh
  java8-openjdk/trunk/install_jre8-openjdk-headless.sh

----------------------------------+
 PKGBUILD                         |    6 +++---
 install_jdk8-openjdk.sh          |    4 ++--
 install_jre8-openjdk-headless.sh |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-16 20:35:43 UTC (rev 226333)
+++ PKGBUILD	2014-11-16 20:35:59 UTC (rev 226334)
@@ -13,7 +13,7 @@
 _jdk_build=18
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
@@ -125,7 +125,7 @@
 
 package_jre8-openjdk-headless() {
   pkgdesc='OpenJDK Java 8 headless runtime environment'
-  depends=('java-runtime-common' 'ca-certificates-java' 'nss')
+  depends=('java-runtime-common' 'ca-certificates-utils' 'nss')
   optdepends=('java-rhino: for some JavaScript support')
   provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8')
   # Upstream config files that should go to etc and get backup
@@ -174,7 +174,7 @@
   done
   popd
 
-  # Link JKS keystore from ca-certificates-java
+  # Link JKS keystore from ca-certificates-utils
   rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
   ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
 

Modified: install_jdk8-openjdk.sh
===================================================================
--- install_jdk8-openjdk.sh	2014-11-16 20:35:43 UTC (rev 226333)
+++ install_jdk8-openjdk.sh	2014-11-16 20:35:59 UTC (rev 226334)
@@ -25,7 +25,7 @@
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }
 
@@ -36,7 +36,7 @@
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }
 

Modified: install_jre8-openjdk-headless.sh
===================================================================
--- install_jre8-openjdk-headless.sh	2014-11-16 20:35:43 UTC (rev 226333)
+++ install_jre8-openjdk-headless.sh	2014-11-16 20:35:59 UTC (rev 226334)
@@ -25,7 +25,7 @@
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-     /usr/bin/init-jks-keystore
+     /usr/bin/update-ca-trust
   fi
 }
 
@@ -35,7 +35,7 @@
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }