!40 [sync] PR-37: 更新版本2.8.2解决cve 20.03-sp1

From: @openeuler-sync-bot 
Reviewed-by: @wuzeyi1 
Signed-off-by: @wuzeyi1

0001-adopt-huaweimaven.patch

@@ -0,0 +1,48 @@
+diff -Naur kafka-2.8.1-src/build.gradle kafka-2.8.1-src-change/build.gradle
+--- kafka-2.8.1-src/build.gradle	2021-09-14 21:03:12.000000000 +0800
++++ kafka-2.8.1-src-change/build.gradle	2022-08-11 22:41:08.381225132 +0800
+@@ -19,11 +19,7 @@
+ 
+ buildscript {
+   repositories {
+-    mavenCentral()
+-    jcenter()
+-    maven {
+-      url "https://plugins.gradle.org/m2/"
+-    }
++    maven{url 'https://repo.huaweicloud.com/repository/maven/'}
+   }
+   apply from: file('gradle/buildscript.gradle'), to: buildscript
+   apply from: "$rootDir/gradle/dependencies.gradle"
+@@ -54,7 +50,7 @@
+ allprojects {
+ 
+   repositories {
+-    mavenCentral()
++    maven{url 'https://repo.huaweicloud.com/repository/maven/'}
+   }
+ 
+   apply plugin: 'idea'
+diff -Naur kafka-2.8.1-src/gradle/buildscript.gradle kafka-2.8.1-src-change/gradle/buildscript.gradle
+--- kafka-2.8.1-src/gradle/buildscript.gradle	2021-09-14 21:03:12.000000000 +0800
++++ kafka-2.8.1-src-change/gradle/buildscript.gradle	2022-08-11 23:00:43.143217999 +0800
+@@ -17,7 +17,7 @@
+   repositories {
+     // For license plugin.
+     maven {
+-      url 'https://dl.bintray.com/content/netflixoss/external-gradle-plugins/'
++      url 'https://repo.huaweicloud.com/repository/maven/'
+     }
+   }
+ }
+diff -Naur kafka-2.8.1-src/gradle/wrapper/gradle-wrapper.properties kafka-2.8.1-src-change/gradle/wrapper/gradle-wrapper.properties
+--- kafka-2.8.1-src/gradle/wrapper/gradle-wrapper.properties	2021-09-14 21:03:12.000000000 +0800
++++ kafka-2.8.1-src-change/gradle/wrapper/gradle-wrapper.properties	2022-08-11 22:41:33.044813236 +0800
+@@ -1,5 +1,6 @@
+ distributionBase=GRADLE_USER_HOME
+ 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\://repo.huaweicloud.com/gradle/gradle-6.8.1-all.zip
+ zipStoreBase=GRADLE_USER_HOME
+ zipStorePath=wrapper/dists

kafka.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Kafka
+After=network.target
+
+[Service]
+User=kafka
+Group=kafka
+Environment=CLASSPATH=.:/opt/kafka/libs/*
+EnvironmentFile=/etc/sysconfig/kafka
+ExecStart=/bin/java -cp $CLASSPATH $KAFKA_LOG4J_OPTS $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS $KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS kafka.Kafka $KAFKA_SERVER_CONFIG
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target

kafka.spec

@@ -3,13 +3,16 @@
 %define kafka_home /opt/kafka
 
 Name: kafka
-Version: 2.6.0
-Release: 1%{?dist}
+Version: 2.8.2
+Release: 1
 Summary: A Distributed Streaming Platform.
 
-License: Apache License, Version 2.0
+License: Apache-2.0
 Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tgz
-Source1: https://services.gradle.org/distributions/gradle-6.5-bin.zip
+Source1: https://mirrors.huaweicloud.com/gradle/gradle-6.8.1-all.zip
+Source2: kafka.service
+Source3: gradle-wrapper.jar
+Patch0: 0001-adopt-huaweimaven.patch
 
 BuildRequires: systemd java-1.8.0-openjdk-devel
 Provides: kafka = %{version}
@@ -26,22 +29,28 @@ getent passwd %{name} >/dev/null || \
 exit 0
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%autosetup -p1 -n %{name}-%{version}-src
+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.5-bin.zip
-./gradle-6.5/bin/gradle
-./gradlew jar
+unzip -q $RPM_SOURCE_DIR/gradle-6.8.1-all.zip
+./gradle-6.8.1/bin/gradle --info
+./gradlew jar releaseTarGz 
+
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{kafka_home}/{libs,bin,config}
+mkdir -p $RPM_BUILD_ROOT%{kafka_home}/{libs,bin,config,site-docs,licenses}
+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}
 
-install -p -D -m 755 bin/*.sh $RPM_BUILD_ROOT%{kafka_home}/bin
-install -p -D -m 644 config/* $RPM_BUILD_ROOT%{kafka_home}/config
-cp -n */build/libs/* $RPM_BUILD_ROOT%{kafka_home}/libs
-cp -n */build/dependant-libs*/* $RPM_BUILD_ROOT%{kafka_home}/libs
-cp -n */*/build/libs/* $RPM_BUILD_ROOT%{kafka_home}/libs
-cp -n */*/build/dependant-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 config/* $RPM_BUILD_ROOT%{kafka_home}/config
+cp -pr site-docs/* $RPM_BUILD_ROOT%{kafka_home}/site-docs
+cp -pr licenses/*   $RPM_BUILD_ROOT%{kafka_home}/licenses
 
 %files
 %defattr(-,root,root)
@@ -55,5 +64,27 @@ cp -n */*/build/dependant-libs*/* $RPM_BUILD_ROOT%{kafka_home}/libs
 rm -rf %{buildroot}
 
 %changelog
+* Sat Sep 24 2022 xiexing <xiexing4@hisilicon.com> - 2.8.2-1
+- fix CVE-2022-34917
+
+* Sun Sep 18 2022 xiexing <xiexing4@hisilicon.com> - 2.8.1-1
+- update version to fix CVE-2021-38153
+
+* Thu Jul 15 2021 liyanan <liyanan32@huawei.com> - 2.4.0-4
+- fix gradle url to huaweicloud
+- fix gradle wrapper to local source
+- fix maven url to huaweicloud
+
+* Thu Apr 2 2021 huanghaitao <huanghaitao8@huawei.com> 2.4.0 - 3
+- Declare kafka already include zookeeper
+
+* Thu Mar 25 2021 huanghaitao <huanghaitao8@huawei.com> 2.4.0 - 2
+- Remove dist macros
+
+* Sat Mar 20 2021 huanghaitao <huanghaitao8@huawei.com> 2.4.0 - 1
+- Rebase to 2.4.0
+
 * Sat Aug 15 2020 Hao Zhang <unioah@isrc.iscas.ac.cn>
 - init
+* Sat Oct 04 2020 Hao Zhang <unioah@isrc.iscas.ac.cn>
+- add service