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

[Guillaume Alaux]

    Date: Monday, September 15, 2014 @ 23:17:41
  Author: guillaume
Revision: 221789

Package scripts cleanup

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

-------------------+
 PKGBUILD          |    6 +++---
 init-jks-keystore |   12 +++++-------
 jks-keystore.hook |   15 +++++++--------
 3 files changed, 15 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-15 21:01:27 UTC (rev 221788)
+++ PKGBUILD	2014-09-15 21:17:41 UTC (rev 221789)
@@ -4,7 +4,7 @@
 
 pkgname=ca-certificates-java
 pkgver=20140324
-pkgrel=3
+pkgrel=4
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'
@@ -17,8 +17,8 @@
 source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz"
         'init-jks-keystore' 'jks-keystore.hook')
 md5sums=('18d945321d2cc391124d1c5f18617814'
-         '711212885d25fca96ad6689af5d7ec2a'
-         '86bf6140d0cec77d31c7c35a3920102a')
+         '17a08ac42ef3cd2d30461e7d7a5eafca'
+         '2023ace3c0a4d307b736d871941e38e1')
 
 prepare() {
 	mkdir "${srcdir}/m2_repo"

Modified: init-jks-keystore
===================================================================
--- init-jks-keystore	2014-09-15 21:01:27 UTC (rev 221788)
+++ init-jks-keystore	2014-09-15 21:17:41 UTC (rev 221789)
@@ -3,11 +3,9 @@
 storepass='changeit'
 . /etc/default/cacerts
 
-JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
-
 find /etc/ssl/certs -name '*.pem' -printf "+%p\n" | \
-  java -Xmx64m -cp $JAR org.debian.security.UpdateCertificates -storepass "$storepass" >/dev/null
-
-if [ $? -eq 0 ]; then
-  echo "done."
-fi
+  java \
+    -cp /usr/share/ca-certificates-java/ca-certificates-java.jar \
+    org.debian.security.UpdateCertificates \
+    -storepass "$storepass" \
+    >/dev/null

Modified: jks-keystore.hook
===================================================================
--- jks-keystore.hook	2014-09-15 21:01:27 UTC (rev 221788)
+++ jks-keystore.hook	2014-09-15 21:17:41 UTC (rev 221789)
@@ -1,15 +1,14 @@
-#! /bin/sh
+#!/bin/sh
 
 storepass='changeit'
 . /etc/default/cacerts
 
-echo ""
 if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then
-	echo "updates of cacerts keystore disabled."
-	exit 0
+  echo "updates of cacerts keystore disabled."
+  exit 0
 fi
 
-JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
-
-java -Xmx64m -cp $JAR org.debian.security.UpdateCertificates -storepass "$storepass"
-echo "done."
+java \
+  -cp /usr/share/ca-certificates-java/ca-certificates-java.jar \
+  org.debian.security.UpdateCertificates \
+  -storepass "$storepass"