From 75ad56cab72d0390c826a7ed3c801e7bebd29da15eb50768c46b8b423321101d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 17 Jul 2024 07:30:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=143 --- ...lds-constant-timestamp-for-pom.prope.patch | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch b/0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch index 9c8510d..646cc50 100644 --- a/0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch +++ b/0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch @@ -1,34 +1,36 @@ -From 675aa30a8a763e1a964282937267a63f2594a7e2 Mon Sep 17 00:00:00 2001 +From 1f3c0d52b1e0feb42a48aa8ac8de4f3b37465e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 16 Jul 2024 06:56:39 +0200 Subject: [PATCH 8/8] Reproducible builds: constant timestamp for pom.properties --- - java-utils/maven_depmap.py | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + java-utils/maven_depmap.py | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py -index 4bfb877d..40cedd34 100644 +index 4bfb877d..74860baf 100644 --- a/java-utils/maven_depmap.py +++ b/java-utils/maven_depmap.py -@@ -43,8 +43,9 @@ import sys +@@ -43,7 +43,8 @@ import sys from os.path import basename, dirname import zipfile -from time import gmtime, strftime +import time ++import datetime from copy import deepcopy -+from datetime import datetime from javapackages.maven.pom import POM - from javapackages.metadata.artifact import MetadataArtifact -@@ -172,7 +173,13 @@ def append_if_missing(archive_name, file_name, file_contents): +@@ -172,7 +173,16 @@ def append_if_missing(archive_name, file_name, file_contents): archive = zipfile.ZipFile(archive_name, 'a') try: if file_name not in archive.namelist(): - archive.writestr(file_name, file_contents) -+ date_time = datetime.fromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).timetuple() ++ date_time = datetime.datetime.fromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time())), ++ tz=datetime.timezone.utc, ++ ).timetuple() + if date_time[0] < 1980: + date_time = (1980, 1, 1, 0, 0, 0) + elif date_time[0] > 2107: