packages/nss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!110 [sync] PR-109: Add Integrity Verification File in nss-softokn and fix build fail.

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @zcfsite 
Signed-off-by: @zcfsite
This commit is contained in:
openeuler-ci-bot 2023-06-20 03:23:00 +00:00 committed by Gitee
commit 4e18b4cb0f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Feature-nss-add-implement-of-SM3-digest-algorithm.patch
View File

@ -296,7 +296,7 @@ new file mode 100644
index 0000000..83d787f index 0000000..83d787f
--- /dev/null --- /dev/null
+++ b/lib/freebl/sm3.h +++ 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 +/* 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 + * 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/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -313,8 +313,6 @@ index 0000000..83d787f
+ PRUint32 num; + PRUint32 num;
+}; +};
+ +
+typedef struct SM3ContextStr SM3Context;
+
+#endif /* _SM3_H_ */ +#endif /* _SM3_H_ */
-- --
2.33.0 2.33.0

24
nss.spec
View File

@ -11,10 +11,21 @@
%bcond_with test %bcond_with test
%bcond_without dbm %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 Summary: Network Security Services
Name: nss Name: nss
Version: %{nss_version} Version: %{nss_version}
Release: 8 Release: 9
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Provides: nss-system-init Provides: nss-system-init
@ -523,15 +534,15 @@ update-crypto-policies &>/dev/null||:
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license nss/COPYING %license nss/COPYING
%{_libdir}/libfreebl3.so %{_libdir}/libfreebl3.so
#%{_libdir}/libfreebl3.chk %{_libdir}/libfreebl3.chk
%{_libdir}/libfreeblpriv3.so %{_libdir}/libfreeblpriv3.so
#%{_libdir}/libfreeblpriv3.chk %{_libdir}/libfreeblpriv3.chk
%if %{with dbm} %if %{with dbm}
%{_libdir}/libnssdbm3.so %{_libdir}/libnssdbm3.so
#%{_libdir}/libnssdbm3.chk %{_libdir}/libnssdbm3.chk
%endif %endif
%{_libdir}/libsoftokn3.so %{_libdir}/libsoftokn3.so
#%{_libdir}/libsoftokn3.chk %{_libdir}/libsoftokn3.chk
%dir %{_libdir}/nss %dir %{_libdir}/nss
%dir %{_libdir}/nss/saved %dir %{_libdir}/nss/saved
%dir %{unsupported_tools_directory} %dir %{unsupported_tools_directory}
@ -561,6 +572,9 @@ update-crypto-policies &>/dev/null||:
%doc %{_mandir}/man* %doc %{_mandir}/man*
%changelog %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 * Thu May 11 2023 wangkai <13474090681@163.com> - 3.72.0-8
- Update pkgconfig(nss) pkgconfig(nss-softokn) to version 3.72 - Update pkgconfig(nss) pkgconfig(nss-softokn) to version 3.72