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

[Pierre Schmitz]

    Date: Friday, June 29, 2012 @ 04:16:01
  Author: pierre
Revision: 162731

upgpkg: ca-certificates-java 20120608-1

upstream update

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

-------------------+
 PKGBUILD          |   11 ++++++-----
 init-jks-keystore |    5 ++---
 jks-keystore.hook |    5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-29 07:49:46 UTC (rev 162730)
+++ PKGBUILD	2012-06-29 08:16:01 UTC (rev 162731)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=ca-certificates-java
-pkgver=20120524
+pkgver=20120608
 pkgrel=1
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('any')
@@ -14,13 +14,14 @@
 backup=('etc/default/cacerts')
 source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
         'init-jks-keystore' 'jks-keystore.hook')
-md5sums=('ae043a6c77629546007575d7e152a679'
-         '0fd9b0831a8499a4a246e2ecb998c438'
-         '84fe0a111e9fe5afadaad8573430a9d1')
+md5sums=('171de7983f5a958faf89ec0dbb43f838'
+         '75eeca3f443f4b5a17ed5ac81875f1e9'
+         '6dd4f915aee0df51260083e00b7fa012')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	javac -target 1.6 -source 1.6 UpdateCertificates.java
+	jar cfe ca-certificates-java.jar UpdateCertificates *.class
 }
 
 package() {
@@ -28,7 +29,7 @@
 
 	install -d -m755 ${pkgdir}/etc/ssl/certs/java
 	install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
-	install -D -m755 UpdateCertificates.class ${pkgdir}/usr/share/ca-certificates-java/UpdateCertificates.class
+	install -D -m644 ca-certificates-java.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
 	install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/sbin/init-jks-keystore
 	install -D -m755 ${srcdir}/jks-keystore.hook ${pkgdir}/etc/ca-certificates/update.d/jks-keystore
 }

Modified: init-jks-keystore
===================================================================
--- init-jks-keystore	2012-06-29 07:49:46 UTC (rev 162730)
+++ init-jks-keystore	2012-06-29 08:16:01 UTC (rev 162731)
@@ -3,9 +3,8 @@
 storepass='changeit'
 . /etc/default/cacerts
 
-CLASSPATH=/usr/share/ca-certificates-java
-export CLASSPATH
+JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
 find /etc/ssl/certs -name '*.pem' -printf "+%p\n" | \
-	java UpdateCertificates -storepass "${storepass}" >/dev/null
+	java -jar $JAR -storepass "$storepass" >/dev/null
 echo "done."

Modified: jks-keystore.hook
===================================================================
--- jks-keystore.hook	2012-06-29 07:49:46 UTC (rev 162730)
+++ jks-keystore.hook	2012-06-29 08:16:01 UTC (rev 162731)
@@ -9,8 +9,7 @@
 	exit 0
 fi
 
-CLASSPATH=/usr/share/ca-certificates-java
-export CLASSPATH
+JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
-java UpdateCertificates -storepass "$storepass"
+java -jar $JAR -storepass "$storepass"
 echo "done."