From d19ef10d218ded5083ee148f35b2798a19019e9afb349e9d2e03a9a39980f919 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 16 Jul 2024 16:36:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=193

---
 reproducible-jar-mtime.patch | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/reproducible-jar-mtime.patch b/reproducible-jar-mtime.patch
index b4df609..94fe80c 100644
--- a/reproducible-jar-mtime.patch
+++ b/reproducible-jar-mtime.patch
@@ -1,5 +1,5 @@
---- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java	2024-07-16 13:38:38.336428941 +0200
-+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java	2024-07-16 14:33:49.541982462 +0200
+--- apache-ant-1.10.14.orig/src/main/org/apache/tools/ant/taskdefs/Jar.java	2024-07-16 14:41:00.996055227 +0200
++++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java	2024-07-16 14:52:07.583866195 +0200
 @@ -450,6 +450,13 @@
          serviceList.add(service);
      }
@@ -41,8 +41,8 @@
                            null, ZipFileSet.DEFAULT_FILE_MODE);
          }
      }
---- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java	2024-07-16 13:38:38.343095619 +0200
-+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java	2024-07-16 14:33:59.575332992 +0200
+--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java	2024-07-16 14:41:00.999388566 +0200
++++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java	2024-07-16 15:07:39.458825011 +0200
 @@ -1669,6 +1669,13 @@
              extra);
      }
@@ -66,3 +66,16 @@
              }
              ze.setSize(0);
              ze.setMethod(ZipEntry.STORED);
+@@ -1794,7 +1801,11 @@
+ 
+         if (!skipWriting) {
+             final ZipEntry ze = new ZipEntry(vPath);
+-            ze.setTime(fixedModTime != null ? modTimeMillis : lastModified);
++            long newLastModified = lastModified;
++            if ( System.getenv("SOURCE_DATE_EPOCH") != null ) {
++                newLastModified = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"));
++            }
++            ze.setTime(fixedModTime != null ? modTimeMillis : newLastModified);
+             ze.setMethod(doCompress ? ZipEntry.DEFLATED : ZipEntry.STORED);
+             // if the input stream doesn't support mark/reset ability, we wrap it in a
+             // stream that adds that support.