Date: Sunday, April 24, 2011 @ 06:24:08
Author: pierre
Revision: 120486
upstream update
Modified:
ca-certificates-java/trunk/PKGBUILD
ca-certificates-java/trunk/init-jks-keystore
ca-certificates-java/trunk/jks-keystore.hook.patch
-------------------------+
PKGBUILD | 16 ++++++++--------
init-jks-keystore | 8 ++++----
jks-keystore.hook.patch | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-04-24 08:23:18 UTC (rev 120485)
+++ PKGBUILD 2011-04-24 10:24:08 UTC (rev 120486)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot <j...@archlinux.org>
pkgname=ca-certificates-java
-pkgver=20100412
-pkgrel=3
+pkgver=20110421~nmu1
+pkgrel=1
pkgdesc='Common CA certificates (JKS keystore)'
arch=('any')
url='http://packages.qa.debian.org/c/ca-certificates-java.html'
@@ -13,9 +13,9 @@
install='ca-certificates-java.install'
source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz";
'jks-keystore.hook.patch' 'init-jks-keystore')
-md5sums=('16a5d04148d17923a4d838214dd9b867'
- '301bfcf5ca39f22673f069eb7dd66dbb'
- '82dcec93bb328ae68db33c8177fb3858')
+md5sums=('34078ed264e401ffb5b176d3b98ec214'
+ '26303bb23b9eb7d7a7cdd6eca78e257e'
+ '8fca365914fc1fd9c44e26587424dc23')
build() {
cd ${srcdir}
@@ -29,11 +29,11 @@
alias=$(basename $crt .crt | tr A-Z a-z | tr -cs a-z0-9 _)
alias=${alias%*_}
echo "IMPORT: $crt, alias=$alias"
- if keytool -importcert -trustcacerts -keystore cacerts \
+ if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert
-trustcacerts -keystore cacerts \
-storepass 'changeit' -noprompt \
-alias "$alias" -file "/usr/share/ca-certificates/$crt"
> keytool.log 2>&1; then
cat keytool.log
- elif keytool -importcert -trustcacerts -keystore cacerts \
+ elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert
-trustcacerts -keystore cacerts \
-providerClass sun.security.pkcs11.SunPKCS11 \
-providerArg
'/usr/lib/jvm/java-6-openjdk/jre/lib/security/nss.cfg' \
-storepass 'changeit' -noprompt \
@@ -44,7 +44,7 @@
cat keytool.log
else
cat keytool.log
- #false
+ false
fi
done
}
Modified: init-jks-keystore
===================================================================
--- init-jks-keystore 2011-04-24 08:23:18 UTC (rev 120485)
+++ init-jks-keystore 2011-04-24 10:24:08 UTC (rev 120486)
@@ -12,7 +12,7 @@
# aliases of pregenerated files
pregenerated=$(mktemp)
-LANG=C LC_ALL=C keytool -list -keystore $KEYSTORE -storepass "$storepass" \
+LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -list -keystore $KEYSTORE
-storepass "$storepass" \
| awk -F, '/^Certificate fingerprint/ { print s } { s=$1 } ' \
| sort > $pregenerated
@@ -25,7 +25,7 @@
case "$line" in
!*)
# remove untrusted certificate
- if LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \
+ if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -delete
-keystore $KEYSTORE \
-storepass "$storepass" -alias "$alias" >/dev/null
then
echo " removed untrusted certificate $pem"
@@ -41,12 +41,12 @@
continue
fi
if ! grep -q "^${alias}$" $pregenerated; then
- if LANG=C LC_ALL=C keytool -importcert -trustcacerts
-keystore $KEYSTORE \
+ if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool
-importcert -trustcacerts -keystore $KEYSTORE \
-noprompt -storepass "$storepass" \
-alias "$alias" -file "$cacertdir/$pem" > $log
2>&1
then
echo " added certificate $pem"
- elif LANG=C LC_ALL=C keytool -importcert -trustcacerts
-keystore $KEYSTORE \
+ elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool
-importcert -trustcacerts -keystore $KEYSTORE \
-providerClass sun.security.pkcs11.SunPKCS11 \
-providerArg
'/usr/lib/jvm/java-6-openjdk/jre/lib/security/nss.cfg' \
-noprompt -storepass "$storepass" \
Modified: jks-keystore.hook.patch
===================================================================
--- jks-keystore.hook.patch 2011-04-24 08:23:18 UTC (rev 120485)
+++ jks-keystore.hook.patch 2011-04-24 10:24:08 UTC (rev 120486)
@@ -23,7 +23,7 @@
pem=${line#[+-]*}
alias=$(basename $pem .crt | tr A-Z a-z | tr -cs a-z0-9 _)
@@ -62,7 +54,7 @@
- elif LANG=C LC_ALL=C keytool -importcert -trustcacerts \
+ elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert
-trustcacerts \
-keystore $KEYSTORE -noprompt -storepass "$storepass" \
-providerClass sun.security.pkcs11.SunPKCS11 \
- -providerArg '${java.home}/lib/security/nss.cfg' \
@@ -32,7 +32,7 @@
then
echo " added: ${line#+*} (using NSS provider)"
@@ -85,7 +77,7 @@
- elif LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \
+ elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -delete -keystore
$KEYSTORE \
-noprompt -storepass "$storepass" \
-providerClass sun.security.pkcs11.SunPKCS11 \
- -providerArg '${java.home}/lib/security/nss.cfg' \
