Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a6eea5a45fc2895aada25916fa8081296af4c23
commit 4a6eea5a45fc2895aada25916fa8081296af4c23 Author: Marius Cirsta <[email protected]> Date: Wed Apr 27 05:40:20 2016 +0300 ca-certificates-20160104-2-x86_64 * fix java certificates diff --git a/source/base/ca-certificates/FrugalBuild b/source/base/ca-certificates/FrugalBuild index b3d88e8..315b996 100644 --- a/source/base/ca-certificates/FrugalBuild +++ b/source/base/ca-certificates/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ca-certificates pkgver=20160104 -pkgrel=1 +pkgrel=2 pkgdesc='Common CA certificates' archs=('i686' 'x86_64' 'arm') groups=('base' 'chroot-core') @@ -17,7 +17,7 @@ source=("ftp://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver} up2date="Flasttar ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/ .tar.xz" backup=('etc/ca-certificates.conf') sha1sums=('4525a194736c6691dbd59fa87281b722837b4768' \ - '2738372f38c270877e77121329cede3ced5a88db') + 'd163dbee8ee0c8b1be1e93fe1adf79e231a6db05') subpkgs=('ca-certificates-java') subdescs=('Java Keystore of common CA certificates') @@ -37,8 +37,8 @@ build() { find $Fdestdir/usr/share/$pkgname -name '*.crt' | sed "s|^$Fdestdir/usr/share/$pkgname/||" | sort -u >> $Fdestdir/etc/ca-certificates.conf if [ "$CARCH" != "arm" ]; then - KEYSTORE="$Fdestdir/usr/lib/jvm/java-7-openjdk/jre/lib/security/cacerts" - Fmkdir usr/lib/jvm/java-7-openjdk/jre/lib/security + KEYSTORE="$Fdestdir/usr/lib/jvm/java-8-openjdk/jre/lib/security/cacerts" + Fmkdir usr/lib/jvm/java-8-openjdk/jre/lib/security # Needed for UTF8 certificates to work export LANG=en_US.utf8 @@ -46,12 +46,12 @@ build() { do filename=$(basename "$i") aliasname="${filename%.*}" - /usr/lib/jvm/java-7-openjdk/jre/bin/keytool -import -keystore $KEYSTORE -storepass changeit -noprompt -file $i -alias $aliasname + /usr/lib/jvm/java-8-openjdk/jre/bin/keytool -import -keystore $KEYSTORE -storepass changeit -noprompt -file $i -alias $aliasname done unset LANG #Finstall 755 updatekeystore /etc/cron.daily/updatekeystore #Fsplit ca-certificates-java /etc/cron.daily/updatekeystore - Fsplit ca-certificates-java /usr/lib/jvm/java-7-openjdk/jre/lib/security/cacerts + Fsplit ca-certificates-java /usr/lib/jvm/java-8-openjdk/jre/lib/security/cacerts fi } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
