Date: Saturday, May 10, 2014 @ 00:56:00 Author: guillaume Revision: 212187
archrelease: copy trunk to testing-any Added: ca-certificates-java/repos/testing-any/PKGBUILD (from rev 212186, ca-certificates-java/trunk/PKGBUILD) ca-certificates-java/repos/testing-any/ca-certificates-java.install (from rev 212186, ca-certificates-java/trunk/ca-certificates-java.install) ca-certificates-java/repos/testing-any/init-jks-keystore (from rev 212186, ca-certificates-java/trunk/init-jks-keystore) ca-certificates-java/repos/testing-any/jks-keystore.hook (from rev 212186, ca-certificates-java/trunk/jks-keystore.hook) Deleted: ca-certificates-java/repos/testing-any/PKGBUILD ca-certificates-java/repos/testing-any/ca-certificates-java.install ca-certificates-java/repos/testing-any/init-jks-keystore ca-certificates-java/repos/testing-any/jks-keystore.hook ------------------------------+ PKGBUILD | 90 ++++++++++++++++++++--------------------- ca-certificates-java.install | 30 ++++++------- init-jks-keystore | 23 +++++----- jks-keystore.hook | 30 ++++++------- 4 files changed, 88 insertions(+), 85 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-05-09 22:42:07 UTC (rev 212186) +++ PKGBUILD 2014-05-09 22:56:00 UTC (rev 212187) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Guillaume ALAUX <guilla...@archlinux.org> - -pkgname=ca-certificates-java -pkgver=20140324 -pkgrel=1 -pkgdesc='Common CA certificates (JKS keystore)' -arch=('any') -url='http://packages.qa.debian.org/c/ca-certificates-java.html' -license=('GPL') -depends=('ca-certificates') -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.xz" - 'init-jks-keystore' 'jks-keystore.hook') -md5sums=('18d945321d2cc391124d1c5f18617814' - '2daf767a756d74696afae926da539ddb' - '0beeef887fbab98e7d1d40ec0cd455dd') - -prepare() { - mkdir "${srcdir}/m2_repo" -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - mvn package -Dmaven.repo.local="${srcdir}/m2_repo" -Dmaven.test.skip=true -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - mvn -Dmaven.repo.local="${srcdir}/m2_repo" test -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - install -d -m755 ${pkgdir}/etc/ssl/certs/java - install -D -m600 debian/default ${pkgdir}/etc/default/cacerts - 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 -} Copied: ca-certificates-java/repos/testing-any/PKGBUILD (from rev 212186, ca-certificates-java/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-05-09 22:56:00 UTC (rev 212187) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Guillaume ALAUX <guilla...@archlinux.org> + +pkgname=ca-certificates-java +pkgver=20140324 +pkgrel=2 +pkgdesc='Common CA certificates (JKS keystore)' +arch=('any') +url='http://packages.qa.debian.org/c/ca-certificates-java.html' +license=('GPL') +depends=('ca-certificates') +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.xz" + 'init-jks-keystore' 'jks-keystore.hook') +md5sums=('18d945321d2cc391124d1c5f18617814' + '711212885d25fca96ad6689af5d7ec2a' + '0beeef887fbab98e7d1d40ec0cd455dd') + +prepare() { + mkdir "${srcdir}/m2_repo" +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + mvn package -Dmaven.repo.local="${srcdir}/m2_repo" -Dmaven.test.skip=true +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + mvn -Dmaven.repo.local="${srcdir}/m2_repo" test +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -d -m755 ${pkgdir}/etc/ssl/certs/java + install -D -m600 debian/default ${pkgdir}/etc/default/cacerts + 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 +} Deleted: ca-certificates-java.install =================================================================== --- ca-certificates-java.install 2014-05-09 22:42:07 UTC (rev 212186) +++ ca-certificates-java.install 2014-05-09 22:56:00 UTC (rev 212187) @@ -1,15 +0,0 @@ -post_install() { - if [ ! -f etc/ssl/certs/java/cacerts ]; then - if which java >/dev/null 2>&1; then - usr/bin/init-jks-keystore - fi - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - rm -rf etc/ssl/certs/java -} Copied: ca-certificates-java/repos/testing-any/ca-certificates-java.install (from rev 212186, ca-certificates-java/trunk/ca-certificates-java.install) =================================================================== --- ca-certificates-java.install (rev 0) +++ ca-certificates-java.install 2014-05-09 22:56:00 UTC (rev 212187) @@ -0,0 +1,15 @@ +post_install() { + if [ ! -f etc/ssl/certs/java/cacerts ]; then + if which java >/dev/null 2>&1; then + usr/bin/init-jks-keystore + fi + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + rm -rf etc/ssl/certs/java +} Deleted: init-jks-keystore =================================================================== --- init-jks-keystore 2014-05-09 22:42:07 UTC (rev 212186) +++ init-jks-keystore 2014-05-09 22:56:00 UTC (rev 212187) @@ -1,10 +0,0 @@ -#!/bin/sh - -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 -jar $JAR -storepass "$storepass" >/dev/null -echo "done." Copied: ca-certificates-java/repos/testing-any/init-jks-keystore (from rev 212186, ca-certificates-java/trunk/init-jks-keystore) =================================================================== --- init-jks-keystore (rev 0) +++ init-jks-keystore 2014-05-09 22:56:00 UTC (rev 212187) @@ -0,0 +1,13 @@ +#!/bin/sh + +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 Deleted: jks-keystore.hook =================================================================== --- jks-keystore.hook 2014-05-09 22:42:07 UTC (rev 212186) +++ jks-keystore.hook 2014-05-09 22:56:00 UTC (rev 212187) @@ -1,15 +0,0 @@ -#! /bin/sh - -storepass='changeit' -. /etc/default/cacerts - -echo "" -if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then - echo "updates of cacerts keystore disabled." - exit 0 -fi - -JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar - -java -Xmx64m -jar $JAR -storepass "$storepass" -echo "done." Copied: ca-certificates-java/repos/testing-any/jks-keystore.hook (from rev 212186, ca-certificates-java/trunk/jks-keystore.hook) =================================================================== --- jks-keystore.hook (rev 0) +++ jks-keystore.hook 2014-05-09 22:56:00 UTC (rev 212187) @@ -0,0 +1,15 @@ +#! /bin/sh + +storepass='changeit' +. /etc/default/cacerts + +echo "" +if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then + echo "updates of cacerts keystore disabled." + exit 0 +fi + +JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar + +java -Xmx64m -jar $JAR -storepass "$storepass" +echo "done."