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

Pierre Schmitz pierre at nymeria.archlinux.org
Mon Mar 24 19:45:08 UTC 2014


    Date: Monday, March 24, 2014 @ 20:45:08
  Author: pierre
Revision: 208648

archrelease: copy trunk to testing-any

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

-------------------------+
 PKGBUILD                |   86 +++++++++++++++++++++++-----------------------
 ca-certificates.install |   49 ++++++++++++--------------
 2 files changed, 66 insertions(+), 69 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-24 19:44:22 UTC (rev 208647)
+++ PKGBUILD	2014-03-24 19:45:08 UTC (rev 208648)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=ca-certificates
-pkgver=20140223
-pkgrel=1
-pkgdesc='Common CA certificates'
-arch=('any')
-url='http://packages.qa.debian.org/c/ca-certificates.html'
-license=('MPL' 'GPL')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz")
-depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
-makedepends=('python2')
-install='ca-certificates.install'
-backup=('etc/ca-certificates.conf')
-sha256sums=('815b7cd97200b0d76450bb3e7d9b65997ac494ab6467b17369f65b2ef94bcb0c')
-
-prepare() {
-	cd ${srcdir}/${pkgname}
-	sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
-	sed 's|python|python2|g' -i mozilla/Makefile
-}
-
-build() {
-	cd ${srcdir}/${pkgname}
-	make
-}
-
-package() {
-	cd ${srcdir}/${pkgname}
-	install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
-	make install DESTDIR=${pkgdir}
-	mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
-	install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
-
-	(
-	echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
-	echo "# see update-ca-certificates man page"
-	echo "# "
-	cd ${pkgdir}/usr/share/ca-certificates
-	find . -name '*.crt' | sort | cut -b3-
-	) > ${pkgdir}/etc/ca-certificates.conf
-}

Copied: ca-certificates/repos/testing-any/PKGBUILD (from rev 208647, ca-certificates/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-03-24 19:45:08 UTC (rev 208648)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=ca-certificates
+pkgver=20140223
+pkgrel=2
+pkgdesc='Common CA certificates'
+arch=('any')
+url='http://packages.qa.debian.org/c/ca-certificates.html'
+license=('MPL' 'GPL')
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz")
+depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
+makedepends=('python2')
+install='ca-certificates.install'
+backup=('etc/ca-certificates.conf')
+sha256sums=('815b7cd97200b0d76450bb3e7d9b65997ac494ab6467b17369f65b2ef94bcb0c')
+
+prepare() {
+	cd ${srcdir}/${pkgname}
+	sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
+	sed 's|python|python2|g' -i mozilla/Makefile
+}
+
+build() {
+	cd ${srcdir}/${pkgname}
+	make SUBDIRS=mozilla
+}
+
+package() {
+	cd ${srcdir}/${pkgname}
+	install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
+	make install SUBDIRS=mozilla DESTDIR=${pkgdir}
+	mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
+	install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
+
+	(
+	echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
+	echo "# see update-ca-certificates man page"
+	echo "# "
+	cd ${pkgdir}/usr/share/ca-certificates
+	find . -name '*.crt' | sort | cut -b3-
+	) > ${pkgdir}/etc/ca-certificates.conf
+}

Deleted: ca-certificates.install
===================================================================
--- ca-certificates.install	2014-03-24 19:44:22 UTC (rev 208647)
+++ ca-certificates.install	2014-03-24 19:45:08 UTC (rev 208648)
@@ -1,26 +0,0 @@
-export LC_ALL=C
-
-post_install() {
-	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
-}
-
-post_upgrade() {
-	if [ $(vercmp $2 20110421-1) -lt 0 ]; then
-		echo 'Updating certificates. This might take a while...'
-	fi
-	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
-}
-
-pre_remove() {
-	# clean up certificates
-	local _backup=$(mktemp)
-	mv etc/ca-certificates.conf ${_backup}
-	echo > etc/ca-certificates.conf
-	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
-	mv ${_backup} etc/ca-certificates.conf
-}
-
-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
-}

Copied: ca-certificates/repos/testing-any/ca-certificates.install (from rev 208647, ca-certificates/trunk/ca-certificates.install)
===================================================================
--- ca-certificates.install	                        (rev 0)
+++ ca-certificates.install	2014-03-24 19:45:08 UTC (rev 208648)
@@ -0,0 +1,23 @@
+export LC_ALL=C
+
+post_install() {
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+}
+
+post_upgrade() {
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+}
+
+pre_remove() {
+	# clean up certificates
+	local _backup=$(mktemp)
+	mv etc/ca-certificates.conf ${_backup}
+	echo > etc/ca-certificates.conf
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+	mv ${_backup} etc/ca-certificates.conf
+}
+
+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
+}




More information about the arch-commits mailing list