[arch-commits] Commit in opensearch-alerting-plugin/trunk (2 files)

[Leonidas Spyropoulos]

    Date: Tuesday, June 21, 2022 @ 08:34:23
  Author: artafinde
Revision: 1238762

opensearch-alerting-plugin: upstream release 2.0.1 and repro

Added:
  opensearch-alerting-plugin/trunk/0001-Add-support-for-reproducible-builds.patch
Modified:
  opensearch-alerting-plugin/trunk/PKGBUILD

------------------------------------------------+
 0001-Add-support-for-reproducible-builds.patch |   34 +++++++++++++++++++++++
 PKGBUILD                                       |   13 ++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

Added: 0001-Add-support-for-reproducible-builds.patch
===================================================================
--- 0001-Add-support-for-reproducible-builds.patch	                        (rev 0)
+++ 0001-Add-support-for-reproducible-builds.patch	2022-06-21 08:34:23 UTC (rev 1238762)
@@ -0,0 +1,34 @@
+From f40dbfdcee004f078216b00b1ce46744a8664205 Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <artafinde at gmail.com>
+Date: Tue, 14 Jun 2022 18:00:54 +0100
+Subject: [PATCH] Add support for reproducible builds
+
+As per gradle [docs] add support to remove timestamps and package with same order which is required from
+[reproducible] builds
+
+[docs]: https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
+[reproducible]: https://reproducible-builds.org/
+
+Signed-off-by: Leonidas Spyropoulos <artafinde at archlinux.com>
+---
+ build.gradle | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build.gradle b/build.gradle
+index 60b11af..9a898d3 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -88,6 +88,10 @@ allprojects {
+         compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11
+         compileKotlin.dependsOn ktlint
+     }
++    tasks.withType(AbstractArchiveTask).configureEach {
++        preserveFileTimestamps = false
++        reproducibleFileOrder = true
++    }
+ }
+ 
+ evaluationDependsOnChildren()
+-- 
+2.36.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-21 08:18:52 UTC (rev 1238761)
+++ PKGBUILD	2022-06-21 08:34:23 UTC (rev 1238762)
@@ -1,9 +1,9 @@
 # Maintainer: Justin Kromlinger <hashworks at archlinux.org>
 
 pkgname=opensearch-alerting-plugin
-pkgver=2.0.0.0
+pkgver=2.0.1.0
 pkgrel=1
-_opensearchver=2.0.0
+_opensearchver=2.0.1
 _jdkver=11
 pkgdesc="OpenSearch Alerting Plugin"
 arch=('x86_64')
@@ -13,9 +13,16 @@
 makedepends=("java-environment=${_jdkver}" 'unzip')
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/opensearch-project/alerting/archive/${pkgver}.tar.gz"
+  "0001-Add-support-for-reproducible-builds.patch"
 )
-sha256sums=('7d5236b4c8f4b943dec189247027f0fa7e992c7efdbc5fae6500fe4f0596139e')
+sha256sums=('c58134198c547fe4cf36b306f098d224f3195862290fa47bd20bb5fc8a38ea82'
+            '3bab2d7e8b31b3b1333c072fa91e63e7f6eda8d5ea94f46f0d056de98eb7c228')
 
+prepare() {
+  cd "alerting-${pkgver}"
+  patch -Np1 -i "$srcdir"/0001-Add-support-for-reproducible-builds.patch
+}
+
 build() {
   cd "alerting-${pkgver}"
   export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"