From 86ed3cf6669f75d30f8b02e13d738c9e5c6d74b158c86b43ac4186cf2dd3ea78 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Sep 2024 15:44:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=206 --- ant-antlr.changes | 7 +++++++ ant-junit.changes | 7 +++++++ ant-junit5.changes | 7 +++++++ ant.changes | 7 +++++++ reproducible-jar-mtime.patch | 4 ++-- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 0fa4487..e5de69d 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 17 15:42:27 UTC 2024 - Fridrich Strba + +- Modified patch: + * reproducible-jar-mtime.patch + + try different approach to get bit-reproducible builds + ------------------------------------------------------------------- Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba diff --git a/ant-junit.changes b/ant-junit.changes index 0fa4487..e5de69d 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 17 15:42:27 UTC 2024 - Fridrich Strba + +- Modified patch: + * reproducible-jar-mtime.patch + + try different approach to get bit-reproducible builds + ------------------------------------------------------------------- Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba diff --git a/ant-junit5.changes b/ant-junit5.changes index 0fa4487..e5de69d 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 17 15:42:27 UTC 2024 - Fridrich Strba + +- Modified patch: + * reproducible-jar-mtime.patch + + try different approach to get bit-reproducible builds + ------------------------------------------------------------------- Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba diff --git a/ant.changes b/ant.changes index 0fa4487..e5de69d 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 17 15:42:27 UTC 2024 - Fridrich Strba + +- Modified patch: + * reproducible-jar-mtime.patch + + try different approach to get bit-reproducible builds + ------------------------------------------------------------------- Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba diff --git a/reproducible-jar-mtime.patch b/reproducible-jar-mtime.patch index 84572f3..12c5563 100644 --- a/reproducible-jar-mtime.patch +++ b/reproducible-jar-mtime.patch @@ -54,7 +54,7 @@ } } --- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-09-17 17:05:56.243025784 +0200 -+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-09-17 17:22:09.676446716 +0200 ++++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-09-17 17:30:54.736814738 +0200 @@ -682,6 +682,7 @@ "Failed to create missing parent directory for %s", zipFile); @@ -92,7 +92,7 @@ final ZipEntry ze = new ZipEntry(vPath); + if ( System.getenv("SOURCE_DATE_EPOCH") != null && fixedModTime == null) { + fixedModTime = System.getenv("SOURCE_DATE_EPOCH"); -+ modTimeMillis = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); ++ modTimeMillis = 1000 * Long.parseLong(fixedModTime); + } ze.setTime(fixedModTime != null ? modTimeMillis : lastModified); ze.setMethod(doCompress ? ZipEntry.DEFLATED : ZipEntry.STORED);