pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=207

Browse Source
This commit is contained in:
Fridrich Strba 2024-09-18 09:14:32 +00:00 committed by Git OBS Bridge
parent 86ed3cf666
commit 9375dfcfe5
1 changed files with 13 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
reproducible-jar-mtime.patch
View File

@ -1,111 +1,17 @@
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.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-18 09:25:56.006778808 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java 2024-09-17 17:06:13.903147829 +0200 +++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-09-18 11:06:39.405766871 +0200
@@ -128,6 +128,9 @@ @@ -846,6 +846,14 @@
return millis; archiveType);
} }
if ("now".equalsIgnoreCase(dateTime)) {
+ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) {
+ return 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"));
+ }
return System.currentTimeMillis();
}
DateFormat df = dfFactory.getPrimaryFormat();
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java 2024-09-17 17:05:56.239692428 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java 2024-09-17 17:06:13.903147829 +0200
@@ -450,6 +450,13 @@
serviceList.add(service);
}
+ private long currentTimeMillisOrSourceDateEpoch() { + if (fixedModTime == null) {
+ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) { + String sde = System.getenv("SOURCE_DATE_EPOCH");
+ return 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); + if (sde != null) {
+ // the DateUtils.parseLenientDateTime requires miliseconds
+ fixedModTime = sde + "000";
+ }
+ } + }
+ return System.currentTimeMillis();
+ }
+ +
/** if (fixedModTime != null) {
* Write SPI Information to JAR try {
*/ modTimeMillis = DateUtils.parseLenientDateTime(fixedModTime).getTime();
@@ -459,7 +466,7 @@
//stolen from writeManifest
super.zipFile(is, zOut,
"META-INF/services/" + service.getType(),
- System.currentTimeMillis(), null,
+ currentTimeMillisOrSourceDateEpoch(), null,
ZipFileSet.DEFAULT_FILE_MODE);
}
}
@@ -579,7 +586,7 @@
new ByteArrayInputStream(baos.toByteArray());
try {
super.zipFile(bais, zOut, MANIFEST_NAME,
- System.currentTimeMillis(), null,
+ currentTimeMillisOrSourceDateEpoch(), null,
ZipFileSet.DEFAULT_FILE_MODE);
} finally {
// not really required
@@ -656,7 +663,7 @@
writer.close();
try (ByteArrayInputStream bais =
new ByteArrayInputStream(baos.toByteArray())) {
- super.zipFile(bais, zOut, INDEX_NAME, System.currentTimeMillis(),
+ super.zipFile(bais, zOut, INDEX_NAME, currentTimeMillisOrSourceDateEpoch(),
null, ZipFileSet.DEFAULT_FILE_MODE);
}
}
--- 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:30:54.736814738 +0200
@@ -682,6 +682,7 @@
"Failed to create missing parent directory for %s",
zipFile);
}
+ parent.setLastModified(currentTimeMillisOrSourceDateEpoch());
updatedFile = true;
if (!zipFile.exists() && state.isWithoutAnyResources()) {
@@ -1669,6 +1670,13 @@
extra);
}
+ private long currentTimeMillisOrSourceDateEpoch() {
+ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) {
+ return 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"));
+ }
+ return System.currentTimeMillis();
+ }
+
/**
* Add a directory to the zip stream.
* @param dir the directory to add to the archive
@@ -1708,7 +1716,7 @@
} else if (dir != null && dir.isExists()) {
ze.setTime(dir.getLastModified() + millisToAdd);
} else {
- ze.setTime(System.currentTimeMillis() + millisToAdd);
+ ze.setTime(currentTimeMillisOrSourceDateEpoch() + millisToAdd);
}
ze.setSize(0);
ze.setMethod(ZipEntry.STORED);
@@ -1794,6 +1802,10 @@
if (!skipWriting) {
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(fixedModTime);
+ }
ze.setTime(fixedModTime != null ? modTimeMillis : lastModified);
ze.setMethod(doCompress ? ZipEntry.DEFLATED : ZipEntry.STORED);
// if the input stream doesn't support mark/reset ability, we wrap it in a
--- apache-ant-1.10.14/src/main/org/apache/tools/zip/ZipOutputStream.java 2024-09-17 17:05:56.276359347 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/zip/ZipOutputStream.java 2024-09-17 17:06:13.903147829 +0200
@@ -791,6 +791,9 @@
if (entry.getTime() == -1) { // not specified
entry.setTime(System.currentTimeMillis());
+ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) {
+ entry.setTime(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
+ }
}
}