!106 修复由于openssl 3.0不兼容导致的编译失败

From: @starlet-dx 
Reviewed-by: @gitee-cmd 
Signed-off-by: @gitee-cmd
This commit is contained in:
openeuler-ci-bot 2023-02-03 07:10:11 +00:00 committed by Gitee
commit 6feca2f481
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,5 +1,5 @@
%bcond_with bootstrap %bcond_with bootstrap
%global baserelease 4 %global baserelease 5
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global nodejs_epoch 1 %global nodejs_epoch 1
%global nodejs_major 12 %global nodejs_major 12
@ -112,8 +112,7 @@ Provides: bundled(http-parser) = %{http_parser_version}
Provides: bundled(llhttp) = %{llhttp_version} Provides: bundled(llhttp) = %{llhttp_version}
%endif %endif
BuildRequires: openssl-devel >= %{openssl_minimum} BuildRequires: compat-openssl11-devel >= %{openssl_minimum}
Requires: openssl >= %{openssl_minimum}
Requires: ca-certificates Requires: ca-certificates
Requires: nodejs-libs%{?_isa} = %{nodejs_epoch}:%{version}-%{release} Requires: nodejs-libs%{?_isa} = %{nodejs_epoch}:%{version}-%{release}
Recommends: nodejs-full-i18n%{?_isa} = %{nodejs_epoch}:%{version}-%{release} Recommends: nodejs-full-i18n%{?_isa} = %{nodejs_epoch}:%{version}-%{release}
@ -144,7 +143,7 @@ real-time applications that run across distributed devices.
Summary: JavaScript runtime - development headers Summary: JavaScript runtime - development headers
Group: Development/Languages Group: Development/Languages
Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
Requires: openssl-devel%{?_isa} Requires: compat-openssl11-devel%{?_isa}
Requires: zlib-devel%{?_isa} Requires: zlib-devel%{?_isa}
Requires: brotli-devel%{?_isa} Requires: brotli-devel%{?_isa}
Requires: nodejs-packaging Requires: nodejs-packaging
@ -490,7 +489,10 @@ end
%{_pkgdocdir}/npm/docs %{_pkgdocdir}/npm/docs
%changelog %changelog
* Wed Nov 16 2022 liyuxiang <liyuxiang@ncti-gba.cn> 1:12.22.11-4 * Fri Feb 03 2023 yaoxin <yaoxin30@h-partners.com> - 1:12.22.11-5
- Fix build failed due to openssl update to 3.0
* Wed Nov 16 2022 liyuxiang <liyuxiang@ncti-gba.cn> - 1:12.22.11-4
- fix CVE-2022-43548 - fix CVE-2022-43548
* Wed Aug 03 2022 wangkai <wangkai385@h-partners.com> - 1:12.22.11-3 * Wed Aug 03 2022 wangkai <wangkai385@h-partners.com> - 1:12.22.11-3