rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

Accepting request 1193876 from Java:packages

Browse Source 
more reproducible changes

OBS-URL: https://build.opensuse.org/request/show/1193876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger 2024-08-15 07:57:38 +00:00 committed by Git OBS Bridge
commit fa45aab531
6 changed files with 78 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ant-antlr.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* reproducible-jar-mtime.patch
+ attempt more normalization of mtimes in jar files
* reproducible-javadoc.patch
+ fix the patch to work with custom doclets too
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>

9
ant-junit.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* reproducible-jar-mtime.patch
+ attempt more normalization of mtimes in jar files
* reproducible-javadoc.patch
+ fix the patch to work with custom doclets too
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>

9
ant-junit5.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* reproducible-jar-mtime.patch
+ attempt more normalization of mtimes in jar files
* reproducible-javadoc.patch
+ fix the patch to work with custom doclets too
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>

9
ant.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 13 14:43:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* reproducible-jar-mtime.patch
+ attempt more normalization of mtimes in jar files
* reproducible-javadoc.patch
+ fix the patch to work with custom doclets too
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>

32
reproducible-jar-mtime.patch
View File

@ -1,5 +1,17 @@
--- apache-ant-1.10.14/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
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java 2024-07-22 09:18:51.385562681 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java 2024-07-22 10:01:32.218061839 +0200
@@ -128,6 +128,9 @@
return millis;
}
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-07-22 09:18:51.382229324 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Jar.java 2024-07-22 09:19:09.242362668 +0200
@@ -450,6 +450,13 @@
serviceList.add(service);
}
@ -41,8 +53,8 @@
null, ZipFileSet.DEFAULT_FILE_MODE);
}
}
--- 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-17 14:27:00.917945219 +0200
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-07-22 09:18:51.385562681 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Zip.java 2024-07-22 09:19:09.242362668 +0200
@@ -682,6 +682,7 @@
"Failed to create missing parent directory for %s",
zipFile);
@ -87,3 +99,15 @@
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.
--- apache-ant-1.10.14/src/main/org/apache/tools/zip/ZipOutputStream.java 2024-07-22 09:18:51.405562831 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/zip/ZipOutputStream.java 2024-07-22 10:00:20.874193063 +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")));
+ }
}
}

36
reproducible-javadoc.patch
View File

@ -1,22 +1,6 @@
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-07-17 15:06:13.718343866 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-07-18 14:51:50.362329096 +0200
@@ -1297,6 +1297,15 @@
}
/**
+ * Control generation of timestamps.
+ *
+ * @param b if true, don't generate timestamps.
+ */
+ public void setNoTimestamp(final boolean b) {
+ addArgIf(b, "-notimestamp");
+ }
+
+ /**
* Create link to Javadoc output at the given URL.
*
* @return link argument to configure
@@ -1807,6 +1816,19 @@
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-08-13 16:34:16.694518372 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-08-13 16:36:49.825656246 +0200
@@ -1807,6 +1807,16 @@
*/
@Override
public void execute() throws BuildException {
@ -28,11 +12,19 @@
+ if (!arguments.contains("-encoding")) {
+ setEncoding("UTF-8");
+ }
+ if (!arguments.contains("-notimestamp")) {
+ setNoTimestamp(true);
+ }
+ }
+
checkTaskName();
final List<String> packagesToDoc = new Vector<>();
@@ -2013,6 +2023,10 @@
toExecute.createArgument().setValue("-author");
}
+ if (System.getenv("SOURCE_DATE_EPOCH") != null && doclet == null) {
+ toExecute.createArgument().setValue("-notimestamp");
+ }
+
if (doclet == null && destDir == null) {
throw new BuildException("destdir attribute must be set!");
}