rpms/nss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove nss-p11-kit.config...

Browse Source 
... as crypto-policies-20240522-1.git77963ab.el10
has incorporated these lines into the main config.
This commit is contained in:
Alexander Sosedkin 2024-05-23 20:41:09 +02:00 committed by Robert Relyea
parent 3ca8e4f728
commit 13c012f59e
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nss-p11-kit.config
View File

@ -1,4 +0,0 @@
name=p11-kit-proxy
library=p11-kit-proxy.so

10
nss.spec
View File

@ -10,7 +10,7 @@
%global nspr_release %[%baserelease+21] %global nspr_release %[%baserelease+21]
# only need to update this as we added new # only need to update this as we added new
# algorithms under nss policy control # algorithms under nss policy control
%global crypto_policies_version 20210118 %global crypto_policies_version 20240522
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved %global saved_files_dir %{_libdir}/nss/saved
%global dracutlibdir %{_prefix}/lib/dracut %global dracutlibdir %{_prefix}/lib/dracut
@ -127,7 +127,6 @@ Source23: cert8.db.xml
Source25: key3.db.xml Source25: key3.db.xml
Source27: secmod.db.xml Source27: secmod.db.xml
%endif %endif
Source28: nss-p11-kit.config
# fips algorithms are tied to the red hat validation, others # fips algorithms are tied to the red hat validation, others
# will have their own validation # will have their own validation
Source30: fips_algorithms.h Source30: fips_algorithms.h
@ -872,9 +871,6 @@ for f in %{dbfiles}; do
install -c -m 644 ${f}.5 $RPM_BUILD_ROOT%{_mandir}/man5/${f}.5 install -c -m 644 ${f}.5 $RPM_BUILD_ROOT%{_mandir}/man5/${f}.5
done done
# Copy the crypto-policies configuration file
install -p -m 644 %{SOURCE28} $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
%triggerpostun -n nss-sysinit -- nss-sysinit < 3.12.8-3 %triggerpostun -n nss-sysinit -- nss-sysinit < 3.12.8-3
# Reverse unwanted disabling of sysinit by faulty preun sysinit scriplet # Reverse unwanted disabling of sysinit by faulty preun sysinit scriplet
# from previous versions of nss.spec # from previous versions of nss.spec
@ -894,9 +890,6 @@ if test $1 -eq 2; then
fi fi
%endif %endif
%posttrans
update-crypto-policies &> /dev/null || :
%files %files
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -913,7 +906,6 @@ update-crypto-policies &> /dev/null || :
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/crypto-policies/local.d/nss-p11-kit.config
%if %{with dbm} %if %{with dbm}
%doc %{_mandir}/man5/cert8.db.5* %doc %{_mandir}/man5/cert8.db.5*
%doc %{_mandir}/man5/key3.db.5* %doc %{_mandir}/man5/key3.db.5*