Date: Sunday, November 16, 2014 @ 21:35:43 Author: guillaume Revision: 226333
Use ca-certificates-utils Modified: java7-openjdk/trunk/PKGBUILD java7-openjdk/trunk/jdk7-openjdk.install java7-openjdk/trunk/jre7-openjdk-headless.install -------------------------------+ PKGBUILD | 6 +++--- jdk7-openjdk.install | 4 ++-- jre7-openjdk-headless.install | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-16 18:17:51 UTC (rev 226332) +++ PKGBUILD 2014-11-16 20:35:43 UTC (rev 226333) @@ -14,7 +14,7 @@ _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://icedtea.classpath.org' license=('custom') @@ -116,7 +116,7 @@ package_jre7-openjdk-headless() { pkgdesc='OpenJDK Java 7 headless runtime environment' - depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java') + depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils') optdepends=('libcups: needed for Java Mauve support - libmawt.so' 'fontconfig: needed for Java Mauve support - libmawt.so' 'java-rhino: for some JavaScript support') @@ -178,7 +178,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: jdk7-openjdk.install =================================================================== --- jdk7-openjdk.install 2014-11-16 18:17:51 UTC (rev 226332) +++ jdk7-openjdk.install 2014-11-16 20:35:43 UTC (rev 226333) @@ -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: jre7-openjdk-headless.install =================================================================== --- jre7-openjdk-headless.install 2014-11-16 18:17:51 UTC (rev 226332) +++ jre7-openjdk-headless.install 2014-11-16 20:35:43 UTC (rev 226333) @@ -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 }