Date: Wednesday, February 22, 2023 @ 16:53:07 Author: artafinde Revision: 1403624
upgpkg: kafka 3.4.0-1 Added: kafka/trunk/fix-scala-compilation-on-gradle-8_0_1.patch kafka/trunk/keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc Modified: kafka/trunk/PKGBUILD Deleted: kafka/trunk/support-gradle-7_6.patch -------------------------------------------------------+ PKGBUILD | 120 +++++++++------- fix-scala-compilation-on-gradle-8_0_1.patch | 27 +++ keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc | 1 support-gradle-7_6.patch | 47 ------ 4 files changed, 97 insertions(+), 98 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-22 15:46:09 UTC (rev 1403623) +++ PKGBUILD 2023-02-22 16:53:07 UTC (rev 1403624) @@ -1,7 +1,7 @@ # Maintainer: Leonidas Spyropoulos <[email protected]> pkgname=kafka -pkgver=3.3.2 +pkgver=3.4.0 pkgrel=1 _scalaver=2.13 pkgdesc="An open-source distributed event streaming platform" @@ -11,15 +11,15 @@ depends=(bash 'java-runtime=17') makedepends=(gradle 'java-environment=17') source=( - https://downloads.apache.org/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc} - $pkgname.service - $pkgname.sysusers - $pkgname.tmpfiles - zookeeper.service - set-base_dir.patch - support-gradle-7_6.patch + https://downloads.apache.org/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc} + $pkgname.service + $pkgname.sysusers + $pkgname.tmpfiles + zookeeper.service + set-base_dir.patch + fix-scala-compilation-on-gradle-8_0_1.patch ) -sha512sums=('385bbe644ca1cce80e8edca0aab76c02d00ef6ba6a408fa18bacef279524662102678d7188b5d814acba476dd7361a1ecd1a8aa34e4425c4d44a640b6dd1aea4' +sha512sums=('84e368c6d5e6487ab7a9892a4f7859fa1f7a4c90880706d0b6a855affdf165fd1aa1ae25e098d5ef11f452a71f76e5edab083db98d6eec5ff5e61c69cb65d302' 'SKIP' '5b61517a2236bbfce86cc372f0000fdd78fd8715fa2ee872972401df6b9950427ef952b3b248479a5fedc0f7caab3df9cf08982dac4ba5ed2d486c96e521eed5' 'ae31dd1282250295401df11047bfca13263f8ab867df08f4030f1ddbd2dd5b407e5a59674e8d77a02cdf8a33916a3486b308b022b4fcda0374dbf42d9a29ef28' @@ -26,8 +26,8 @@ '6712da5b177131ad235ac857fbd8fb97d2c8821ce5c15c40f82f638eb8b08ee693d73030bce893a61934b48b20e67d611dffb365979aafe12e448100c0b82981' '6aca852f63f62c8df32721a86cf2ce56630ab1bf428111655908113fe337714fe1149865567e7f0ba1da96fd026cccdb851bcb10ac1823e033edc18adb2ba4c6' '3739ec988aada505a0eccee6ae27a9ca620547b3117a034d9eec7cae5bc2af26f41aa8bd066945946c19c05e8529034b7a1b1f49ea03a6574760bb6c1a64a7ad' - 'defa0ec9ee06829d981aad4be3d69c7c772ad61e4b1e2cce2c5a814638cd47b39f27c3099e35d1ab5779e1cdda29dddd9ae72da65e3e08aade44ce6ef967b5b5') -b2sums=('e4c37a24b5cbb537fc1b117662e30a63bb11373ec6bfa50e017612853cff476833a3e7b4b1a5dc4f69f59091e98b811a99ddbacffc58f9a14cf40c8bd1147861' + '4a2e2b472446fa5ed25776780a819a27df4e6292fd02692f1f1878d415cf74306de8bfe3e7705a750364149de0b53ab2ed3d5306c665638b29db357981c3f2cb') +b2sums=('7a4ec34bb992fb61dc84dbd016b445aaa63a71811b375acacf19e6b767c34b26c97dfc3d517bbbb73326aa9136cc894d6e3af557e33a02e426e0f50c84898107' 'SKIP' '0276cf21cf93d26022c484f085da18d4e314d6f2c6270591a3853cb84a63bbe9ad480949479ac0ef69a96b38508bb2fa528a205e666ce9305713d9da8f074711' 'da8989434085e937bf24735f8ab9cec969293e2db5f0e715e33f9ba91f3cbde864467fd6d9a4ebb37a367cc3c72b364d74c4093dd027fbe3f96c2bd94987d0ac' @@ -34,64 +34,82 @@ 'a19e80d0177eb35f74403d7ea68a228650c5aeaf54211fd0fba9a948aa49662c7b1331a0572dce7f5bb69163ee9d2b84a3823b94e176f108fd42904e56ade9d6' '61f3b3d2c34579a8d1d0ac372b08f74940e57de9a5666a53dfb6a5ddb705d4f96b40c5ab8df9cf6ed85bacc405c639d5a8cbde727e642b75ea05da90e58126c1' 'ced95f54e1efc1cf1e94e933470f0ed19bbb787f0602fbbd7edd188943eda98c31b47debdde2a4cd0c79d32c448dbc6f634162f9ac1f977ba18b67b4376f4901' - '5813d14cef8512e6f36e94086e88ac8cefb3ea2c9a534cded6bf9e59cc6b9125612db972738a12c6f7817b0cd3624b1332787caae445bb022b85ae772fbb0585') + 'f5f0d58ef20754cedfb1d4596ce9c89fc605c4d71a7b49d886b0ce08737b554cc86f68e764eb4d935e219e7341c78c5c2415518e5b6a0dd1a0fc1013de9397f5') # list of trusted signing keys: https://downloads.apache.org/kafka/KEYS validpgpkeys=( 5AFBFDA44492C1240E5A45AFF19D6CB551424672 # Chris Egerton (CODE SIGNING KEY) <[email protected]> + 6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8 # David Arthur (CODE SIGNING KEY) <[email protected]> ) prepare() { - cd "$pkgname-$pkgver-src" - patch -Np1 < "${srcdir}/support-gradle-7_6.patch" - patch -Np1 < "${srcdir}/set-base_dir.patch" + cd "$pkgname-$pkgver-src" + patch -Np1 < "${srcdir}/fix-scala-compilation-on-gradle-8_0_1.patch" + patch -Np1 < "${srcdir}/set-base_dir.patch" } build() { - cd "$pkgname-$pkgver-src" - /usr/bin/gradle releaseTarGz -PscalaVersion=$_scalaver + cd "$pkgname-$pkgver-src" + /usr/bin/gradle \ + -PscalaVersion=$_scalaver \ + compileJava \ + compileScala \ + compileTestJava \ + compileTestScala \ + releaseTarGz - install -vdm 755 "$srcdir/$pkgname-$pkgver-src/dist" - tar -xf "core/build/distributions/${pkgname}_${_scalaver}-$pkgver.tgz" --strip 1 -C "$srcdir/$pkgname-$pkgver-src/dist" + install -vdm 755 "$srcdir/$pkgname-$pkgver-src/dist" + tar -xf "core/build/distributions/${pkgname}_${_scalaver}-$pkgver.tgz" \ + --strip 1 \ + -C "$srcdir/$pkgname-$pkgver-src/dist" } check() { - cd "$pkgname-$pkgver-src" - /usr/bin/gradle unitTest -PscalaVersion=$_scalaver + cd "$pkgname-$pkgver-src" + /usr/bin/gradle \ + -PscalaVersion=$_scalaver \ + --continue \ + -PkeepAliveMode=session \ + -PtestLoggingEvents=started,passed,skipped,failed \ + -PignoreFailures=true \ + -PmaxParallelForks=2 \ + -PmaxTestRetries=1 \ + -PmaxTestRetryFailures=10 \ + unitTest } package() { - local _sh_script - cd "$pkgname-$pkgver-src/dist" - - # remove unneeded and OS specific scripts - rm -rvf bin/windows - - # make target scripts executable - chmod 755 bin/*.sh - - # copy application - install -vdm 755 "$pkgdir/usr/share/$pkgname/" - cp -dr --no-preserve='ownership' {bin,config,libs,licenses,site-docs} "$pkgdir/usr/share/$pkgname/" + local _sh_script + cd "$pkgname-$pkgver-src/dist" - # symlink config to /etc - install -vdm 755 "$pkgdir/etc/$pkgname/" - for _config in config/*; do - ln -sv /usr/share/$pkgname/${_config} "$pkgdir/etc/$pkgname/${_config#config/}" - done + # remove unneeded and OS specific scripts + rm -rvf bin/windows - # symlink scripts into PATH - install -vdm 755 "$pkgdir/usr/bin/" + # make target scripts executable + chmod 755 bin/*.sh - for _sh_script in bin/*.sh; do - ln -sv /usr/share/$pkgname/${_sh_script} "$pkgdir/usr/${_sh_script}" - done + # copy application + install -vdm 755 "$pkgdir/usr/share/$pkgname/" + cp -dr --no-preserve='ownership' {bin,config,libs,licenses,site-docs} "$pkgdir/usr/share/$pkgname/" - # logs directory - install -vdm 755 "$pkgdir/var/log/$pkgname/" - # docs - install -vDm 644 {LICENSE,NOTICE} -t "$pkgdir/usr/share/doc/$pkgname/" - install -vDm 644 $srcdir/$pkgname.service -t "$pkgdir/usr/lib/systemd/system/" - install -vDm 644 $srcdir/zookeeper.service -t "$pkgdir/usr/lib/systemd/system/" - install -vDm 644 $srcdir/$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" - install -vDm 644 $srcdir/$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + # symlink config to /etc + install -vdm 755 "$pkgdir/etc/$pkgname/" + for _config in config/*; do + ln -sv /usr/share/$pkgname/${_config} "$pkgdir/etc/$pkgname/${_config#config/}" + done + + # symlink scripts into PATH + install -vdm 755 "$pkgdir/usr/bin/" + + for _sh_script in bin/*.sh; do + ln -sv /usr/share/$pkgname/${_sh_script} "$pkgdir/usr/${_sh_script}" + done + + # logs directory + install -vdm 755 "$pkgdir/var/log/$pkgname/" + # docs + install -vDm 644 {LICENSE,NOTICE} -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 $srcdir/$pkgname.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 $srcdir/zookeeper.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 $srcdir/$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -vDm 644 $srcdir/$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } Added: fix-scala-compilation-on-gradle-8_0_1.patch =================================================================== --- fix-scala-compilation-on-gradle-8_0_1.patch (rev 0) +++ fix-scala-compilation-on-gradle-8_0_1.patch 2023-02-22 16:53:07 UTC (rev 1403624) @@ -0,0 +1,27 @@ +Subject: [PATCH] fix-scala-compilation-on-gradle-8.0.1 +--- +Index: build.gradle +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/build.gradle b/build.gradle +--- a/build.gradle (revision 2e1947d240607d53f071f61c875cfffc3fec47fe) ++++ b/build.gradle (date 1677026530111) +@@ -671,6 +671,7 @@ + scalaCompileOptions.additionalParameters += ["-opt-warnings", "-Xlint:strict-unsealed-patmat"] + // Scala 2.13.2 introduces compiler warnings suppression, which is a pre-requisite for -Xfatal-warnings + scalaCompileOptions.additionalParameters += ["-Xfatal-warnings"] ++ scalaCompileOptions.additionalParameters += ["-release:" + minJavaVersion] + } + + // these options are valid for Scala versions < 2.13 only +@@ -684,7 +685,7 @@ + } + + // Scalac's `-release` requires Java 9 or higher +- if (JavaVersion.current().isJava9Compatible()) ++ if ((JavaVersion.current().isJava9Compatible()) && (versions.baseScala == '2.12')) + scalaCompileOptions.additionalParameters += ["-release", minJavaVersion] + + configure(scalaCompileOptions.forkOptions) { Added: keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc =================================================================== (Binary files differ) Index: kafka/trunk/keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc =================================================================== --- keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc 2023-02-22 15:46:09 UTC (rev 1403623) +++ keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc 2023-02-22 16:53:07 UTC (rev 1403624) Property changes on: kafka/trunk/keys/pgp/6FB0F28835C48C7C56D2F1F6D3360B139CE19FE8.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Deleted: support-gradle-7_6.patch =================================================================== --- support-gradle-7_6.patch 2023-02-22 15:46:09 UTC (rev 1403623) +++ support-gradle-7_6.patch 2023-02-22 16:53:07 UTC (rev 1403624) @@ -1,47 +0,0 @@ -Subject: [PATCH] support-gradle-7.6 ---- -Index: gradle/dependencies.gradle -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle ---- a/gradle/dependencies.gradle (revision b66af662e61082cb8def576ded1fe5cee37e155f) -+++ b/gradle/dependencies.gradle (date 1675032287344) -@@ -62,7 +62,7 @@ - checkstyle: "8.36.2", - commonsCli: "1.4", - dropwizardMetrics: "4.1.12.1", -- gradle: "7.4.2", -+ gradle: "7.6", - grgit: "4.1.1", - httpclient: "4.5.13", - easymock: "4.3", -@@ -119,7 +119,7 @@ - spotbugs: "4.2.2", - swaggerAnnotations: "2.2.0", - swaggerJaxrs2: "2.2.0", -- zinc: "1.3.5", -+ zinc: "1.6.1", - zookeeper: "3.6.3", - zstd: "1.5.2-1" - ] -Index: build.gradle -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/build.gradle b/build.gradle ---- a/build.gradle (revision b66af662e61082cb8def576ded1fe5cee37e155f) -+++ b/build.gradle (date 1675032216066) -@@ -66,8 +66,10 @@ - if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) - defaultJvmArgs.addAll( - "--add-opens=java.base/java.io=ALL-UNNAMED", -+ "--add-opens=java.base/java.lang=ALL-UNNAMED", - "--add-opens=java.base/java.nio=ALL-UNNAMED", - "--add-opens=java.base/java.nio.file=ALL-UNNAMED", -+ "--add-opens=java.base/java.util=ALL-UNNAMED", - "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED", - "--add-opens=java.base/java.util.regex=ALL-UNNAMED", - "--add-opens=java.base/java.util.stream=ALL-UNNAMED",
