* sync p11-kit with main arch

p11-kit/PKGBUILD

@@ -5,7 +5,7 @@
 pkgbase=p11-kit
 pkgname=(p11-kit libp11-kit)
 pkgver=0.23.20
-pkgrel=4
+pkgrel=5
 pkgdesc="Loads and enumerates PKCS#11 modules"
 url="https://p11-glue.freedesktop.org"
 arch=(x86_64 powerpc64le)
@@ -26,7 +26,7 @@ build() {
     -D gtk_doc=true \
     -D man=true \
     -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
-  ninja -C build
+  ninja -C build ${MAKEFLAGS}
 }
 
 check() {
@@ -44,7 +44,7 @@ _pick() {
 }
 
 package_p11-kit() {
-  depends=("libp11-kit=$pkgver-$pkgrel" systemd libp11-kit.so libsystemd.so)
+  depends=("libp11-kit=$pkgver-$pkgrel" coreutils libp11-kit.so libsystemd.so)
   install=p11-kit.install
 
   DESTDIR="$pkgdir" meson install -C build

p11-kit/p11-kit.install

@@ -1,14 +1,23 @@
-post_install() {
-  # Enable socket by default
-  systemctl --global enable p11-kit-server.socket
+_global_units() {
+    local unit=p11-kit-server.socket dir=/etc/systemd/user/sockets.target.wants
+
+    case $1 in
+        enable)
+            mkdir -p $dir
+            ln -sf /usr/lib/systemd/user/$unit $dir/$unit
+            ;;
+        disable)
+            rm -f $dir/$unit
+            rmdir -p --ignore-fail-on-non-empty $dir
+            ;;
+    esac
 }
 
-post_upgrade() {
-  if (( $(vercmp $2 0.23.13-1) < 0)); then
-    systemctl --global enable p11-kit-server.socket
-  fi
+post_install() {
+  # Enable socket by default
+  _global_units enable
 }
 
 pre_remove() {
-  systemctl --global disable p11-kit-server.socket
+  _global_units disable
 }