!35 更新版本2.8.2解决cve

From: @xiexing01 
Reviewed-by: @wuzeyi1 
Signed-off-by: @wuzeyi1
This commit is contained in:
openeuler-ci-bot 2022-09-26 01:52:20 +00:00 committed by Gitee
commit 7d3fb8ffe4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 11 additions and 8 deletions

View File

@ -43,6 +43,6 @@ diff -Naur kafka-2.8.1-src/gradle/wrapper/gradle-wrapper.properties kafka-2.8.1-
distributionPath=wrapper/dists distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+distributionUrl=https\://mirrors.huaweicloud.com/gradle/gradle-6.8.1-all.zip +distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.8.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -3,7 +3,7 @@
%define kafka_home /opt/kafka %define kafka_home /opt/kafka
Name: kafka Name: kafka
Version: 2.8.1 Version: 2.8.2
Release: 1 Release: 1
Summary: A Distributed Streaming Platform. Summary: A Distributed Streaming Platform.
@ -30,8 +30,8 @@ exit 0
%prep %prep
%autosetup -p1 -n %{name}-%{version}-src %autosetup -p1 -n %{name}-%{version}-src
cp -r $RPM_SOURCE_DIR/gradle-6.8.1-all.zip %{_builddir}/kafka-2.8.1-src/gradle/wrapper/ cp -r $RPM_SOURCE_DIR/gradle-6.8.1-all.zip %{_builddir}/kafka-%{version}-src/gradle/wrapper/
cp -r $RPM_SOURCE_DIR/gradle-wrapper.jar %{_builddir}/kafka-2.8.1-src/gradle/wrapper/ cp -r $RPM_SOURCE_DIR/gradle-wrapper.jar %{_builddir}/kafka-%{version}-src/gradle/wrapper/
%build %build
unzip -q $RPM_SOURCE_DIR/gradle-6.8.1-all.zip unzip -q $RPM_SOURCE_DIR/gradle-6.8.1-all.zip
@ -41,10 +41,10 @@ unzip -q $RPM_SOURCE_DIR/gradle-6.8.1-all.zip
%install %install
mkdir -p $RPM_BUILD_ROOT%{kafka_home}/{libs,bin,config,site-docs,licenses} mkdir -p $RPM_BUILD_ROOT%{kafka_home}/{libs,bin,config,site-docs,licenses}
cd %{_builddir}/kafka-2.8.1-src/core/build/distributions/ cd %{_builddir}/kafka-%{version}-src/core/build/distributions/
tar -xvf kafka_2.13-2.8.1.tgz tar -xvf kafka_2.13-%{version}.tgz
cp -pr kafka_2.13-2.8.1 %{_builddir} cp -pr kafka_2.13-%{version} %{_builddir}
cd %{_builddir}/kafka_2.13-2.8.1 cd %{_builddir}/kafka_2.13-%{version}
cp -pr libs/* $RPM_BUILD_ROOT%{kafka_home}/libs cp -pr libs/* $RPM_BUILD_ROOT%{kafka_home}/libs
cp -pr bin/* $RPM_BUILD_ROOT%{kafka_home}/bin cp -pr bin/* $RPM_BUILD_ROOT%{kafka_home}/bin
@ -64,6 +64,9 @@ cp -pr licenses/* $RPM_BUILD_ROOT%{kafka_home}/licenses
rm -rf %{buildroot} rm -rf %{buildroot}
%changelog %changelog
* Sat Sep 24 2022 xiexing <xiexing4@hisilicon.com> - 2.8.2-1
- fix CVE-2022-34917
* Thu Aug 11 2022 xiexing <xiexing4@hisilicon.com> - 2.8.1-1 * Thu Aug 11 2022 xiexing <xiexing4@hisilicon.com> - 2.8.1-1
- update version to fix CVE-2021-38153 - update version to fix CVE-2021-38153