From 67427992375e443e03ef898f7497c4e9d490b6de Mon Sep 17 00:00:00 2001
From: Luis <lumaro@disroot.org>
Date: Fri, 17 Nov 2023 11:25:18 +0000
Subject: [PATCH] p11-kit: upgrade to 0.25.3

---
 main/p11-kit/.pkgfiles |  7 ++++---
 main/p11-kit/spkgbuild | 28 ++++++++++++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/main/p11-kit/.pkgfiles b/main/p11-kit/.pkgfiles
index b8e1a9f67..0b87474d6 100644
--- a/main/p11-kit/.pkgfiles
+++ b/main/p11-kit/.pkgfiles
@@ -1,4 +1,4 @@
-p11-kit-0.25.3-1
+p11-kit-0.25.3-2
 drwxr-xr-x root/root    etc/
 drwxr-xr-x root/root    etc/pkcs11/
 -rw-r--r-- root/root    etc/pkcs11/pkcs11.conf.example
@@ -6,6 +6,7 @@ drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/p11-kit
 -rwxr-xr-x root/root    usr/bin/trust
+lrwxrwxrwx root/root    usr/bin/update-ca-trust -> /usr/lib/p11-kit/trust-extract-compat
 drwxr-xr-x root/root    usr/include/
 drwxr-xr-x root/root    usr/include/p11-kit-1/
 drwxr-xr-x root/root    usr/include/p11-kit-1/p11-kit/
@@ -18,10 +19,10 @@ drwxr-xr-x root/root    usr/include/p11-kit-1/p11-kit/
 -rw-r--r-- root/root    usr/include/p11-kit-1/p11-kit/remote.h
 -rw-r--r-- root/root    usr/include/p11-kit-1/p11-kit/uri.h
 drwxr-xr-x root/root    usr/lib/
-lrwxrwxrwx root/root    usr/lib/libp11-kit.so -> libp11-kit.so.0.3.1
+lrwxrwxrwx root/root    usr/lib/libp11-kit.so -> libp11-kit.so.0
 lrwxrwxrwx root/root    usr/lib/libp11-kit.so.0 -> libp11-kit.so.0.3.1
 -rwxr-xr-x root/root    usr/lib/libp11-kit.so.0.3.1
-lrwxrwxrwx root/root    usr/lib/p11-kit-proxy.so -> libp11-kit.so.0.3.1
+lrwxrwxrwx root/root    usr/lib/p11-kit-proxy.so -> libp11-kit.so.0
 drwxr-xr-x root/root    usr/lib/p11-kit/
 -rwxr-xr-x root/root    usr/lib/p11-kit/p11-kit-remote
 -rwxr-xr-x root/root    usr/lib/p11-kit/p11-kit-server
diff --git a/main/p11-kit/spkgbuild b/main/p11-kit/spkgbuild
index 81b177c09..30f4e4c10 100644
--- a/main/p11-kit/spkgbuild
+++ b/main/p11-kit/spkgbuild
@@ -1,20 +1,28 @@
 # description	: Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules
-# depends	: libtasn1 libffi
+# depends	: libtasn1 libffi meson ninja
 
 name=p11-kit
 version=0.25.3
-release=1
+release=2
 source="https://github.com/p11-glue/p11-kit/releases/download/$version/$name-$version.tar.xz"
 
 build() {
-	cd $name-$version
+	sed '20,$ d' -i $name-$version/trust/trust-extract-compat
 
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--with-trust-paths=/etc/pki/anchors	
-	make
-	make DESTDIR=$PKG install
+cat >> $name-$version/trust/trust-extract-compat << "EOF"
+# Copy existing anchor modifications to /etc/ssl/local
+/usr/lib/make-ca/copy-trust-modifications
+# Generate a new trust store
+/usr/sbin/make-ca -f -g
+EOF
+	venom-meson $name-$version build \
+		-D trust_paths=/etc/pki/anchors \
+		-D module_path=/usr/lib/pkcs11 \
+		-D nls=false
+	meson compile -C build
+	DESTDIR=$PKG meson install --no-rebuild -C build
 
+	ln -s /usr/lib/p11-kit/trust-extract-compat \
+		$PKG/usr/bin/update-ca-trust
 }
+