Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
p11-kit
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pkg
obcore
p11-kit
Commits
2391e67a
Commit
2391e67a
authored
Oct 10, 2019
by
Eric Vidal
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgpkg: 0.23.18.1-2
parent
c930f079
Pipeline
#174214
failed with stages
in 1 minute and 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
30 deletions
+43
-30
trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
+31
-8
trunk/PKGBUILD
trunk/PKGBUILD
+12
-22
No files found.
trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch
View file @
2391e67a
From 8a1c9bb1170213498d3386d2a5c2882868e4f535 Mon Sep 17 00:00:00 2001
Message-Id: <8a1c9bb1170213498d3386d2a5c2882868e4f535.1548110948.git.jan.steffens@gmail.com>
From 5bc704e6a0de57d451cf551d74fa8543fc7ec9a0 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: T
hu, 1 Mar 2018 16:20:59 +01
00
Date: T
ue, 10 Sep 2019 18:08:25 +00
00
Subject: [PATCH] Build and install libnssckbi-p11-kit.so
Create an additional library which is a copy of p11-kit-trust.so but
...
...
@@ -11,11 +10,12 @@ uses the same label for root certs as libnssckbi.so:
https://bugs.freedesktop.org/show_bug.cgi?id=66161
---
trust/Makefile.am | 14 ++++++++++++++
trust/meson.build | 13 +++++++++++++
trust/module.c | 12 +++++++++++-
2 files changed, 25
insertions(+), 1 deletion(-)
3 files changed, 38
insertions(+), 1 deletion(-)
diff --git a/trust/Makefile.am b/trust/Makefile.am
index
c4a65a3..303e1d0
100644
index
b050a8f..4943aba
100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -66,6 +66,20 @@
p11_kit_trust_la_LDFLAGS = \
...
...
@@ -39,8 +39,32 @@ index c4a65a3..303e1d0 100644
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
1722340..e776270
100644
index
ec3333d..9204673
100644
--- a/trust/module.c
+++ b/trust/module.c
@@ -201,7 +201,11 @@
create_tokens_inlock (p11_array *tokens,
...
...
@@ -72,5 +96,4 @@ index 1722340..e776270 100644
if (length > sizeof (info->slotDescription))
length = sizeof (info->slotDescription);
--
2.20.1
2.23.0
trunk/PKGBUILD
View file @
2391e67a
...
...
@@ -10,7 +10,7 @@ pkgname=p11-kit
pkgdesc
=
"Provides a way to load and enumerate PKCS#11 modules"
pkgver
=
0.23.1
6
.1
pkgver
=
0.23.1
8
.1
pkgrel
=
2
url
=
"https://p11-glue.freedesktop.org"
...
...
@@ -39,38 +39,30 @@ prepare() {
# 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
}
#--------------------------------------------| BUILD |------------------------------------------
build
()
{
cd
p11-kit
./configure
--prefix
=
/usr
\
--sysconfdir
=
/etc
\
--localstatedir
=
/var
\
--libexecdir
=
/usr/lib
\
--enable-doc
\
--with-module-path
=
/usr/lib/pkcs11
\
--with-trust-paths
=
/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
\
--without-systemd
make
arch-meson p11-kit build
\
-D
gtk_doc
=
true
\
-D
man
=
true
\
-D
trust_paths
=
/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
\
-D
systemd
=
disabled
ninja
-C
build
}
#--------------------------------------------| CHECK |------------------------------------------
check
()
{
cd
p11-kit
make check
meson
test
-C
build
--print-errorlogs
}
#-------------------------------------------| PACKAGE |-----------------------------------------
package
()
{
cd
p11-kit
make
DESTDIR
=
"
$pkgdir
"
install
install
-Dt
"
$pkgdir
/usr/share/licenses/
$pkgname
"
-m644
COPYING
DESTDIR
=
"
$pkgdir
"
meson
install
-C
build
install
-Dt
"
$pkgdir
/usr/share/licenses/
$pkgname
"
-m644
p11-kit/COPYING
ln
-srf
"
$pkgdir
/usr/bin/update-ca-trust"
"
$pkgdir
/usr/lib/p11-kit/trust-extract-compat"
}
...
...
@@ -87,9 +79,7 @@ depends=(
#-------------------------------------| SECURITY AND LICENCE |----------------------------------
sha256sums
=(
'SKIP'
'a2222e092b2c9ae2d2c344b3268f8f86e7b424973433d49653f72e6c51fa54cf'
)
sha256sums
=(
'SKIP'
'3997921b483190fe728812f9a259cc18c34cf52f70037d364ed333a221bf773a'
)
license
=(
BSD
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment