Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[p11-kit] Upgrade to 0.23.22. Fixes JB#57042 #1

Merged
merged 1 commit into from
Feb 1, 2022
Merged

[p11-kit] Upgrade to 0.23.22. Fixes JB#57042 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion p11-kit
Open in desktop
Submodule p11-kit updated 70 files
+2 −0 .gitignore
+24 −0 .packit.yaml
+8 −0 .travis.yml
+1 −1 .travis/autotools/after_success.sh
+5 −0 .travis/autotools/script.sh
+3 −0 .travis/freebsd/after_failure.sh
+5 −0 .travis/freebsd/before_install.sh
+6 −0 .travis/freebsd/script.sh
+2 −0 Makefile.am
+16 −0 NEWS
+22 −24 README.md
+5 −0 SECURITY.md
+10 −6 bash-completion/meson.build
+2 −2 build/cross_file_mingw64.txt
+7 −0 common/Makefile.am
+36 −6 common/compat.c
+7 −0 common/compat.h
+3 −1 common/constants.c
+0 −2 common/debug.c
+3 −3 common/dict.c
+120 −0 common/frob-getprogname.c
+5 −0 common/init.h
+2 −1 common/library.c
+52 −43 common/meson.build
+30 −16 common/path.c
+2 −0 common/pkcs11.h
+30 −0 common/test-compat.c
+26 −0 common/test-path.c
+10 −4 common/test.c
+5 −4 common/tool.c
+1 −1 common/unix-peer.c
+2 −2 configure.ac
+26 −17 doc/manual/meson.build
+9 −3 meson.build
+16 −0 meson_options.txt
+7 −2 p11-kit/Makefile.am
+4 −1 p11-kit/conf.c
+2 −2 p11-kit/iter.c
+2 −0 p11-kit/lists.c
+1 −1 p11-kit/log.c
+130 −121 p11-kit/meson.build
+110 −0 p11-kit/mock-module-ep8.c
+2 −2 p11-kit/modules.c
+41 −23 p11-kit/proxy.c
+1 −1 p11-kit/rpc-client.c
+37 −18 p11-kit/rpc-message.c
+4 −0 p11-kit/rpc-message.h
+4 −4 p11-kit/rpc-server.c
+0 −2 p11-kit/rpc-transport.c
+6 −9 p11-kit/server.c
+7 −0 p11-kit/test-conf.c
+5 −0 p11-kit/test-deprecated.c
+1 −1 p11-kit/test-mock.c
+4 −0 p11-kit/test-modules.c
+39 −0 p11-kit/test-proxy.c
+28 −19 p11-kit/test-rpc.c
+4 −0 p11-kit/test-transport.c
+7 −2 p11-kit/uri.c
+18 −8 trust/Makefile.am
+30 −16 trust/anchor.c
+0 −13 trust/basic.asn.h
+2 −5 trust/index.c
+101 −85 trust/meson.build
+0 −3 trust/openssl.asn
+0 −28 trust/openssl.asn.h
+0 −26 trust/pkix.asn
+0 −408 trust/pkix.asn.h
+24 −3 trust/test-extract.sh
+49 −14 trust/test-token.c
+0 −0 trust/trust-extract-compat
16 changes: 10 additions & 6 deletions rpm/p11-kit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: p11-kit
Version: 0.23.20
Version: 0.23.22
Release: 1
Summary: Library for loading and sharing PKCS#11 modules

Expand Down Expand Up @@ -50,7 +50,6 @@ feature is still experimental.
Summary: Replacement CA library for NSS
Requires: %{name}-trust = %{version}-%{release}
Provides: nss-ckbi
Obsoletes: nss-ckbi

%description nss-ckbi
This package replaces the nss-ckbi library with a compatible version that loads
Expand All @@ -64,17 +63,22 @@ export NOCONFIGURE=1
%autogen
# These paths are the source paths that come from the plan here:
# https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks
%configure --disable-static --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --with-hash-impl=internal --disable-silent-rules
make %{?_smp_mflags} V=1
%configure \
--disable-static \
--with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source \
--with-hash-impl=internal \
--disable-silent-rules \
--without-systemd
%make_build

%install
make install DESTDIR=$RPM_BUILD_ROOT
%make_install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/
rm $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example
ln -s %{_libdir}/pkcs11/p11-kit-trust.so $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so
ln -s pkcs11/p11-kit-trust.so $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so

%check
%ifnarch aarch64
Expand Down