[arch-commits] Commit in ca-certificates/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, May 29, 2021 @ 18:02:13
  Author: heftig
Revision: 416835

20210529-1: Sync with upstream, although nothing relevant changed

Modified:
  ca-certificates/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-29 17:35:41 UTC (rev 416834)
+++ PKGBUILD	2021-05-29 18:02:13 UTC (rev 416835)
@@ -3,8 +3,8 @@
 
 pkgbase=ca-certificates
 pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20181109
-pkgrel=4
+pkgver=20210529
+pkgrel=1
 pkgdesc="Common CA certificates"
 url="https://src.fedoraproject.org/rpms/ca-certificates"
 arch=(any)
@@ -22,7 +22,7 @@
 
 package_ca-certificates-utils() {
   pkgdesc+=" (utilities)"
-  depends=('bash' 'coreutils' 'findutils' 'p11-kit>=0.23.19')
+  depends=(bash coreutils findutils 'p11-kit>=0.23.19')
   provides=(ca-certificates ca-certificates-java)
   conflicts=(ca-certificates-java)
   replaces=(ca-certificates-java)
@@ -32,6 +32,7 @@
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 
   # Trust source directories
+  # Upstream also adds "blocklist" but that's useless without support in p11-kit
   install -d "$pkgdir"/{etc,usr/share}/$pkgbase/trust-source/{anchors,blacklist}
 
   # Directories used by update-ca-trust (aka "trust extract-compat")
@@ -48,8 +49,8 @@
 package_ca-certificates() {
   pkgdesc+=" (default providers)"
   depends=(ca-certificates-mozilla)
-  replaces=('ca-certificates-cacert<=20140824-4')
   conflicts=('ca-certificates-cacert<=20140824-4')
+  replaces=("${conflicts[@]}")
 }
 
 # vim:set et sw=2: