From 094eaa83c48b05b81fc02c3761cc7ffbc36124fb Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Sun, 31 Aug 2014 01:08:00 +0100
Subject: [PATCH] ca-certificates: Add a sleep 0.5 before cp -f in install

---
 mingw-w64-ca-certificates/PKGBUILD                   | 12 ++++++++++--
 .../ca-certificates-i686.install                     |  2 ++
 .../ca-certificates-x86_64.install                   |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-ca-certificates/PKGBUILD b/mingw-w64-ca-certificates/PKGBUILD
index 462e9e44f6..4a1bd0c902 100644
--- a/mingw-w64-ca-certificates/PKGBUILD
+++ b/mingw-w64-ca-certificates/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=ca-certificates
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=20140325
-pkgrel=2
+pkgrel=3
 pkgdesc='Common CA certificates'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates.html'
@@ -53,6 +53,14 @@ EOF
     echo '#';
   ) > ${srcdir}/${_realname}/ca-bundle.trust.crt
 
+  # Make sure repeat runs don't accumulate duplicate certs.
+  if [ -f ${srcdir}/${pkgname}/ca-bundle.neutral-trust.crt ]; then
+    rm -f ${srcdir}/${pkgname}/ca-bundle.neutral-trust.crt
+  fi
+  if [ -f ${srcdir}/${pkgname}/ca-bundle.supplement.p11-kit ]; then
+    rm -f ${srcdir}/${pkgname}/ca-bundle.supplement.p11-kit
+  fi
+
   > info.trust
   > info.notrust
 
@@ -97,7 +105,7 @@ EOF
 
 package() {
   cd ${srcdir}/${_realname}
-  
+
   mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,share}
   mkdir -p ${pkgdir}${MINGW_PREFIX}/etc
   mkdir -p ${pkgdir}${MINGW_PREFIX}/share/man/man8
diff --git a/mingw-w64-ca-certificates/ca-certificates-i686.install b/mingw-w64-ca-certificates/ca-certificates-i686.install
index b3fce9c4e0..432326aa6b 100644
--- a/mingw-w64-ca-certificates/ca-certificates-i686.install
+++ b/mingw-w64-ca-certificates/ca-certificates-i686.install
@@ -12,6 +12,8 @@ post_install() {
   ${_mingw_prefix}/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
   ${_mingw_prefix}/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
 
+  # These files end up not being overwritten without a sleep
+  sleep 0.5
   mkdir -p ${_mingw_prefix}/ssl/certs
   cp -f $DEST/pem/tls-ca-bundle.pem ${_mingw_prefix}/ssl/certs/ca-bundle.crt
   cp -f $DEST/pem/tls-ca-bundle.pem ${_mingw_prefix}/ssl/cert.pem
diff --git a/mingw-w64-ca-certificates/ca-certificates-x86_64.install b/mingw-w64-ca-certificates/ca-certificates-x86_64.install
index 5ba7dc4a78..aedae6b8ac 100644
--- a/mingw-w64-ca-certificates/ca-certificates-x86_64.install
+++ b/mingw-w64-ca-certificates/ca-certificates-x86_64.install
@@ -12,6 +12,8 @@ post_install() {
   ${_mingw_prefix}/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
   ${_mingw_prefix}/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
 
+  # These files end up not being overwritten without a sleep
+  sleep 0.5
   mkdir -p ${_mingw_prefix}/ssl/certs
   cp -f $DEST/pem/tls-ca-bundle.pem ${_mingw_prefix}/ssl/certs/ca-bundle.crt
   cp -f $DEST/pem/tls-ca-bundle.pem ${_mingw_prefix}/ssl/cert.pem