[arch-commits] Commit in ca-certificates/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Mon Sep 22 23:18:08 UTC 2014
Date: Tuesday, September 23, 2014 @ 01:18:08
Author: heftig
Revision: 222717
ca-certificates, the Fedora edition
Modified:
ca-certificates/trunk/PKGBUILD
ca-certificates/trunk/ca-certificates-utils.install
Deleted:
ca-certificates/trunk/confd.patch
-------------------------------+
PKGBUILD | 49 ++++++++++++++++++++++++++--------------
ca-certificates-utils.install | 25 ++++++++++++++------
confd.patch | 28 ----------------------
3 files changed, 50 insertions(+), 52 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-22 21:09:25 UTC (rev 222716)
+++ PKGBUILD 2014-09-22 23:18:08 UTC (rev 222717)
@@ -3,35 +3,50 @@
pkgbase=ca-certificates
pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20140325
+pkgver=20140923
pkgrel=2
pkgdesc='Common CA certificates'
arch=('any')
-url='http://packages.qa.debian.org/c/ca-certificates.html'
-license=('MPL' 'GPL')
-depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
-makedepends=('python2')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgbase}/${pkgbase}_${pkgver}.tar.xz"
- confd.patch)
-sha256sums=('c0e3d8c517995db2737f7f1a9b69d654b8823fa6d337871c6ce111fcf083454a'
- '6a6efe688bd7f40dc57d07ad6bfdbb83f4853a1964c55e0620e833e6c2945dab')
+url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
+license=('GPL2')
+depends=('sh' 'p11-kit')
+makedepends=('asciidoc')
+_commit=f81c301
+source=("update-ca-trust::$url/plain/update-ca-trust?id=$_commit"
+ "update-ca-trust.8.txt::$url/plain/update-ca-trust.8.txt?id=$_commit")
+sha256sums=('75ef2f4b0fddd2ca3c69b234a6abb66fd732e4af96814b65dcedb0dd52018381'
+ 'd31ac2bb5f1941aea0ac1e51861af7be224b6bb85820e30bb30793112aa785ba')
+_confdir=/etc/$pkgbase
+_datadir=/usr/share/$pkgbase
+
prepare() {
- cd "${srcdir}/${pkgbase}"
- patch -Np1 -i ../confd.patch
+ sed -i "s:/etc/pki/ca-trust:${_confdir}:g" update-ca-trust
}
package_ca-certificates-utils() {
pkgdesc+=" (utilities)"
- backup=('etc/ca-certificates.conf')
install=ca-certificates-utils.install
- provides=(ca-certificates)
+ provides=(ca-certificates ca-certificates-java)
+ conflicts=(ca-certificates-java)
+ replaces=(ca-certificates-java)
- cd "${srcdir}/${pkgbase}"
+ asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt
+ xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml
- install -d "${pkgdir}"/{etc/{ca-certificates/update.d,ssl/certs},usr/share/ca-certificates}
- install -Dm644 sbin/update-ca-certificates.8 "${pkgdir}/usr/share/man/man8/update-ca-certificates.8"
- install -D sbin/update-ca-certificates "${pkgdir}/usr/bin/update-ca-certificates"
+ install -D update-ca-trust "${pkgdir}/usr/bin/update-ca-trust"
+ install -Dm644 update-ca-trust.8 "${pkgdir}/usr/share/man/man8/update-ca-trust.8"
+
+ install -d "${pkgdir}"{${_confdir},${_datadir}}/trust-source/{anchors,blacklist}
+
+ _extractdir="${pkgdir}${_confdir}/extracted"
+ _ssldir="${pkgdir}/etc/ssl"
+
+ install -d "${_ssldir}/certs/java" "${_extractdir}"/{openssl,pem,java}
+ ln -sr "${_extractdir}/openssl/ca-bundle.trust.crt" "${_ssldir}/certs/ca-bundle.trust.crt"
+ ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/certs/ca-bundle.crt"
+ ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/cert.pem"
+ ln -sr "${_extractdir}/java/cacerts" "${_ssldir}/certs/java/cacerts"
}
package_ca-certificates() {
Modified: ca-certificates-utils.install
===================================================================
--- ca-certificates-utils.install 2014-09-22 21:09:25 UTC (rev 222716)
+++ ca-certificates-utils.install 2014-09-22 23:18:08 UTC (rev 222717)
@@ -1,18 +1,29 @@
export LC_ALL=C
post_install() {
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-trust
}
+pre_upgrade() {
+ if (( $(vercmp $2 20140923-2) < 0 )); then
+ find /etc/ssl/certs -type l -print | while read symlink; do
+ case $(readlink $symlink) in
+ /usr/share/ca-certificates*) rm -f $symlink;;
+ esac
+ done
+ find /etc/ssl/certs -type l -print | while read symlink; do
+ test -f $symlink || rm -f $symlink
+ done
+ rm -f /etc/ssl/certs/ca-certificates.crt
+ fi
+}
+
post_upgrade() {
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-trust
}
pre_remove() {
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-trust
}
-post_remove() {
- # remove the cert file if it is empty
- [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt
-}
+# vim:set noet ts=8 sw=8:
Deleted: confd.patch
===================================================================
--- confd.patch 2014-09-22 21:09:25 UTC (rev 222716)
+++ confd.patch 2014-09-22 23:18:08 UTC (rev 222717)
@@ -1,28 +0,0 @@
-diff -u -Nwr ca-certificates/sbin/update-ca-certificates ca-certificates.confd/sbin/update-ca-certificates
---- ca-certificates/sbin/update-ca-certificates 2014-03-13 13:43:00.000000000 +0100
-+++ ca-certificates.confd/sbin/update-ca-certificates 2014-08-24 13:36:19.264068119 +0200
-@@ -37,7 +37,7 @@
- shift
- done
-
--CERTSCONF=/etc/ca-certificates.conf
-+CERTSCONFS=/etc/ca-certificates/conf.d/*.conf
- CERTSDIR=/usr/share/ca-certificates
- LOCALCERTSDIR=/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
-@@ -101,6 +101,7 @@
-
- echo -n "Updating certificates in $ETCCERTSDIR... "
-
-+for CERTSCONF in $CERTSCONFS; do
- # Handle certificates that should be removed. This is an explicit act
- # by prefixing lines in the configuration files with exclamation marks (!).
- sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt
-@@ -117,6 +118,7 @@
- fi
- add "$CERTSDIR/$crt"
- done
-+done
-
- # Now process certificate authorities installed by the local system
- # administrator.
More information about the arch-commits
mailing list