Date: Saturday, March 24, 2018 @ 15:00:34
Author: heftig
Revision: 311953
0.23.10-1
Added:
lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
(from rev 311952, lib32-p11-kit/trunk/libnssckbi-compat.patch)
Modified:
lib32-p11-kit/trunk/PKGBUILD
Deleted:
lib32-p11-kit/trunk/libnssckbi-compat.patch
----------------------------------------------------+
0001-Build-and-install-libnssckbi-p11-kit.so.patch | 76 +++++++++++++++++++
PKGBUILD | 27 +++---
libnssckbi-compat.patch | 57 --------------
3 files changed, 89 insertions(+), 71 deletions(-)
Copied: lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
(from rev 311952, lib32-p11-kit/trunk/libnssckbi-compat.patch)
===================================================================
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch
(rev 0)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch 2018-03-24 15:00:34 UTC
(rev 311953)
@@ -0,0 +1,76 @@
+From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
+Message-Id:
<ec8bb05e15640b1857b94ded128bc33ca7ec7fe0.1519917784.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 6e52c4d..157a1d9 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)
+
++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 e8b7256..d578a90 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 },
+ };
+@@ -529,8 +533,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
+ info->flags = CKF_TOKEN_PRESENT;
+ strncpy ((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.16.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-24 14:58:02 UTC (rev 311952)
+++ PKGBUILD 2018-03-24 15:00:34 UTC (rev 311953)
@@ -2,42 +2,41 @@
# Maintainer: Florian Pritz <[email protected]>
# Contributor: Christoph Vigano <[email protected]>
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.23.9
+pkgname=lib32-p11-kit
+pkgver=0.23.10
pkgrel=1
pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
arch=(x86_64)
url="https://p11-glue.freedesktop.org";
license=(BSD)
-depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
+depends=(lib32-glibc lib32-libtasn1 lib32-libffi p11-kit)
makedepends=(git)
-_commit=34cb047e20af02ef3d820a295e9e29f618b83bab # tags/0.23.9^0
+_commit=f6b7a992e442218a5afdbf8ae1697c53f3f03991 # tags/0.23.10^0
source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit";
- libnssckbi-compat.patch)
+ 0001-Build-and-install-libnssckbi-p11-kit.so.patch)
sha256sums=('SKIP'
- '8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
+ '0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798')
validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
pkgver() {
- cd ${_pkgbasename}
+ cd p11-kit
git describe --tags | sed 's/-/+/g'
}
prepare() {
- cd ${_pkgbasename}
+ 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 ../libnssckbi-compat.patch
+ patch -Np1 -i ../0001-Build-and-install-libnssckbi-p11-kit.so.patch
NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd ${_pkgbasename}
+ cd p11-kit
export CC="gcc -m32"
export CXX="g++ -m32"
@@ -55,18 +54,18 @@
}
check() {
- cd ${_pkgbasename}
+ cd p11-kit
make check
}
package() {
- cd ${_pkgbasename}
+ cd p11-kit
make DESTDIR="$pkgdir" install
rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share}
install -d "$pkgdir/usr/share/licenses"
- ln -s ${_pkgbasename} "$pkgdir/usr/share/licenses/$pkgname"
+ ln -s p11-kit "$pkgdir/usr/share/licenses/$pkgname"
}
# vim:set ts=2 sw=2 et:
Deleted: libnssckbi-compat.patch
===================================================================
--- libnssckbi-compat.patch 2018-03-24 14:58:02 UTC (rev 311952)
+++ libnssckbi-compat.patch 2018-03-24 15:00:34 UTC (rev 311953)
@@ -1,57 +0,0 @@
-diff -upr p11-kit-0.23.1.orig/trust/Makefile.am
p11-kit-0.23.1/trust/Makefile.am
---- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000
+0200
-+++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300
-@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \
-
- p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
-
-+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 -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c
---- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200
-+++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300
-@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens,
- const char *label;
- } labels[] = {
- { "~/", "User Trust" },
-+#ifdef LIBNSSCKBI_COMPAT
-+ { DATA_DIR, "Builtin Object Token" },
-+#else
- { DATA_DIR, "Default Trust" },
-+#endif
- { SYSCONFDIR, "System Trust" },
- { NULL },
- };
-@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
- info->flags = CKF_TOKEN_PRESENT;
- strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
-
-- /* If too long, copy the first 64 characters into buffer */
-- path = p11_token_get_path (token);
-+#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);
- length = strlen (path);
-+ /* If too long, copy the first 64 characters into buffer */
- if (length > sizeof (info->slotDescription))
- length = sizeof (info->slotDescription);
- memset (info->slotDescription, ' ', sizeof
(info->slotDescription));
