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

[Pierre Schmitz]

    Date: Thursday, May 8, 2014 @ 18:00:26
  Author: pierre
Revision: 212130

upgpkg: ca-certificates-java 20140324-1

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

------------------------------+
 PKGBUILD                     |   29 ++++++++++++++---------------
 ca-certificates-java.install |    3 ---
 init-jks-keystore            |    2 +-
 jks-keystore.hook            |    2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-08 15:21:13 UTC (rev 212129)
+++ PKGBUILD	2014-05-08 16:00:26 UTC (rev 212130)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
 
 pkgname=ca-certificates-java
-pkgver=20130815
+pkgver=20140324
 pkgrel=1
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('any')
@@ -9,30 +10,28 @@
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'
 license=('GPL')
 depends=('ca-certificates')
-makedepends=('jdk7-openjdk')
+makedepends=('maven')
 checkdepends=('junit')
 install='ca-certificates-java.install'
 backup=('etc/default/cacerts')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz"
         'init-jks-keystore' 'jks-keystore.hook')
-md5sums=('f93e4762800515d6f12ceb397e80a150'
-         '75eeca3f443f4b5a17ed5ac81875f1e9'
-         '6dd4f915aee0df51260083e00b7fa012')
+md5sums=('18d945321d2cc391124d1c5f18617814'
+         '2daf767a756d74696afae926da539ddb'
+         '0beeef887fbab98e7d1d40ec0cd455dd')
 
+prepare() {
+	mkdir "${srcdir}/m2_repo"
+}
+
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-	javac -target 1.6 -source 1.6 UpdateCertificates.java
-	jar cfe ca-certificates-java.jar UpdateCertificates *.class
+	mvn package -Dmaven.repo.local="${srcdir}/m2_repo" -Dmaven.test.skip=true
 }
 
 check() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-
-	javac -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar \
-		UpdateCertificatesTest.java Exceptions.java
-	java -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar:. \
-		org.junit.runner.JUnitCore \
-		UpdateCertificatesTest
+	mvn -Dmaven.repo.local="${srcdir}/m2_repo" test
 }
 
 package() {
@@ -40,7 +39,7 @@
 
 	install -d -m755 ${pkgdir}/etc/ssl/certs/java
 	install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
-	install -D -m644 ca-certificates-java.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
+	install -D -m644 target/ca-certificates-java-${pkgver}.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
 	install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/bin/init-jks-keystore
 	install -D -m755 ${srcdir}/jks-keystore.hook ${pkgdir}/etc/ca-certificates/update.d/jks-keystore
 }

Modified: ca-certificates-java.install
===================================================================
--- ca-certificates-java.install	2014-05-08 15:21:13 UTC (rev 212129)
+++ ca-certificates-java.install	2014-05-08 16:00:26 UTC (rev 212130)
@@ -7,9 +7,6 @@
 }
 
 post_upgrade() {
-	if [ $(vercmp $2 20110426-2) -lt 0 ]; then
-		mv etc/ssl/certs/java/cacerts etc/ssl/certs/java/cacerts.pacsave
-	fi
 	post_install
 }
 

Modified: init-jks-keystore
===================================================================
--- init-jks-keystore	2014-05-08 15:21:13 UTC (rev 212129)
+++ init-jks-keystore	2014-05-08 16:00:26 UTC (rev 212130)
@@ -6,5 +6,5 @@
 JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
 find /etc/ssl/certs -name '*.pem' -printf "+%p\n" | \
-	java -jar $JAR -storepass "$storepass" >/dev/null
+	java -Xmx64m -jar $JAR -storepass "$storepass" >/dev/null
 echo "done."

Modified: jks-keystore.hook
===================================================================
--- jks-keystore.hook	2014-05-08 15:21:13 UTC (rev 212129)
+++ jks-keystore.hook	2014-05-08 16:00:26 UTC (rev 212130)
@@ -11,5 +11,5 @@
 
 JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
-java -jar $JAR -storepass "$storepass"
+java -Xmx64m -jar $JAR -storepass "$storepass"
 echo "done."