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

Jan Steffens heftig at archlinux.org
Mon Sep 30 17:20:32 UTC 2019


    Date: Monday, September 30, 2019 @ 17:20:32
  Author: heftig
Revision: 512198

0.23.18.1-1

Added:
  lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
    (from rev 512197, lib32-p11-kit/trunk/0008-Build-and-install-libnssckbi-p11-kit.so.patch)
Modified:
  lib32-p11-kit/trunk/PKGBUILD
Deleted:
  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/0007-meson-Add-missing-prefix-to-system-path-defines.patch
  lib32-p11-kit/trunk/0008-Build-and-install-libnssckbi-p11-kit.so.patch

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

Copied: lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch (from rev 512197, lib32-p11-kit/trunk/0008-Build-and-install-libnssckbi-p11-kit.so.patch)
===================================================================
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch	                        (rev 0)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -0,0 +1,100 @@
+From 5bc704e6a0de57d451cf551d74fa8543fc7ec9a0 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] 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 b050a8f..4943aba 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
+

Deleted: 0001-meson-Fix-dictionary-syntax.patch
===================================================================
--- 0001-meson-Fix-dictionary-syntax.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0001-meson-Fix-dictionary-syntax.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,38 +0,0 @@
-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/8] meson: Fix dictionary syntax
-
-Reported by Jan Alexander Steffens.
----
- doc/manual/meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/manual/meson.build b/doc/manual/meson.build
-index 2214b75..0c83699 100644
---- a/doc/manual/meson.build
-+++ b/doc/manual/meson.build
-@@ -39,17 +39,17 @@ content_files = [
- configure_file(
-   input: 'version.xml.in',
-   output: '@BASENAME@',
--  configuration: {'VERSION', meson.project_version()})
-+  configuration: {'VERSION': meson.project_version()})
- 
- configure_file(
-   input: 'userdir.xml.in',
-   output: '@BASENAME@',
--  configuration: {'p11_user_config', p11_user_config})
-+  configuration: {'p11_user_config': p11_user_config})
- 
- configure_file(
-   input: 'sysdir.xml.in',
-   output: '@BASENAME@',
--  configuration: {'p11_system_config', p11_system_config})
-+  configuration: {'p11_system_config': p11_system_config})
- 
- glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
- fixxref_args = [
--- 
-2.23.0
-

Deleted: 0002-meson-Install-p11-kit-client-module.patch
===================================================================
--- 0002-meson-Install-p11-kit-client-module.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0002-meson-Install-p11-kit-client-module.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,27 +0,0 @@
-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/8] meson: Install p11-kit-client module
-
----
- p11-kit/meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/p11-kit/meson.build b/p11-kit/meson.build
-index f410ee7..beb0fb2 100644
---- a/p11-kit/meson.build
-+++ b/p11-kit/meson.build
-@@ -86,7 +86,9 @@ if host_system != 'windows'
-                 'client.c', 'client-init.c',
-                 name_prefix: '',
-                 include_directories: [configinc, commoninc],
--                link_with: [libp11_kit_internal])
-+                link_with: [libp11_kit_internal],
-+                install: true,
-+                install_dir: p11_module_path)
- endif
- 
- fixtures_dir = meson.current_source_dir() / 'fixtures'
--- 
-2.23.0
-

Deleted: 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch
===================================================================
--- 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,84 +0,0 @@
-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/8] meson: PKCS#11 modules should only export
- C_GetFunctionList
-
----
- p11-kit/meson.build    | 10 ++++++++++
- p11-kit/p11-module.def |  2 ++
- p11-kit/p11-module.map |  6 ++++++
- trust/meson.build      |  6 +++++-
- 4 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 p11-kit/p11-module.def
- create mode 100644 p11-kit/p11-module.map
-
-diff --git a/p11-kit/meson.build b/p11-kit/meson.build
-index beb0fb2..e2d807b 100644
---- a/p11-kit/meson.build
-+++ b/p11-kit/meson.build
-@@ -81,12 +81,22 @@ meson.add_install_script(
-   datadir / 'p11-kit' / 'modules'
- )
- 
-+p11_module_symbol_map = meson.current_source_dir() / 'p11-module.map'
-+p11_module_ldflags = cc.get_supported_link_arguments([
-+  '-Wl,--version-script,' + p11_module_symbol_map
-+])
-+p11_module_symbol_def = meson.current_source_dir() / 'p11-module.def'
-+
- if host_system != 'windows'
-   shared_module('p11-kit-client',
-                 'client.c', 'client-init.c',
-                 name_prefix: '',
-                 include_directories: [configinc, commoninc],
-+                link_args: p11_module_ldflags,
-+                link_depends: [p11_module_symbol_map,
-+                               p11_module_symbol_def],
-                 link_with: [libp11_kit_internal],
-+                vs_module_defs: p11_module_symbol_def,
-                 install: true,
-                 install_dir: p11_module_path)
- endif
-diff --git a/p11-kit/p11-module.def b/p11-kit/p11-module.def
-new file mode 100644
-index 0000000..c4a8158
---- /dev/null
-+++ b/p11-kit/p11-module.def
-@@ -0,0 +1,2 @@
-+EXPORTS
-+C_GetFunctionList
-diff --git a/p11-kit/p11-module.map b/p11-kit/p11-module.map
-new file mode 100644
-index 0000000..8b9c384
---- /dev/null
-+++ b/p11-kit/p11-module.map
-@@ -0,0 +1,6 @@
-+{
-+	global:
-+		C_GetFunctionList;
-+	local:
-+		*;
-+};
-diff --git a/trust/meson.build b/trust/meson.build
-index b6cb260..c5b978b 100644
---- a/trust/meson.build
-+++ b/trust/meson.build
-@@ -48,9 +48,13 @@ shared_module('p11-kit-trust',
-               libtrust_sources,
-               'module-init.c',
-               name_prefix: '',
--	      c_args: p11_kit_trust_c_args,
-+              c_args: p11_kit_trust_c_args,
-               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,
-               install_dir: prefix / p11_module_path)
- 
--- 
-2.23.0
-

Deleted: 0004-meson-Don-t-prefix-p11_user_config.patch
===================================================================
--- 0004-meson-Don-t-prefix-p11_user_config.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0004-meson-Don-t-prefix-p11_user_config.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,25 +0,0 @@
-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/8] meson: Don't prefix p11_user_config
-
----
- p11-kit/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/p11-kit/meson.build b/p11-kit/meson.build
-index e2d807b..18b3d26 100644
---- a/p11-kit/meson.build
-+++ b/p11-kit/meson.build
-@@ -300,7 +300,7 @@ pkg.generate(libraries: libp11_kit,
- 
- pkcs11_conf_example_conf = configuration_data({
-   'p11_system_config_file': prefix / p11_system_config_file,
--  'p11_user_config': prefix / p11_user_config
-+  'p11_user_config': p11_user_config
- })
- pkcs11_conf_example = configure_file(input: 'pkcs11.conf.example.in',
-                                      output: '@BASENAME@',
--- 
-2.23.0
-

Deleted: 0005-meson-Build-and-install-man-pages.patch
===================================================================
--- 0005-meson-Build-and-install-man-pages.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0005-meson-Build-and-install-man-pages.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,243 +0,0 @@
-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/8] meson: Build and install man pages
-
----
- doc/manual/meson.build | 185 ++++++++++++++++++++++++++---------------
- meson.build            |   5 +-
- meson_options.txt      |   4 +
- 3 files changed, 122 insertions(+), 72 deletions(-)
-
-diff --git a/doc/manual/meson.build b/doc/manual/meson.build
-index 0c83699..5a249cf 100644
---- a/doc/manual/meson.build
-+++ b/doc/manual/meson.build
-@@ -1,75 +1,122 @@
--ignore_headers = [
--  'private.h',
--  'pkcs11.h',
--  'conf.h',
--  'debug.h',
--  'dict.h',
--  'filter.h',
--  'log.h',
--  'mock.h',
--  'modules.h',
--  'pkcs11.h',
--  'pkcs11i.h',
--  'pkcs11x.h',
--  'private.h',
--  'client.h',
--  'proxy.h',
--  'rpc.h',
--  'rpc-message.h',
--  'util.h',
--  'virtual.h',
--  'virtual-fixed.h',
--  'array.h',
--  'compat.h'
--]
-+if get_option('gtk_doc')
-+  ignore_headers = [
-+    'private.h',
-+    'pkcs11.h',
-+    'conf.h',
-+    'debug.h',
-+    'dict.h',
-+    'filter.h',
-+    'log.h',
-+    'mock.h',
-+    'modules.h',
-+    'pkcs11.h',
-+    'pkcs11i.h',
-+    'pkcs11x.h',
-+    'private.h',
-+    'client.h',
-+    'proxy.h',
-+    'rpc.h',
-+    'rpc-message.h',
-+    'util.h',
-+    'virtual.h',
-+    'virtual-fixed.h',
-+    'array.h',
-+    'compat.h'
-+  ]
- 
--content_files = [
--  'p11-kit-config.xml',
--  'p11-kit-sharing.xml',
--  'p11-kit-devel.xml',
--  'p11-kit-proxy.xml',
--  'p11-kit-trust.xml',
--  'p11-kit-remoting.xml',
--  'p11-kit.xml',
--  'pkcs11.conf.xml',
--  'trust.xml',
--  'annotation-glossary.xml'
--]
-+  content_files = [
-+    'p11-kit-config.xml',
-+    'p11-kit-sharing.xml',
-+    'p11-kit-devel.xml',
-+    'p11-kit-proxy.xml',
-+    'p11-kit-trust.xml',
-+    'p11-kit-remoting.xml',
-+    'p11-kit.xml',
-+    'pkcs11.conf.xml',
-+    'trust.xml',
-+    'annotation-glossary.xml'
-+  ]
- 
--configure_file(
--  input: 'version.xml.in',
--  output: '@BASENAME@',
--  configuration: {'VERSION': meson.project_version()})
-+  configure_file(
-+    input: 'version.xml.in',
-+    output: '@BASENAME@',
-+    configuration: {'VERSION': meson.project_version()})
- 
--configure_file(
--  input: 'userdir.xml.in',
--  output: '@BASENAME@',
--  configuration: {'p11_user_config': p11_user_config})
-+  configure_file(
-+    input: 'userdir.xml.in',
-+    output: '@BASENAME@',
-+    configuration: {'p11_user_config': p11_user_config})
- 
--configure_file(
--  input: 'sysdir.xml.in',
--  output: '@BASENAME@',
--  configuration: {'p11_system_config': p11_system_config})
-+  configure_file(
-+    input: 'sysdir.xml.in',
-+    output: '@BASENAME@',
-+    configuration: {'p11_system_config': p11_system_config})
- 
--glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
--fixxref_args = [
--  '--html-dir=' + (prefix / gnome.gtkdoc_html_dir(meson.project_name())),
--  '--extra-dir=' + (glib_prefix / gnome.gtkdoc_html_dir('glib')),
--]
-+  glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-+  fixxref_args = [
-+    '--html-dir=' + (prefix / gnome.gtkdoc_html_dir(meson.project_name())),
-+    '--extra-dir=' + (glib_prefix / gnome.gtkdoc_html_dir('glib')),
-+  ]
- 
--gnome.gtkdoc('p11-kit',
--             main_xml: 'p11-kit-docs.xml',
--             namespace: 'p11_kit',
--             src_dir: 'p11-kit',
--             dependencies: libffi_deps + dlopen_deps,
--             scan_args: [
--               '--ignore-headers=' + ' '.join(ignore_headers),
--               '--rebuild-types',
--               '--deprecated-guards="P11_KIT_DISABLE_DEPRECATED"'
--             ],
--             scanobjs_args: [
--               '--version'
--             ],
--             content_files: content_files,
--             fixxref_args: fixxref_args,
--             install: true)
-+  gnome.gtkdoc('p11-kit',
-+              main_xml: 'p11-kit-docs.xml',
-+              namespace: 'p11_kit',
-+              src_dir: 'p11-kit',
-+              dependencies: libffi_deps + dlopen_deps,
-+              scan_args: [
-+                '--ignore-headers=' + ' '.join(ignore_headers),
-+                '--rebuild-types',
-+                '--deprecated-guards="P11_KIT_DISABLE_DEPRECATED"'
-+              ],
-+              scanobjs_args: [
-+                '--version'
-+              ],
-+              content_files: content_files,
-+              fixxref_args: fixxref_args,
-+              install: true)
-+endif
-+
-+if get_option('man')
-+  xsltproc = find_program('xsltproc')
-+  xsltproc_xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
-+  if run_command([xsltproc, '--nonet', xsltproc_xsl]).returncode() != 0
-+    error('Docbook stylesheet for manpages is missing')
-+  endif
-+
-+  xsltproc_flags = [
-+    '--nonet',
-+    '--stringparam', 'man.output.quietly', '1',
-+    '--stringparam', 'funcsynopsis.style', 'ansi',
-+    '--stringparam', 'man.th.extra1.suppress', '1',
-+    '--stringparam', 'man.authors.section.enabled', '0',
-+    '--stringparam', 'man.copyright.section.enabled', '0',
-+    '--path', meson.current_build_dir(),
-+  ]
-+
-+  man_pages = {
-+    '1': ['trust'],
-+    '5': ['pkcs11.conf'],
-+    '8': ['p11-kit'],
-+  }
-+
-+  foreach section, pages: man_pages
-+    foreach page: pages
-+      man_src = '@0 at .xml'.format(page)
-+      man_dst = '@0 at .@1@'.format(page, section)
-+      man_section = 'man at 0@'.format(section)
-+      custom_target(man_dst,
-+                    command: [
-+                      xsltproc,
-+                      xsltproc_flags,
-+                      '-o', '@OUTPUT@',
-+                      xsltproc_xsl,
-+                      '@INPUT@',
-+                    ],
-+                    input: man_src,
-+                    output: man_dst,
-+                    install: true,
-+                    install_dir: join_paths(mandir, man_section),
-+                    build_be_default: true)
-+    endforeach
-+  endforeach
-+endif
-diff --git a/meson.build b/meson.build
-index 6bd7057..8d22971 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,6 +56,7 @@ bindir = get_option('bindir')
- libdir = get_option('libdir')
- libexecdir = get_option('libexecdir')
- sysconfdir = get_option('sysconfdir')
-+mandir = get_option('mandir')
- pkgdatadir = datadir / meson.project_name()
- privatedir = libexecdir / meson.project_name()
- 
-@@ -358,7 +359,5 @@ subdir('p11-kit')
- if with_trust_module
-   subdir('trust')
- endif
--if get_option('gtk_doc')
--  subdir('doc/manual')
--endif
-+subdir('doc/manual')
- subdir('po')
-diff --git a/meson_options.txt b/meson_options.txt
-index deda646..bc79665 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,3 +45,7 @@ option('systemd', type : 'feature',
- option('gtk_doc', type : 'boolean',
-        value : false,
-        description : 'Build documentation using gtk-doc')
-+
-+option('man', type : 'boolean',
-+       value : false,
-+       description : 'Build manpages using xsltproc')
--- 
-2.23.0
-

Deleted: 0006-meson-Install-p11-kit-server-units.patch
===================================================================
--- 0006-meson-Install-p11-kit-server-units.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0006-meson-Install-p11-kit-server-units.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,34 +0,0 @@
-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/8] meson: Install p11-kit-server units
-
----
- p11-kit/meson.build | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/p11-kit/meson.build b/p11-kit/meson.build
-index 18b3d26..48a3c75 100644
---- a/p11-kit/meson.build
-+++ b/p11-kit/meson.build
-@@ -176,6 +176,17 @@ executable('p11-kit-server-testable',
-            dependencies: [libp11_tool_dep] + libsystemd_deps + libffi_deps + dlopen_deps,
-            link_with: libp11_kit_testable)
- 
-+if with_systemd
-+  p11_kit_server_service_conf = configuration_data({
-+    'bindir': prefix / bindir
-+  })
-+  p11_kit_server_service = configure_file(input: 'p11-kit-server.service.in',
-+                                          output: '@BASENAME@',
-+                                          configuration: p11_kit_server_service_conf)
-+  install_data([p11_kit_server_service, 'p11-kit-server.socket'],
-+               install_dir: systemduserunitdir)
-+endif
-+
- # Check if compilation succeeds with CRYPTOKI_GNU=1
- 
- pkcs11_gnu_headers = [
--- 
-2.23.0
-

Deleted: 0007-meson-Add-missing-prefix-to-system-path-defines.patch
===================================================================
--- 0007-meson-Add-missing-prefix-to-system-path-defines.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0007-meson-Add-missing-prefix-to-system-path-defines.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,33 +0,0 @@
-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
-

Deleted: 0008-Build-and-install-libnssckbi-p11-kit.so.patch
===================================================================
--- 0008-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-30 17:17:00 UTC (rev 512197)
+++ 0008-Build-and-install-libnssckbi-p11-kit.so.patch	2019-09-30 17:20:32 UTC (rev 512198)
@@ -1,100 +0,0 @@
-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-30 17:17:00 UTC (rev 512197)
+++ PKGBUILD	2019-09-30 17:20:32 UTC (rev 512198)
@@ -2,8 +2,8 @@
 # Contributor: Christoph Vigano <mail at cvigano.de>
 
 pkgname=lib32-p11-kit
-pkgver=0.23.17
-pkgrel=2
+pkgver=0.23.18.1
+pkgrel=1
 pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
 arch=(x86_64)
 url="https://p11-glue.freedesktop.org"
@@ -10,24 +10,11 @@
 license=(BSD)
 depends=(lib32-glibc lib32-libtasn1 lib32-libffi lib32-systemd p11-kit)
 makedepends=(git meson)
+_commit=b0ebe7555c291808db29377ba79cb8326301f0a6  # tags/0.23.18.1^0
 source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver"
-        0001-meson-Fix-dictionary-syntax.patch
-        0002-meson-Install-p11-kit-client-module.patch
-        0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch
-        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-meson-Add-missing-prefix-to-system-path-defines.patch
-        0008-Build-and-install-libnssckbi-p11-kit.so.patch)
+        0001-Build-and-install-libnssckbi-p11-kit.so.patch)
 sha256sums=('SKIP'
-            'e255ae1650eaf236b89038175b9f4799e1ac7dd0820724f96a96be1a1c3d8c51'
-            '423fdf1014eb8952cb3d0315c2cd0be164d38674b76a8480b2b8e804af62f4a5'
-            '1498bfb9e1570750106a75219313b6de5e1d5377197e26e900864aadb0e5ebf0'
-            '147e206d360df72812f989dd8ab630138e3b171e6c1b8c40291b48870c0086e3'
-            '1b5ef2e0ad4bd80eee14aed1be9f789ab7df0a27341b79aa09ca39f2d020411a'
-            '30b0f6d6ab50566d003bb96ab841203e94064b5d3940e6c7fc7302ca105e70f6'
-            '531598f5c94bc83f2a3ebd83e6d2bc42c495f1d999504d695553e8e4b709f307'
-            '2605f0de616a75f98459e984b8db2dca8757aac05f03514caa7838ef23c90078')
+            'e832eece10587ac50ae42ca4515786b51e67fea0647716061e51cd94f5e058cd')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF'  # Stef Walter
               '462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
@@ -34,19 +21,11 @@
 prepare() {
   cd p11-kit
 
-  patch -Np1 -i ../0001-meson-Fix-dictionary-syntax.patch
-  patch -Np1 -i ../0002-meson-Install-p11-kit-client-module.patch
-  patch -Np1 -i ../0003-meson-PKCS-11-modules-should-only-export-C_GetFuncti.patch
-  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 ../0008-Build-and-install-libnssckbi-p11-kit.so.patch
+  patch -Np1 -i ../0001-Build-and-install-libnssckbi-p11-kit.so.patch
 }
 
 build() {


More information about the arch-commits mailing list