[arch-commits] Commit in lib32-p11-kit/trunk (2 files)

[Jan Steffens]

    Date: Monday, January 21, 2019 @ 23:28:09
  Author: heftig
Revision: 426766

0.23.15-1

Modified:
  lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
  lib32-p11-kit/trunk/PKGBUILD

----------------------------------------------------+
 0001-Build-and-install-libnssckbi-p11-kit.so.patch |   16 ++++++++--------
 PKGBUILD                                           |   12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

Modified: 0001-Build-and-install-libnssckbi-p11-kit.so.patch
===================================================================
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch	2019-01-21 20:46:33 UTC (rev 426765)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch	2019-01-21 23:28:09 UTC (rev 426766)
@@ -1,5 +1,5 @@
-From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
-Message-Id: <ec8bb05e15640b1857b94ded128bc33ca7ec7fe0.1519917784.git.jan.steffens at gmail.com>
+From 8a1c9bb1170213498d3386d2a5c2882868e4f535 Mon Sep 17 00:00:00 2001
+Message-Id: <8a1c9bb1170213498d3386d2a5c2882868e4f535.1548110948.git.jan.steffens at gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Thu, 1 Mar 2018 16:20:59 +0100
 Subject: [PATCH] Build and install libnssckbi-p11-kit.so
@@ -15,12 +15,12 @@
  2 files changed, 25 insertions(+), 1 deletion(-)
 
 diff --git a/trust/Makefile.am b/trust/Makefile.am
-index 6e52c4d..157a1d9 100644
+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)
+ p11_kit_trust_la_SOURCES = $(TRUST_SRCS) trust/module-init.c
  
 +libnssckbi_compatdir = $(libdir)
 +libnssckbi_compat_LTLIBRARIES = \
@@ -40,7 +40,7 @@
  	-no-undefined
  
 diff --git a/trust/module.c b/trust/module.c
-index e8b7256..d578a90 100644
+index 1722340..e776270 100644
 --- a/trust/module.c
 +++ b/trust/module.c
 @@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens,
@@ -55,9 +55,9 @@
  		{ P11_SYSTEM_TRUST_PREFIX, "System Trust", P11_TOKEN_FLAG_NONE },
  		{ NULL },
  	};
-@@ -529,8 +533,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
+@@ -534,8 +538,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
  		info->flags = CKF_TOKEN_PRESENT;
- 		strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
+ 		memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
  
 +#ifdef LIBNSSCKBI_COMPAT
 +		/* Change description to match libnssckbi so HPKP works in Chromium */
@@ -72,5 +72,5 @@
  		if (length > sizeof (info->slotDescription))
  			length = sizeof (info->slotDescription);
 -- 
-2.16.1
+2.20.1
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-21 20:46:33 UTC (rev 426765)
+++ PKGBUILD	2019-01-21 23:28:09 UTC (rev 426766)
@@ -2,7 +2,7 @@
 # Contributor: Christoph Vigano <mail at cvigano.de>
 
 pkgname=lib32-p11-kit
-pkgver=0.23.14
+pkgver=0.23.15
 pkgrel=1
 pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
 arch=(x86_64)
@@ -13,7 +13,7 @@
 source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver"
         0001-Build-and-install-libnssckbi-p11-kit.so.patch)
 sha256sums=('SKIP'
-            '0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798')
+            'a2222e092b2c9ae2d2c344b3268f8f86e7b424973433d49653f72e6c51fa54cf')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF'  # Stef Walter
               '462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
@@ -47,10 +47,14 @@
   make
 }
 
-check() {
+check() (
   cd p11-kit
+
+  # https://github.com/p11-glue/p11-kit/issues/212
+  unset SOURCE_DATE_EPOCH
+
   make check
-}
+)
 
 package() {
   cd p11-kit