From 437ef6518c36eba173d48155fd726728c9f829967c5b36b2b73eddd8d2b3f3c2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Sep 2023 11:15:46 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=8 --- java-21-openjdk.changes | 8 ++++++++ java-21-openjdk.spec | 2 ++ reproducible-properties.patch | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 reproducible-properties.patch diff --git a/java-21-openjdk.changes b/java-21-openjdk.changes index f83bb87..922e068 100644 --- a/java-21-openjdk.changes +++ b/java-21-openjdk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 21 11:14:41 UTC 2023 - Fridrich Strba + +- Added patch: + * reproducible-properties.patch + + use SOURCE_DATE_EPOCH for timestamp in properties files if + it is set + ------------------------------------------------------------------- Tue Sep 19 10:46:38 UTC 2023 - Fridrich Strba diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 1ca7dfc..9a06c9a 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -156,6 +156,7 @@ Patch5: multiple-pkcs11-library-init.patch Patch8: zero-ranges.patch # From icedtea: Increase default memory limits Patch10: memory-limits.patch +Patch11: reproducible-properties.patch # Fix use of unintialized memory in adlc parser Patch12: adlc-parser.patch # Fix: implicit-pointer-decl @@ -394,6 +395,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2* %patch5 -p1 %patch8 -p1 %patch10 -p1 +%patch11 -p1 %patch12 -p1 %patch13 -p1 diff --git a/reproducible-properties.patch b/reproducible-properties.patch new file mode 100644 index 0000000..1bc3d7c --- /dev/null +++ b/reproducible-properties.patch @@ -0,0 +1,11 @@ +--- a/src/java.base/share/classes/java/util/Properties.java ++++ b/src/java.base/share/classes/java/util/Properties.java +@@ -955,7 +955,7 @@ public class Properties extends Hashtable { + if (sysPropVal != null && !sysPropVal.isEmpty()) { + writeComments(bw, sysPropVal); + } else { +- bw.write("#" + new Date()); ++ bw.write("#" + (System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date()); + bw.newLine(); + } + } From 776a53d6e8c9d2357cb0258daf26330fb5c02f397bba1926edcfe24da6085201 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Sep 2023 12:23:49 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=9 --- reproducible-properties.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reproducible-properties.patch b/reproducible-properties.patch index 1bc3d7c..e5eb718 100644 --- a/reproducible-properties.patch +++ b/reproducible-properties.patch @@ -5,7 +5,7 @@ writeComments(bw, sysPropVal); } else { - bw.write("#" + new Date()); -+ bw.write("#" + (System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date()); ++ bw.write("#" + (System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date())); bw.newLine(); } }