Add Integrity Verification File in nss-softokn and fix build fail.
(cherry picked from commit a997fe72bed49f32015b66a19d99ccad49b99b35)
This commit is contained in:
parent
d34947c4a6
commit
7fd81e7f7f
@ -296,7 +296,7 @@ new file mode 100644
|
||||
index 0000000..83d787f
|
||||
--- /dev/null
|
||||
+++ b/lib/freebl/sm3.h
|
||||
@@ -0,0 +1,19 @@
|
||||
@@ -0,0 +1,17 @@
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
@ -313,8 +313,6 @@ index 0000000..83d787f
|
||||
+ PRUint32 num;
|
||||
+};
|
||||
+
|
||||
+typedef struct SM3ContextStr SM3Context;
|
||||
+
|
||||
+#endif /* _SM3_H_ */
|
||||
--
|
||||
2.33.0
|
||||
|
||||
24
nss.spec
24
nss.spec
@ -11,10 +11,21 @@
|
||||
%bcond_with test
|
||||
%bcond_without dbm
|
||||
|
||||
%define __spec_install_post \
|
||||
%{?__debug_package:%{__debug_install_post}} \
|
||||
%{__arch_install_post} \
|
||||
%{__os_install_post} \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreeblpriv3.so \
|
||||
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
|
||||
%{?with_dbm:$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so
|
||||
} \
|
||||
%{nil}
|
||||
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: %{nss_version}
|
||||
Release: 8
|
||||
Release: 9
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Provides: nss-system-init
|
||||
@ -523,15 +534,15 @@ update-crypto-policies &>/dev/null||:
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license nss/COPYING
|
||||
%{_libdir}/libfreebl3.so
|
||||
#%{_libdir}/libfreebl3.chk
|
||||
%{_libdir}/libfreebl3.chk
|
||||
%{_libdir}/libfreeblpriv3.so
|
||||
#%{_libdir}/libfreeblpriv3.chk
|
||||
%{_libdir}/libfreeblpriv3.chk
|
||||
%if %{with dbm}
|
||||
%{_libdir}/libnssdbm3.so
|
||||
#%{_libdir}/libnssdbm3.chk
|
||||
%{_libdir}/libnssdbm3.chk
|
||||
%endif
|
||||
%{_libdir}/libsoftokn3.so
|
||||
#%{_libdir}/libsoftokn3.chk
|
||||
%{_libdir}/libsoftokn3.chk
|
||||
%dir %{_libdir}/nss
|
||||
%dir %{_libdir}/nss/saved
|
||||
%dir %{unsupported_tools_directory}
|
||||
@ -561,6 +572,9 @@ update-crypto-policies &>/dev/null||:
|
||||
%doc %{_mandir}/man*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 20 2023 jinlun <jinlun@huawei.com> - 3.72.0-9
|
||||
- Add Integrity Verification File in nss-softokn and fix build fail.
|
||||
|
||||
* Thu May 11 2023 wangkai <13474090681@163.com> - 3.72.0-8
|
||||
- Update pkgconfig(nss) pkgconfig(nss-softokn) to version 3.72
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user