diff --git a/0001-adopt-huaweimaven.patch b/0001-adopt-huaweimaven.patch new file mode 100644 index 0000000..0a874fd --- /dev/null +++ b/0001-adopt-huaweimaven.patch @@ -0,0 +1,32 @@ +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-09 20:28:57.716461191 +0800 +@@ -22,7 +22,7 @@ + mavenCentral() + jcenter() + maven { +- url "https://plugins.gradle.org/m2/" ++ url "https://repo.huaweicloud.com/repository/maven/" + } + } + apply from: file('gradle/buildscript.gradle'), to: buildscript +@@ -54,7 +54,7 @@ + allprojects { + + repositories { +- mavenCentral() ++ maven{url 'https://repo.huaweicloud.com/repository/maven/'} + } + + apply plugin: 'idea' +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-10 10:27:57.510484835 +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=gradle-6.8.1-all.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/gradle-6.5-bin.zip b/gradle-6.8.1-all.zip similarity index 66% rename from gradle-6.5-bin.zip rename to gradle-6.8.1-all.zip index aa94644..4b31ee7 100644 Binary files a/gradle-6.5-bin.zip and b/gradle-6.8.1-all.zip differ diff --git a/gradle-wrapper.jar b/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle-wrapper.jar differ diff --git a/kafka-2.6.0-src.tgz b/kafka-2.6.0-src.tgz deleted file mode 100644 index 19dbec6..0000000 Binary files a/kafka-2.6.0-src.tgz and /dev/null differ diff --git a/kafka-2.8.1-src.tgz b/kafka-2.8.1-src.tgz new file mode 100644 index 0000000..fe7506f Binary files /dev/null and b/kafka-2.8.1-src.tgz differ diff --git a/kafka.spec b/kafka.spec index c2bd2ae..7fafbba 100644 --- a/kafka.spec +++ b/kafka.spec @@ -3,14 +3,17 @@ %define kafka_home /opt/kafka Name: kafka -Version: 2.6.0 -Release: 2 +Version: 2.8.1 +Release: 1 Summary: A Distributed Streaming Platform. License: Apache License, Version 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://services.gradle.org/distributions/gradle-6.5-bin.zip +Source1: 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} @@ -27,22 +30,32 @@ 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-2.8.1-src/gradle/wrapper/ +cp -r $RPM_SOURCE_DIR/gradle-wrapper.jar %{_builddir}/kafka-2.8.1-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.5-bin.zip +#./gradle-6.5/bin/gradle --info +#./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} - -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 +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 +#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 -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) @@ -56,6 +69,9 @@ cp -n */*/build/dependant-libs*/* $RPM_BUILD_ROOT%{kafka_home}/libs rm -rf %{buildroot} %changelog +* Thu Aug 11 2022 xiexing - 2.8.1-1 +- update version to fix cve + * Thu Mar 25 2021 huanghaitao 2.6.0 - 2 - Remove dist macros