java8-openjdk-8.u25-2.parabola1: updating revision from Arch

* use ca-certificates-utils
* add icedtea-web as opt depends

3 files changed, 9 insertions, 10 deletions

diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD
index 5079070e6..5d5a4ffe3 100644
--- a/libre/java8-openjdk/PKGBUILD
+++ b/libre/java8-openjdk/PKGBUILD
@@ -5,7 +5,6 @@
 # TODO
 # once icedtea:
 #   pulse
-#   icedtea-web-java8
 #   add policytool desktop files
 
 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk')
@@ -15,7 +14,7 @@ _jdk_update=25
 _jdk_build=18
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
@@ -127,7 +126,7 @@ build() {
 
 package_jre8-openjdk-headless() {
   pkgdesc='OpenJDK Java 8 headless runtime environment (Parabola rebranded)'
-  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
@@ -176,7 +175,7 @@ package_jre8-openjdk-headless() {
   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"
 
@@ -197,9 +196,9 @@ package_jre8-openjdk-headless() {
 package_jre8-openjdk() {
   pkgdesc='OpenJDK Java 8 full runtime environment (Parabola rebranded)'
   depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
-  optdepends=('alsa-lib: for basic sound support'
+  optdepends=('icedtea-web: web browser plugin + Java Web Start'
+              'alsa-lib: for basic sound support'
               'gtk2: for the Gtk+ look and feel - desktop usage')
-  # TODO when adding IcedTea: 'icedtea-web-java7: web browser plugin + Java Web Start'
   # TODO when adding IcedTea: 'giflib: for gif format support'
   # TODO when adding IcedTea: 'libpulse: for advanced sound support'
   provides=('java-runtime=8' 'java-runtime-openjdk=8')
diff --git a/libre/java8-openjdk/install_jdk8-openjdk.sh b/libre/java8-openjdk/install_jdk8-openjdk.sh
index 9181a7769..148a64b86 100644
--- a/libre/java8-openjdk/install_jdk8-openjdk.sh
+++ b/libre/java8-openjdk/install_jdk8-openjdk.sh
@@ -25,7 +25,7 @@ post_install() {
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }
 
@@ -36,7 +36,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }
 
diff --git a/libre/java8-openjdk/install_jre8-openjdk-headless.sh b/libre/java8-openjdk/install_jre8-openjdk-headless.sh
index 0f7157963..4c96274bc 100644
--- a/libre/java8-openjdk/install_jre8-openjdk-headless.sh
+++ b/libre/java8-openjdk/install_jre8-openjdk-headless.sh
@@ -25,7 +25,7 @@ post_install() {
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-     /usr/bin/init-jks-keystore
+     /usr/bin/update-ca-trust
   fi
 }
 
@@ -35,7 +35,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/init-jks-keystore
+    /usr/bin/update-ca-trust
   fi
 }