diff --git a/ant-antlr.changes b/ant-antlr.changes index 2ffdbb5..3e7f82b 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,10 +1,13 @@ ------------------------------------------------------------------- Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba -- Added patch: +- Added patches: * reproducible-jar-mtime.patch + make the modification times of files in a jar file reproducible + * reproducible-javadoc.patch + + make javadoc generation reproducible: don't generate + timestamps, and normalize locale and encoding ------------------------------------------------------------------- Sat May 4 00:54:38 UTC 2024 - Anton Shvetz diff --git a/ant-antlr.spec b/ant-antlr.spec index 2fed0bf..0aca471 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch # PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files Patch7: reproducible-propertyfile-task.patch Patch8: reproducible-jar-mtime.patch +Patch9: reproducible-javadoc.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 @@ -397,6 +398,7 @@ find -name \*.jar -print -delete %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 # clean jar files find . -name "*.jar" -print -delete diff --git a/ant-junit.changes b/ant-junit.changes index 2ffdbb5..3e7f82b 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,10 +1,13 @@ ------------------------------------------------------------------- Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba -- Added patch: +- Added patches: * reproducible-jar-mtime.patch + make the modification times of files in a jar file reproducible + * reproducible-javadoc.patch + + make javadoc generation reproducible: don't generate + timestamps, and normalize locale and encoding ------------------------------------------------------------------- Sat May 4 00:54:38 UTC 2024 - Anton Shvetz diff --git a/ant-junit.spec b/ant-junit.spec index 8689e40..f2b1b85 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch # PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files Patch7: reproducible-propertyfile-task.patch Patch8: reproducible-jar-mtime.patch +Patch9: reproducible-javadoc.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 @@ -397,6 +398,7 @@ find -name \*.jar -print -delete %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 # clean jar files find . -name "*.jar" -print -delete diff --git a/ant-junit5.changes b/ant-junit5.changes index 2ffdbb5..3e7f82b 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,10 +1,13 @@ ------------------------------------------------------------------- Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba -- Added patch: +- Added patches: * reproducible-jar-mtime.patch + make the modification times of files in a jar file reproducible + * reproducible-javadoc.patch + + make javadoc generation reproducible: don't generate + timestamps, and normalize locale and encoding ------------------------------------------------------------------- Sat May 4 00:54:38 UTC 2024 - Anton Shvetz diff --git a/ant-junit5.spec b/ant-junit5.spec index 717ab65..4ec9300 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch # PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files Patch7: reproducible-propertyfile-task.patch Patch8: reproducible-jar-mtime.patch +Patch9: reproducible-javadoc.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 @@ -397,6 +398,7 @@ find -name \*.jar -print -delete %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 # clean jar files find . -name "*.jar" -print -delete diff --git a/ant.changes b/ant.changes index 2ffdbb5..3e7f82b 100644 --- a/ant.changes +++ b/ant.changes @@ -1,10 +1,13 @@ ------------------------------------------------------------------- Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba -- Added patch: +- Added patches: * reproducible-jar-mtime.patch + make the modification times of files in a jar file reproducible + * reproducible-javadoc.patch + + make javadoc generation reproducible: don't generate + timestamps, and normalize locale and encoding ------------------------------------------------------------------- Sat May 4 00:54:38 UTC 2024 - Anton Shvetz diff --git a/ant.spec b/ant.spec index 41d34a6..7a3e57d 100644 --- a/ant.spec +++ b/ant.spec @@ -46,6 +46,7 @@ Patch6: apache-ant-xml-apis.patch # PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files Patch7: reproducible-propertyfile-task.patch Patch8: reproducible-jar-mtime.patch +Patch9: reproducible-javadoc.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 @@ -396,6 +397,7 @@ find -name \*.jar -print -delete %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 # clean jar files find . -name "*.jar" -print -delete diff --git a/reproducible-javadoc.patch b/reproducible-javadoc.patch new file mode 100644 index 0000000..578b25d --- /dev/null +++ b/reproducible-javadoc.patch @@ -0,0 +1,38 @@ +--- 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 @@ + */ + @Override + public void execute() throws BuildException { ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) { ++ java.util.List arguments = java.util.Arrays.asList(cmd.getCommandline()); ++ if (!arguments.contains("-locale")) { ++ setLocale("en"); ++ } ++ if (!arguments.contains("-encoding")) { ++ setEncoding("UTF-8"); ++ } ++ if (!arguments.contains("-notimestamp")) { ++ setNoTimestamp(true); ++ } ++ } ++ + checkTaskName(); + + final List packagesToDoc = new Vector<>();