summaryrefslogtreecommitdiff
path: root/nonsystemd
diff options
context:
space:
mode:
Diffstat (limited to 'nonsystemd')
-rw-r--r--nonsystemd/p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch38
-rw-r--r--nonsystemd/p11-kit/PKGBUILD33
2 files changed, 43 insertions, 28 deletions
diff --git a/nonsystemd/p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch b/nonsystemd/p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch
index 3ccdbb757..22d932fa8 100644
--- a/nonsystemd/p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch
+++ b/nonsystemd/p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch
@@ -1,7 +1,6 @@
-From 8a1c9bb1170213498d3386d2a5c2882868e4f535 Mon Sep 17 00:00:00 2001
-Message-Id: <8a1c9bb1170213498d3386d2a5c2882868e4f535.1548110948.git.jan.steffens@gmail.com>
+From 5bc704e6a0de57d451cf551d74fa8543fc7ec9a0 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 1 Mar 2018 16:20:59 +0100
+Date: Tue, 10 Sep 2019 18:08:25 +0000
Subject: [PATCH] Build and install libnssckbi-p11-kit.so
Create an additional library which is a copy of p11-kit-trust.so but
@@ -11,11 +10,12 @@ uses the same label for root certs as libnssckbi.so:
https://bugs.freedesktop.org/show_bug.cgi?id=66161
---
trust/Makefile.am | 14 ++++++++++++++
+ trust/meson.build | 13 +++++++++++++
trust/module.c | 12 +++++++++++-
- 2 files changed, 25 insertions(+), 1 deletion(-)
+ 3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/trust/Makefile.am b/trust/Makefile.am
-index c4a65a3..303e1d0 100644
+index b050a8f..4943aba 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -66,6 +66,20 @@ p11_kit_trust_la_LDFLAGS = \
@@ -39,8 +39,32 @@ index c4a65a3..303e1d0 100644
libtrust_testable_la_LDFLAGS = \
-no-undefined
+diff --git a/trust/meson.build b/trust/meson.build
+index c5b978b..14993e5 100644
+--- a/trust/meson.build
++++ b/trust/meson.build
+@@ -58,6 +58,19 @@ shared_module('p11-kit-trust',
+ install: true,
+ install_dir: prefix / p11_module_path)
+
++shared_module('libnssckbi-p11-kit',
++ libtrust_sources,
++ 'module-init.c',
++ name_prefix: '',
++ c_args: p11_kit_trust_c_args + ['-DLIBNSSCKBI_COMPAT'],
++ dependencies: [libp11_library_dep] + libtasn1_deps,
++ link_args: p11_module_ldflags,
++ link_depends: [p11_module_symbol_map,
++ p11_module_symbol_def],
++ link_with: libtrust_data,
++ vs_module_defs: p11_module_symbol_def,
++ install: true)
++
+ libtrust_testable_c_args = [
+ '-DP11_DEFAULT_TRUST_PREFIX="@0@"'.format(meson.current_build_dir() / 'default'),
+ '-DP11_SYSTEM_TRUST_PREFIX="@0@"'.format(meson.current_build_dir() / 'system')
diff --git a/trust/module.c b/trust/module.c
-index 1722340..e776270 100644
+index ec3333d..9204673 100644
--- a/trust/module.c
+++ b/trust/module.c
@@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens,
@@ -72,5 +96,5 @@ index 1722340..e776270 100644
if (length > sizeof (info->slotDescription))
length = sizeof (info->slotDescription);
--
-2.20.1
+2.23.0
diff --git a/nonsystemd/p11-kit/PKGBUILD b/nonsystemd/p11-kit/PKGBUILD
index a0ceb202f..cb2dcfe37 100644
--- a/nonsystemd/p11-kit/PKGBUILD
+++ b/nonsystemd/p11-kit/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
pkgname=p11-kit
-pkgver=0.23.16.1
+pkgver=0.23.18.1
pkgrel=1
pkgrel+=.nonsystemd1
pkgdesc="Provides a way to load and enumerate PKCS#11 modules"
@@ -11,11 +11,11 @@ arch=(x86_64 i686 armv7h)
url="https://p11-glue.freedesktop.org"
license=(BSD)
depends=(glibc libtasn1 libffi)
-makedepends=(gtk-doc git)
+makedepends=(gtk-doc git meson)
source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver"
0001-Build-and-install-libnssckbi-p11-kit.so.patch)
sha256sums=('SKIP'
- 'a2222e092b2c9ae2d2c344b3268f8f86e7b424973433d49653f72e6c51fa54cf')
+ 'e832eece10587ac50ae42ca4515786b51e67fea0647716061e51cd94f5e058cd')
validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF' # Stef Walter
'462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
@@ -27,33 +27,24 @@ prepare() {
# libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
# https://bugs.freedesktop.org/show_bug.cgi?id=66161
patch -Np1 -i ../0001-Build-and-install-libnssckbi-p11-kit.so.patch
-
- NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd p11-kit
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-doc \
- --with-module-path=/usr/lib/pkcs11 \
- --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source \
- --without-systemd
- make
+ arch-meson p11-kit build \
+ -D gtk_doc=true \
+ -D man=true \
+ -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source \
+ -D systemd=disabled
+ ninja -C build
}
check() {
- cd p11-kit
- make check
+ meson test -C build --print-errorlogs
}
package() {
- cd p11-kit
- make DESTDIR="$pkgdir" install
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
-
+ DESTDIR="$pkgdir" meson install -C build
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit/COPYING
ln -srf "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib/p11-kit/trust-extract-compat"
}