Update outdated certificates

2 files changed, 34 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a9c8122f461..daffb9a91ff9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,26 @@
 # Generated by mksrcinfo v8
-# Sun Nov 20 17:34:42 UTC 2016
+# Tue May  9 22:29:11 UTC 2017
 pkgbase = ca-certificates-dnie
 	pkgdesc = Spanish DNIE root certificates
-	pkgver = 201611
+	pkgver = 20170509
 	pkgrel = 1
 	url = http://www.dnielectronico.es
 	arch = any
 	license = unknown
 	depends = ca-certificates-utils
 	depends = ca-certificates-fnmt
-	source = https://www.dnielectronico.es/ZIP/ACRAIZ-DNIE2.cab
-	source = https://www.dnielectronico.es/ZIP/ACDNIE004.zip
-	source = https://www.dnielectronico.es/ZIP/AC_DNIE_005.zip
-	source = https://www.dnielectronico.es/ZIP/AC_DNIE_006.zip
-	source = https://www.dnielectronico.es/descargas/certificados/AVDNIEMINHAP_SHA2.zip
-	source = https://www.dnielectronico.es/descargas/certificados/OCSP_VA_DNIE_FNMT_SHA2.rar
+	source = AC_RAIZ_DNIE_2_SHA2.cab::https://www.dnielectronico.es/ZIP/ACRAIZ-DNIE2.cab
+	source = AC_DNIE_004_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_004.crt
+	source = AC_DNIE_005_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_005.crt
+	source = AC_DNIE_006_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_006.crt
+	source = AV_DNIE_MINHAP_SHA2.zip::https://www.dnielectronico.es/descargas/certificados/AVDNIEMINHAP_SHA2.zip
+	source = AV_DNIE_FNMT_SHA2.rar::https://www.dnielectronico.es/descargas/certificados/Ocsp%20Responder%20AV%20DNIE-FNMT_SHA2.rar
 	sha256sums = 279745f40e4bd75f5ef72f2e02efe417a1a07e27fb5a9810fddbcfd40ac00f39
-	sha256sums = c31b68bb3eefadcbbfa3634f9cae733691ae40e4b7eeb6df9744676898cf7729
-	sha256sums = 03ef90cb69a97ae66bed937f256960c6238c385d9defdaac08bba51d49be0ffc
-	sha256sums = b168e63cbb41ece42cb0688d1f250e020c56195de881e70c4e69e9d5c5f09b8d
+	sha256sums = ebae99303045630764dc5cf9d5af9dc009354d8729c407b6bf9a136208046f6c
+	sha256sums = dbb9102b673343c281927c13b9cf92b8a49bcd2188d6e216107e2f0580b5754c
+	sha256sums = c4bb69dc80a9cf28a83438455b11f3cb239f3be68b3c23171560c5d657ebf653
 	sha256sums = 171f5c664bb2ccfd0cf130d782c18205d17cae08aa86bffa772bdc0d4897a3ad
-	sha256sums = 553bd5be205ecfa3a7efafcd83e18fdd8c415f59f9b536eda34ebbf46b3e4559
+	sha256sums = d877f25628a6bdc191eab52be19c2739ac379698ebe5119bca5dbfa87b08646e
 
 pkgname = ca-certificates-dnie
 
diff --git a/PKGBUILD b/PKGBUILD
index 07d4cea08b46..bde17f63e492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 DLAGENTS=("https::/usr/bin/curl -k -o %o %u")
 pkgname=ca-certificates-dnie
-pkgver=201611
+pkgver=20170509
 pkgrel=1
 pkgdesc="Spanish DNIE root certificates"
 arch=('any')
@@ -12,27 +12,31 @@ license=('unknown')
 depends=('ca-certificates-utils'
          'ca-certificates-fnmt'
          )
-source=('https://www.dnielectronico.es/ZIP/ACRAIZ-DNIE2.cab'
-        'https://www.dnielectronico.es/ZIP/ACDNIE004.zip'
-        'https://www.dnielectronico.es/ZIP/AC_DNIE_005.zip'
-        'https://www.dnielectronico.es/ZIP/AC_DNIE_006.zip'
-        'https://www.dnielectronico.es/descargas/certificados/AVDNIEMINHAP_SHA2.zip'
-        'https://www.dnielectronico.es/descargas/certificados/OCSP_VA_DNIE_FNMT_SHA2.rar'
+source=(
+        # Autoridad de Certificación Raíz del DNIe
+        'AC_RAIZ_DNIE_2_SHA2.cab::https://www.dnielectronico.es/ZIP/ACRAIZ-DNIE2.cab'
+        # Autoridades de Certificación, AC Subordinadas
+        'AC_DNIE_004_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_004.crt'
+        'AC_DNIE_005_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_005.crt'
+        'AC_DNIE_006_SHA2.crt::https://www.dnielectronico.es/ZIP/AC_DNIE_006.crt'
+        # Autoridad de Validación AV DNIE MINHAP
+        'AV_DNIE_MINHAP_SHA2.zip::https://www.dnielectronico.es/descargas/certificados/AVDNIEMINHAP_SHA2.zip'
+        # Autoridad de Validación AV DNIE FNMT
+        'AV_DNIE_FNMT_SHA2.rar::https://www.dnielectronico.es/descargas/certificados/Ocsp%20Responder%20AV%20DNIE-FNMT_SHA2.rar'
         )
 sha256sums=('279745f40e4bd75f5ef72f2e02efe417a1a07e27fb5a9810fddbcfd40ac00f39'
-            'c31b68bb3eefadcbbfa3634f9cae733691ae40e4b7eeb6df9744676898cf7729'
-            '03ef90cb69a97ae66bed937f256960c6238c385d9defdaac08bba51d49be0ffc'
-            'b168e63cbb41ece42cb0688d1f250e020c56195de881e70c4e69e9d5c5f09b8d'
+            'ebae99303045630764dc5cf9d5af9dc009354d8729c407b6bf9a136208046f6c'
+            'dbb9102b673343c281927c13b9cf92b8a49bcd2188d6e216107e2f0580b5754c'
+            'c4bb69dc80a9cf28a83438455b11f3cb239f3be68b3c23171560c5d657ebf653'
             '171f5c664bb2ccfd0cf130d782c18205d17cae08aa86bffa772bdc0d4897a3ad'
-            '553bd5be205ecfa3a7efafcd83e18fdd8c415f59f9b536eda34ebbf46b3e4559'
+            'd877f25628a6bdc191eab52be19c2739ac379698ebe5119bca5dbfa87b08646e'
             )
 
 package() {
-  install -d "${pkgdir}/usr/share/ca-certificates/trust-source/anchors"
-  install -Dm644 "AC RAIZ DNIE 2.crt" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_RAIZ_DNIE_2.crt"
-  install -Dm644 "AC DNIE 004.crt" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_004.crt"
-  install -Dm644 "AC_DNIE_005.crt" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_005.crt"
-  install -Dm644 "AC_DNIE_006.crt" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_006.crt"
-  install -Dm644 "OCSP_VA_DNIE_FNMT_SHA2.cer" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/OCSP_VA_DNIE_FNMT_SHA2.cer"
-  install -Dm644 "AVDNIEMINHAP_SHA2.cer" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AVDNIEMINHAP_SHA2.cer"
+  install -Dm644 "AC RAIZ DNIE 2.crt"                   "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_RAIZ_DNIE_2_SHA2.crt"
+  install -Dm644 "AC_DNIE_004_SHA2.crt"                 "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_004_SHA2.crt"
+  install -Dm644 "AC_DNIE_005_SHA2.crt"                 "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_005_SHA2.crt"
+  install -Dm644 "AC_DNIE_006_SHA2.crt"                 "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AC_DNIE_006_SHA2.crt"
+  install -Dm644 "AVDNIEMINHAP_SHA2.cer"                "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AV_DNIE_MINHAP_SHA2.cer"
+  install -Dm644 "Ocsp Responder AV DNIE-FNMT_SHA2.cer" "${pkgdir}/usr/share/ca-certificates/trust-source/anchors/AV_DNIE_FNMT_SHA2.cer"
 }