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

[Pierre Schmitz]

    Date: Friday, December 17, 2010 @ 00:53:00
  Author: pierre
Revision: 103282

fix tempfile usage

Modified:
  ca-certificates-java/trunk/PKGBUILD
  ca-certificates-java/trunk/jks-keystore.hook.patch
Deleted:
  ca-certificates-java/trunk/default
  ca-certificates-java/trunk/jks-keystore.hook

-------------------------+
 PKGBUILD                |    6 +--
 default                 |   10 -----
 jks-keystore.hook       |   87 ----------------------------------------------
 jks-keystore.hook.patch |   11 ++++-
 4 files changed, 12 insertions(+), 102 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-17 05:19:12 UTC (rev 103281)
+++ PKGBUILD	2010-12-17 05:53:00 UTC (rev 103282)
@@ -3,7 +3,7 @@
 
 pkgname=ca-certificates-java
 pkgver=20100412
-pkgrel=1
+pkgrel=2
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'
@@ -14,7 +14,7 @@
 source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
         'jks-keystore.hook.patch' 'init-jks-keystore')
 md5sums=('16a5d04148d17923a4d838214dd9b867'
-         'e2009af18d0c61d067117ca982dee97f'
+         '301bfcf5ca39f22673f069eb7dd66dbb'
          '82dcec93bb328ae68db33c8177fb3858')
 
 build() {
@@ -57,4 +57,4 @@
 	install -D -m644 ${srcdir}/build/cacerts ${pkgdir}/usr/share/ca-certificates-java/cacerts
 	install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
 	install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/sbin/init-jks-keystore
-}
\ No newline at end of file
+}

Deleted: default
===================================================================
--- default	2010-12-17 05:19:12 UTC (rev 103281)
+++ default	2010-12-17 05:53:00 UTC (rev 103282)
@@ -1,10 +0,0 @@
-# defaults for ca-certificates-java
-
-# The password which is used to protect the integrity of the keystore.
-# storepass must be at least 6 characters long. It must be provided to
-# all commands that access the keystore contents.
-# Only change this if adding private certificates.
-#storepass=''
-
-# enable/disable updates of the keystore /etc/ssl/certs/java/cacerts
-cacerts_updates=yes

Deleted: jks-keystore.hook
===================================================================
--- jks-keystore.hook	2010-12-17 05:19:12 UTC (rev 103281)
+++ jks-keystore.hook	2010-12-17 05:53:00 UTC (rev 103282)
@@ -1,87 +0,0 @@
-#! /bin/sh
-
-set -e
-
-storepass='changeit'
-if [ -f /etc/default/cacerts ]; then
-    . /etc/default/cacerts
-fi
-
-KEYSTORE=/etc/ssl/certs/java/cacerts
-
-echo ""
-if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then
-    echo "updates of cacerts keystore disabled."
-    exit 0
-fi
-
-for jvm in /usr/lib/jvm/java-6-openjdk /opt/java/jre; do
-    if [ -x $jvm/bin/keytool ]; then
-	break
-    fi
-done
-
-if [ ! -x $jvm/bin/keytool ]; then
-  exit 0
-fi
-
-export JAVA_HOME=$jvm
-PATH=$JAVA_HOME/bin:$PATH
-
-# read lines of the form: [+-]/etc/ssl/certs/*.pem
-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 _)
-    alias=${alias%*_}
-    LANG=C LC_ALL=C keytool -list -keystore $KEYSTORE \
-	-storepass "$storepass" -alias "$alias" >/dev/null 2>&1 \
-	&& exists=yes || exists=no
-    case "$line" in
-    +*)
-	if [ "$exists" = yes ]; then
-	    echo "  already exists: ${line#+*}"
-	else
-	    if LANG=C LC_ALL=C keytool -importcert -trustcacerts \
-		-keystore $KEYSTORE -noprompt -storepass "$storepass" \
-		-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)
-	    fi
-	fi
-	;;
-    -*)
-	if [ "$exists" = yes ]; then
-	    if LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \
-		-noprompt -storepass "$storepass" \
-		-alias "$alias"
-	    then
-		echo "  removed ${line#-*}"
-	    else
-		echo >&2 "  error removing ${line#+*}"
-		errors=$(expr $errors + 1)
-	    fi
-	else
-	    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."
-    exit 1
-fi
-echo "done."

Modified: jks-keystore.hook.patch
===================================================================
--- jks-keystore.hook.patch	2010-12-17 05:19:12 UTC (rev 103281)
+++ jks-keystore.hook.patch	2010-12-17 05:53:00 UTC (rev 103282)
@@ -1,6 +1,6 @@
 --- jks-keystore.hook	2010-04-11 20:47:48.000000000 +0200
-+++ jks-keystore.hook	2010-10-24 14:52:38.837234542 +0200
-@@ -28,14 +28,6 @@
++++ jks-keystore.hook	2010-12-17 06:43:45.570350448 +0100
+@@ -28,20 +28,12 @@
  export JAVA_HOME=/usr/lib/jvm/$jvm
  PATH=$JAVA_HOME/bin:$PATH
  
@@ -15,6 +15,13 @@
  # read lines of the form: [+-]/etc/ssl/certs/*.pem
  
  echo "updating keystore $KEYSTORE..."
+ 
+ errors=0
+-log=$(tempfile)
++log=$(mktemp)
+ while read line; do
+     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 \
  		-keystore $KEYSTORE -noprompt -storepass "$storepass" \