diff --git a/0001-adopt-huaweimaven.patch b/0001-adopt-huaweimaven.patch index e38b9f4c2b14bfbfdc5b8e0b8ad1ccfedc9c575b..ea4c7d6d502bcd90370524c8fd1e8686a0ea899e 100644 --- a/0001-adopt-huaweimaven.patch +++ b/0001-adopt-huaweimaven.patch @@ -43,6 +43,6 @@ diff -Naur kafka-2.8.1-src/gradle/wrapper/gradle-wrapper.properties kafka-2.8.1- 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\://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 zipStorePath=wrapper/dists diff --git a/kafka-2.8.1-src.tgz b/kafka-2.8.2-src.tgz similarity index 54% rename from kafka-2.8.1-src.tgz rename to kafka-2.8.2-src.tgz index fe7506fe4b615f617236514096f77a451e234ba6..a850e74faea425a754bbd005138b0a646db5f822 100644 Binary files a/kafka-2.8.1-src.tgz and b/kafka-2.8.2-src.tgz differ diff --git a/kafka.spec b/kafka.spec index 7b2344371cb897747be3b639d1312c29017117dc..e91f7015e55d7c6fa8f125edd479d6a43069590f 100644 --- a/kafka.spec +++ b/kafka.spec @@ -3,7 +3,7 @@ %define kafka_home /opt/kafka Name: kafka -Version: 2.8.1 +Version: 2.8.2 Release: 1 Summary: A Distributed Streaming Platform. @@ -30,8 +30,8 @@ exit 0 %prep %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-wrapper.jar %{_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-%{version}-src/gradle/wrapper/ %build 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 mkdir -p $RPM_BUILD_ROOT%{kafka_home}/{libs,bin,config,site-docs,licenses} -cd %{_builddir}/kafka-2.8.1-src/core/build/distributions/ -tar -xvf kafka_2.13-2.8.1.tgz -cp -pr kafka_2.13-2.8.1 %{_builddir} -cd %{_builddir}/kafka_2.13-2.8.1 +cd %{_builddir}/kafka-%{version}-src/core/build/distributions/ +tar -xvf kafka_2.13-%{version}.tgz +cp -pr kafka_2.13-%{version} %{_builddir} +cd %{_builddir}/kafka_2.13-%{version} cp -pr libs/* $RPM_BUILD_ROOT%{kafka_home}/libs 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} %changelog +* Sat Sep 24 2022 xiexing - 2.8.2-1 +- fix CVE-2022-34917 + * Thu Aug 11 2022 xiexing - 2.8.1-1 - update version to fix CVE-2021-38153