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

Jan Steffens heftig at archlinux.org
Tue Sep 10 20:32:17 UTC 2019


    Date: Tuesday, September 10, 2019 @ 20:32:16
  Author: heftig
Revision: 509218

0.23.17-2

Added:
  lib32-p11-kit/trunk/0007-meson-Add-missing-prefix-to-system-path-defines.patch
  lib32-p11-kit/trunk/0008-Build-and-install-libnssckbi-p11-kit.so.patch
    (from rev 509217, lib32-p11-kit/trunk/0007-Build-and-install-libnssckbi-p11-kit.so.patch)
Modified:
  lib32-p11-kit/trunk/0001-meson-Fix-dictionary-syntax.patch
  lib32-p11-kit/trunk/0002-meson-Install-p11-kit-client-module.patch
  lib32-p11-kit/trunk/0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch
  lib32-p11-kit/trunk/0004-meson-Don-t-prefix-p11_user_config.patch
  lib32-p11-kit/trunk/0005-meson-Build-and-install-man-pages.patch
  lib32-p11-kit/trunk/0006-meson-Install-p11-kit-server-units.patch
  lib32-p11-kit/trunk/PKGBUILD
Deleted:
  lib32-p11-kit/trunk/0007-Build-and-install-libnssckbi-p11-kit.so.patch

-----------------------------------------------------------------+
 0001-meson-Fix-dictionary-syntax.patch                          |    2 
 0002-meson-Install-p11-kit-client-module.patch                  |    2 
 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch |    2 
 0004-meson-Don-t-prefix-p11_user_config.patch                   |    2 
 0005-meson-Build-and-install-man-pages.patch                    |    2 
 0006-meson-Install-p11-kit-server-units.patch                   |    2 
 0007-Build-and-install-libnssckbi-p11-kit.so.patch              |  100 ----------
 0007-meson-Add-missing-prefix-to-system-path-defines.patch      |   33 +++
 0008-Build-and-install-libnssckbi-p11-kit.so.patch              |  100 ++++++++++
 PKGBUILD                                                        |   23 +-
 10 files changed, 152 insertions(+), 116 deletions(-)

Modified: 0001-meson-Fix-dictionary-syntax.patch
===================================================================
--- 0001-meson-Fix-dictionary-syntax.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0001-meson-Fix-dictionary-syntax.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From f2ee0a01272f4bbd018fb438344615cca8a74185 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <dueno at redhat.com>
 Date: Mon, 9 Sep 2019 17:22:27 +0200
-Subject: [PATCH 1/7] meson: Fix dictionary syntax
+Subject: [PATCH 1/8] meson: Fix dictionary syntax
 
 Reported by Jan Alexander Steffens.
 ---

Modified: 0002-meson-Install-p11-kit-client-module.patch
===================================================================
--- 0002-meson-Install-p11-kit-client-module.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0002-meson-Install-p11-kit-client-module.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From a0d4d089903e53fb7aaa758354f69c00eab4e93a Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 2/7] meson: Install p11-kit-client module
+Subject: [PATCH 2/8] meson: Install p11-kit-client module
 
 ---
  p11-kit/meson.build | 4 +++-

Modified: 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch
===================================================================
--- 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From 7d4768712006b16856c4b8cbe7143d11c11def7f Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 3/7] meson: PKCS#11 modules should only export
+Subject: [PATCH 3/8] meson: PKCS#11 modules should only export
  C_GetFunctionList
 
 ---

Modified: 0004-meson-Don-t-prefix-p11_user_config.patch
===================================================================
--- 0004-meson-Don-t-prefix-p11_user_config.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0004-meson-Don-t-prefix-p11_user_config.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From e1877fb7b84237bb40c88436e0a56aa999801595 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 4/7] meson: Don't prefix p11_user_config
+Subject: [PATCH 4/8] meson: Don't prefix p11_user_config
 
 ---
  p11-kit/meson.build | 2 +-

Modified: 0005-meson-Build-and-install-man-pages.patch
===================================================================
--- 0005-meson-Build-and-install-man-pages.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0005-meson-Build-and-install-man-pages.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From 53eacdcfad8a437c58b3983405e5fee7de0cf843 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 5/7] meson: Build and install man pages
+Subject: [PATCH 5/8] meson: Build and install man pages
 
 ---
  doc/manual/meson.build | 185 ++++++++++++++++++++++++++---------------

Modified: 0006-meson-Install-p11-kit-server-units.patch
===================================================================
--- 0006-meson-Install-p11-kit-server-units.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0006-meson-Install-p11-kit-server-units.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,7 +1,7 @@
 From 20f3c418a1577e0fa48a8e9a734bd6d5278a1ca9 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 6/7] meson: Install p11-kit-server units
+Subject: [PATCH 6/8] meson: Install p11-kit-server units
 
 ---
  p11-kit/meson.build | 11 +++++++++++

Deleted: 0007-Build-and-install-libnssckbi-p11-kit.so.patch
===================================================================
--- 0007-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-10 20:08:16 UTC (rev 509217)
+++ 0007-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -1,100 +0,0 @@
-From 0c5ffab2467a4989c4428c5b284838e32dfe0002 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 10 Sep 2019 18:08:25 +0000
-Subject: [PATCH 7/7] 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/meson.build | 13 +++++++++++++
- trust/module.c    | 12 +++++++++++-
- 3 files changed, 38 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/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 ec3333d..9204673 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.23.0
-

Added: 0007-meson-Add-missing-prefix-to-system-path-defines.patch
===================================================================
--- 0007-meson-Add-missing-prefix-to-system-path-defines.patch	                        (rev 0)
+++ 0007-meson-Add-missing-prefix-to-system-path-defines.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -0,0 +1,33 @@
+From 6219ae62e7b6ce7361e7ec9301171ee1e8ba6056 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 10 Sep 2019 20:27:44 +0000
+Subject: [PATCH 7/8] meson: Add missing prefix to system path defines
+
+---
+ p11-kit/meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/p11-kit/meson.build b/p11-kit/meson.build
+index 48a3c75..b0d965b 100644
+--- a/p11-kit/meson.build
++++ b/p11-kit/meson.build
+@@ -24,12 +24,12 @@ libp11_kit_internal_sources += custom_target('generate virtual-fixed-generated.h
+ libp11_kit_internal_sources += 'virtual.c'
+ 
+ libp11_kit_internal_c_args = [
+-  '-DP11_SYSTEM_CONFIG_FILE="@0@"'.format(p11_system_config_file),
+-  '-DP11_SYSTEM_CONFIG_MODULES="@0@"'.format(p11_system_config_modules),
+-  '-DP11_PACKAGE_CONFIG_MODULES="@0@"'.format(p11_package_config_modules),
++  '-DP11_SYSTEM_CONFIG_FILE="@0@"'.format(prefix / p11_system_config_file),
++  '-DP11_SYSTEM_CONFIG_MODULES="@0@"'.format(prefix / p11_system_config_modules),
++  '-DP11_PACKAGE_CONFIG_MODULES="@0@"'.format(prefix / p11_package_config_modules),
+   '-DP11_USER_CONFIG_FILE="@0@"'.format(p11_user_config_file),
+   '-DP11_USER_CONFIG_MODULES="@0@"'.format(p11_user_config_modules),
+-  '-DP11_MODULE_PATH="@0@"'.format(p11_module_path)
++  '-DP11_MODULE_PATH="@0@"'.format(prefix / p11_module_path)
+ ]
+ 
+ libp11_kit_internal = static_library('p11-kit-internal',
+-- 
+2.23.0
+

Copied: lib32-p11-kit/trunk/0008-Build-and-install-libnssckbi-p11-kit.so.patch (from rev 509217, lib32-p11-kit/trunk/0007-Build-and-install-libnssckbi-p11-kit.so.patch)
===================================================================
--- 0008-Build-and-install-libnssckbi-p11-kit.so.patch	                        (rev 0)
+++ 0008-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-10 20:32:16 UTC (rev 509218)
@@ -0,0 +1,100 @@
+From e23e0c8ddc0aabaf2932433717bddf9f8b98273c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 10 Sep 2019 18:08:25 +0000
+Subject: [PATCH 8/8] 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/meson.build | 13 +++++++++++++
+ trust/module.c    | 12 +++++++++++-
+ 3 files changed, 38 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/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 ec3333d..9204673 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.23.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-10 20:08:16 UTC (rev 509217)
+++ PKGBUILD	2019-09-10 20:32:16 UTC (rev 509218)
@@ -3,7 +3,7 @@
 
 pkgname=lib32-p11-kit
 pkgver=0.23.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
 arch=(x86_64)
 url="https://p11-glue.freedesktop.org"
@@ -17,15 +17,17 @@
         0004-meson-Don-t-prefix-p11_user_config.patch
         0005-meson-Build-and-install-man-pages.patch
         0006-meson-Install-p11-kit-server-units.patch
-        0007-Build-and-install-libnssckbi-p11-kit.so.patch)
+        0007-meson-Add-missing-prefix-to-system-path-defines.patch
+        0008-Build-and-install-libnssckbi-p11-kit.so.patch)
 sha256sums=('SKIP'
-            '866c22c2e8aac80d7defe4a73299094b036c3dca547b79a38e1b55251b21d0b0'
-            '8a956ed3e8656d8cdf25f10b6efe50731bcc9b3b58cf66565624129d904e9e1c'
-            'f7476b2861d2cd8c26a0b1521df784369b40519e1f9308ca6814d654c7d0709f'
-            'dee618d30971f619c4f4cf286d688ae127a5d58482a95a2bc49d2a1de6c6f9f9'
-            '00c1cab9f1b40ce4c0c07b98a889f377a5e2e6f2d5b21b923f38df6ac9a5f073'
-            '80044d4d485c52d2a51f1b61660d4312d191d743cdfa4008128c81cda2b4dc30'
-            '74f1c3ca6875e3c716eeadc910f8a55a31c5f96275501c17797fb4a8c7683152')
+            'e255ae1650eaf236b89038175b9f4799e1ac7dd0820724f96a96be1a1c3d8c51'
+            '423fdf1014eb8952cb3d0315c2cd0be164d38674b76a8480b2b8e804af62f4a5'
+            '1498bfb9e1570750106a75219313b6de5e1d5377197e26e900864aadb0e5ebf0'
+            '147e206d360df72812f989dd8ab630138e3b171e6c1b8c40291b48870c0086e3'
+            '1b5ef2e0ad4bd80eee14aed1be9f789ab7df0a27341b79aa09ca39f2d020411a'
+            '30b0f6d6ab50566d003bb96ab841203e94064b5d3940e6c7fc7302ca105e70f6'
+            '531598f5c94bc83f2a3ebd83e6d2bc42c495f1d999504d695553e8e4b709f307'
+            '2605f0de616a75f98459e984b8db2dca8757aac05f03514caa7838ef23c90078')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF'  # Stef Walter
               '462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
@@ -38,12 +40,13 @@
   patch -Np1 -i ../0004-meson-Don-t-prefix-p11_user_config.patch
   patch -Np1 -i ../0005-meson-Build-and-install-man-pages.patch
   patch -Np1 -i ../0006-meson-Install-p11-kit-server-units.patch
+  patch -Np1 -i ../0007-meson-Add-missing-prefix-to-system-path-defines.patch
 
   # 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 ../0007-Build-and-install-libnssckbi-p11-kit.so.patch
+  patch -Np1 -i ../0008-Build-and-install-libnssckbi-p11-kit.so.patch
 }
 
 build() {


More information about the arch-commits mailing list