diff options
| -rw-r--r-- | nonsystemd-multilib/lib32-p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch | 76 | ||||
| -rw-r--r-- | nonsystemd-multilib/lib32-p11-kit/PKGBUILD | 65 |
2 files changed, 24 insertions, 117 deletions
diff --git a/nonsystemd-multilib/lib32-p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch b/nonsystemd-multilib/lib32-p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch deleted file mode 100644 index 3ccdbb757..000000000 --- a/nonsystemd-multilib/lib32-p11-kit/0001-Build-and-install-libnssckbi-p11-kit.so.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 8a1c9bb1170213498d3386d2a5c2882868e4f535 Mon Sep 17 00:00:00 2001 -Message-Id: <8a1c9bb1170213498d3386d2a5c2882868e4f535.1548110948.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Thu, 1 Mar 2018 16:20:59 +0100 -Subject: [PATCH] Build and install libnssckbi-p11-kit.so - -Create an additional library which is a copy of p11-kit-trust.so but -uses the same label for root certs as libnssckbi.so: - "Builtin Object Token" instead of "Default Trust". - -https://bugs.freedesktop.org/show_bug.cgi?id=66161 ---- - trust/Makefile.am | 14 ++++++++++++++ - trust/module.c | 12 +++++++++++- - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/trust/Makefile.am b/trust/Makefile.am -index c4a65a3..303e1d0 100644 ---- a/trust/Makefile.am -+++ b/trust/Makefile.am -@@ -66,6 +66,20 @@ p11_kit_trust_la_LDFLAGS = \ - - p11_kit_trust_la_SOURCES = $(TRUST_SRCS) trust/module-init.c - -+libnssckbi_compatdir = $(libdir) -+libnssckbi_compat_LTLIBRARIES = \ -+ libnssckbi-p11-kit.la -+ -+libnssckbi_p11_kit_la_CFLAGS = \ -+ -DLIBNSSCKBI_COMPAT \ -+ $(p11_kit_trust_la_CFLAGS) -+ -+libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD) -+ -+libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS) -+ -+libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES) -+ - libtrust_testable_la_LDFLAGS = \ - -no-undefined - -diff --git a/trust/module.c b/trust/module.c -index 1722340..e776270 100644 ---- a/trust/module.c -+++ b/trust/module.c -@@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens, - int flags; - } labels[] = { - { "~/", "User Trust", P11_TOKEN_FLAG_NONE }, -+#ifdef LIBNSSCKBI_COMPAT -+ { P11_DEFAULT_TRUST_PREFIX, "Builtin Object Token", P11_TOKEN_FLAG_WRITE_PROTECTED }, -+#else - { P11_DEFAULT_TRUST_PREFIX, "Default Trust", P11_TOKEN_FLAG_WRITE_PROTECTED }, -+#endif - { P11_SYSTEM_TRUST_PREFIX, "System Trust", P11_TOKEN_FLAG_NONE }, - { NULL }, - }; -@@ -534,8 +538,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, - info->flags = CKF_TOKEN_PRESENT; - memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - -+#ifdef LIBNSSCKBI_COMPAT -+ /* Change description to match libnssckbi so HPKP works in Chromium */ -+ if (strcmp (p11_token_get_label (token), "Builtin Object Token") == 0) -+ path = "NSS Builtin Objects"; -+ else -+#endif -+ path = p11_token_get_path (token); - /* If too long, copy the first 64 characters into buffer */ -- path = p11_token_get_path (token); - length = strlen (path); - if (length > sizeof (info->slotDescription)) - length = sizeof (info->slotDescription); --- -2.20.1 - diff --git a/nonsystemd-multilib/lib32-p11-kit/PKGBUILD b/nonsystemd-multilib/lib32-p11-kit/PKGBUILD index f1d32d26e..42454e260 100644 --- a/nonsystemd-multilib/lib32-p11-kit/PKGBUILD +++ b/nonsystemd-multilib/lib32-p11-kit/PKGBUILD @@ -1,68 +1,51 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer (Arch): Florian Pritz <bluewind@xinu.at> +# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor (Arch): Florian Pritz <bluewind@xinu.at> # Contributor (Arch): Christoph Vigano <mail@cvigano.de> pkgname=lib32-p11-kit -pkgver=0.23.16.1 +pkgver=0.24.0 pkgrel=1 -pkgrel+=.nonsystemd1 -pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)" -arch=(x86_64) +pkgdesc="Loads and enumerates PKCS#11 modules (32-bit library)" url="https://p11-glue.freedesktop.org" +arch=(x86_64) license=(BSD) -depends=(lib32-glibc lib32-libtasn1 lib32-libffi p11-kit) -makedepends=(git lib32-gcc-libs) -source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver" - 0001-Build-and-install-libnssckbi-p11-kit.so.patch) -sha256sums=('SKIP' - 'a2222e092b2c9ae2d2c344b3268f8f86e7b424973433d49653f72e6c51fa54cf') +depends=(lib32-glibc lib32-libtasn1 lib32-libffi libp11-kit) +makedepends=(git meson lib32-elogind) +provides=(libp11-kit.so) +source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig}) +sha256sums=('81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685' + 'SKIP') validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF' # Stef Walter '462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno prepare() { - cd p11-kit - - # Build and install an additional library (libnssckbi-p11-kit.so) which - # is a copy of p11-kit-trust.so but uses the same label for root certs as - # 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 + cd p11-kit-$pkgver } build() { - cd p11-kit - export CC="gcc -m32" export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --disable-doc \ - --with-module-path=/usr/lib32/pkcs11 \ - --without-systemd \ - --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source - make + export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" + + arch-meson p11-kit-$pkgver build \ + --buildtype debugoptimized \ + --libdir /usr/lib32 \ + -D bash_completion=disabled \ + -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source -D systemd=disabled + meson compile -C build } check() { - cd p11-kit - make check + meson test -C build --print-errorlogs } package() { - cd p11-kit - make DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" - rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share} + rm -rf "$pkgdir"/etc "$pkgdir"/usr/{bin,include,lib,share} - install -d "$pkgdir/usr/share/licenses" - ln -s p11-kit "$pkgdir/usr/share/licenses/$pkgname" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit-$pkgver/COPYING } # vim:set ts=2 sw=2 et: |