Fridrich Strba 2024-07-16 16:36:15 +00:00 committed by Git OBS Bridge
parent 90be3c4a86
commit d19ef10d21

View File

@ -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.