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

[Leonidas Spyropoulos]

    Date: Tuesday, July 26, 2022 @ 23:32:41
  Author: artafinde
Revision: 1258870

opensearch-alerting-plugin: reproducible patch merged to master

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

------------------------------------------------+
 0001-Add-support-for-reproducible-builds.patch |   34 -----------------------
 PKGBUILD                                       |    9 ------
 2 files changed, 1 insertion(+), 42 deletions(-)

Deleted: 0001-Add-support-for-reproducible-builds.patch
===================================================================
--- 0001-Add-support-for-reproducible-builds.patch	2022-07-26 23:23:31 UTC (rev 1258869)
+++ 0001-Add-support-for-reproducible-builds.patch	2022-07-26 23:32:41 UTC (rev 1258870)
@@ -1,34 +0,0 @@
-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-07-26 23:23:31 UTC (rev 1258869)
+++ PKGBUILD	2022-07-26 23:32:41 UTC (rev 1258870)
@@ -13,16 +13,9 @@
 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=('2885fac111e65bd38dde8fc147a7e018ec897cc2374efeb1d51f864e74768e9f'
-            '3bab2d7e8b31b3b1333c072fa91e63e7f6eda8d5ea94f46f0d056de98eb7c228')
+sha256sums=('2885fac111e65bd38dde8fc147a7e018ec897cc2374efeb1d51f864e74768e9f')
 
-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"