[arch-commits] Commit in ca-certificates-java/trunk (3 files)

[Pierre Schmitz]

    Date: Wednesday, July 15, 2009 @ 01:13:55
  Author: pierre
Revision: 46276

upgpkg: ca-certificates-java 20090629-1
    merge upstream chagnes; ignore unsupported certs

Modified:
  ca-certificates-java/trunk/PKGBUILD
  ca-certificates-java/trunk/init-jks-keystore
  ca-certificates-java/trunk/jks-keystore.hook

-------------------+
 PKGBUILD          |   10 +++++-----
 init-jks-keystore |    7 ++++++-
 jks-keystore.hook |    9 +++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-15 05:12:04 UTC (rev 46275)
+++ PKGBUILD	2009-07-15 05:13:55 UTC (rev 46276)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=ca-certificates-java
-pkgver=20081028
-pkgrel=2
+pkgver=20090629
+pkgrel=1
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('i686' 'x86_64')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'
@@ -12,8 +12,8 @@
 makedepends=('java-runtime')
 install=ca-certificates-java.install
 source=(jks-keystore.hook init-jks-keystore default)
-md5sums=('fcf88086da2e4c31abec9faddb19c259'
-         '50edf13b04904011e492aab419d9254b'
+md5sums=('0b1ad39b6b06d5b6321071e05f2de254'
+         '8c7c4fee571192291a9537b855a32852'
          '0ded97abeff69c2362939e2e881e214a')
 
 build() {
@@ -32,6 +32,6 @@
     alias=`basename $crt .crt | tr A-Z a-z | tr -cs a-z0-9 _`
     alias=${alias%*_}
     echo "IMPORT: $crt, alias=$alias"
-    keytool -importcert -trustcacerts -keystore "${pkgdir}/usr/share/ca-certificates-java/cacerts" -storepass 'changeit' -noprompt -alias "$alias" -file "/usr/share/ca-certificates/$crt"
+    keytool -importcert -trustcacerts -keystore "${pkgdir}/usr/share/ca-certificates-java/cacerts" -storepass 'changeit' -noprompt -alias "$alias" -file "/usr/share/ca-certificates/$crt" || continue
   done
 }

Modified: init-jks-keystore
===================================================================
--- init-jks-keystore	2009-07-15 05:12:04 UTC (rev 46275)
+++ init-jks-keystore	2009-07-15 05:13:55 UTC (rev 46276)
@@ -27,6 +27,7 @@
 
 grep -v -E '^ *$|^#' /etc/ca-certificates.conf | ( \
 errors=0
+log=$(mktemp)
 while read line; do
   pem=${line#!*}
   alias=$(basename $pem .crt | tr A-Z a-z | tr -cs a-z0-9 _)
@@ -49,9 +50,12 @@
       if ! grep -q "^${alias}$" $pregenerated; then
         if LANG=C LC_ALL=C keytool -importcert -trustcacerts -keystore $KEYSTORE \
              -noprompt -storepass "$storepass" \
-             -alias "$alias" -file "$cacertdir/$pem"
+             -alias "$alias" -file "$cacertdir/$pem" > $log 2>&1
         then
           echo "  added certificate $pem $alias"
+        elif grep -q 'Signature not available' $log; then
+          echo "  ignored import, signature not available: ${line#+*}"
+          cat $log
         else
           echo >&2 "  error adding ${line#+*}"
           errors=$(expr $errors + 1)
@@ -59,6 +63,7 @@
       fi
   esac
 done
+rm -f $log
 
 rm -f $pregenerated
 if [ $errors -gt 0 ]; then

Modified: jks-keystore.hook
===================================================================
--- jks-keystore.hook	2009-07-15 05:12:04 UTC (rev 46275)
+++ jks-keystore.hook	2009-07-15 05:13:55 UTC (rev 46276)
@@ -32,6 +32,7 @@
 echo "updating keystore $KEYSTORE..."
 
 errors=0
+log=$(mktemp)
 while read line; do
     pem=${line#[+-]*}
     alias=$(basename $pem .crt | tr A-Z a-z | tr -cs a-z0-9 _)
@@ -46,9 +47,12 @@
 	else
 	    if LANG=C LC_ALL=C keytool -importcert -trustcacerts \
 		-keystore $KEYSTORE -noprompt -storepass "$storepass" \
-		-alias "$alias" -file "$pem"
+		-alias "$alias" -file "$pem" > $log 2>&1
 	    then
 		echo "  added: ${line#+*}"
+	    elif grep -q 'Signature not available' $log; then
+		echo "  ignored import, signature not available: ${line#+*}"
+		cat $log
 	    else
 		echo >&2 "  error adding ${line#+*}"
 		errors=$(expr $errors + 1)
@@ -67,13 +71,14 @@
 		errors=$(expr $errors + 1)
 	    fi
 	else
-	    echo "  does not exists: ${line#-*}"
+	    echo "  does not exist: ${line#-*}"
 	fi
 	;;
     *)
 	echo >&2 "  $0: Unknown line $line"
     esac
 done
+rm -f $log
 
 if [ $errors -gt 0 ]; then
     echo >&2 "failed."