[arch-commits] Commit in ca-certificates/repos/testing-any (4 files)

Jan Steffens heftig at archlinux.org
Tue Sep 23 04:20:38 UTC 2014


    Date: Tuesday, September 23, 2014 @ 06:20:38
  Author: heftig
Revision: 222733

archrelease: copy trunk to testing-any

Added:
  ca-certificates/repos/testing-any/PKGBUILD
    (from rev 222732, ca-certificates/trunk/PKGBUILD)
  ca-certificates/repos/testing-any/ca-certificates-utils.install
    (from rev 222732, ca-certificates/trunk/ca-certificates-utils.install)
Deleted:
  ca-certificates/repos/testing-any/PKGBUILD
  ca-certificates/repos/testing-any/ca-certificates-utils.install

-------------------------------+
 PKGBUILD                      |  115 ++++++++++++++++++++--------------------
 ca-certificates-utils.install |   58 ++++++++++----------
 2 files changed, 87 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-23 04:19:00 UTC (rev 222732)
+++ PKGBUILD	2014-09-23 04:20:38 UTC (rev 222733)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=ca-certificates
-pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20140923
-pkgrel=2
-pkgdesc='Common CA certificates'
-arch=('any')
-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() {
-	sed -i "s:/etc/pki/ca-trust:${_confdir}:g" update-ca-trust
-}
-
-package_ca-certificates-utils() {
-	pkgdesc+=" (utilities)"
-	install=ca-certificates-utils.install
-	provides=(ca-certificates ca-certificates-java)
-	conflicts=(ca-certificates-java)
-	replaces=(ca-certificates-java)
-
-	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 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() {
-	pkgdesc+=" (default providers)"
-	depends=(ca-certificates-{mozilla,cacert})
-}
-
-# vim:set noet ts=8 sw=8:

Copied: ca-certificates/repos/testing-any/PKGBUILD (from rev 222732, ca-certificates/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-09-23 04:20:38 UTC (rev 222733)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=ca-certificates
+pkgname=(ca-certificates-utils ca-certificates)
+pkgver=20140923
+pkgrel=3
+pkgdesc='Common CA certificates'
+arch=('any')
+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() {
+	sed -i "s:/etc/pki/ca-trust:${_confdir}:g" update-ca-trust
+}
+
+package_ca-certificates-utils() {
+	pkgdesc+=" (utilities)"
+	install=ca-certificates-utils.install
+	provides=(ca-certificates ca-certificates-java)
+	conflicts=(ca-certificates-java)
+	replaces=(ca-certificates-java)
+
+	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 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}/certs/ca-certificates.crt"
+	ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/cert.pem"
+	ln -sr "${_extractdir}/java/cacerts" "${_ssldir}/certs/java/cacerts"
+}
+
+package_ca-certificates() {
+	pkgdesc+=" (default providers)"
+	depends=(ca-certificates-{mozilla,cacert})
+}
+
+# vim:set noet ts=8 sw=8:

Deleted: ca-certificates-utils.install
===================================================================
--- ca-certificates-utils.install	2014-09-23 04:19:00 UTC (rev 222732)
+++ ca-certificates-utils.install	2014-09-23 04:20:38 UTC (rev 222733)
@@ -1,29 +0,0 @@
-export LC_ALL=C
-
-post_install() {
-	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-trust
-}
-
-pre_remove() {
-	usr/bin/update-ca-trust
-}
-
-# vim:set noet ts=8 sw=8:

Copied: ca-certificates/repos/testing-any/ca-certificates-utils.install (from rev 222732, ca-certificates/trunk/ca-certificates-utils.install)
===================================================================
--- ca-certificates-utils.install	                        (rev 0)
+++ ca-certificates-utils.install	2014-09-23 04:20:38 UTC (rev 222733)
@@ -0,0 +1,29 @@
+export LC_ALL=C
+
+post_install() {
+	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-trust
+}
+
+pre_remove() {
+	usr/bin/update-ca-trust
+}
+
+# vim:set noet ts=8 sw=8:




More information about the arch-commits mailing list