From 20f579c5e6f09850818dbf6cee62551724d6f4bb35e45b5e7e28ba7e149b0491 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 08:43:30 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=72 --- UUID.patch | 31 +++++++++++++++++++++++++++++++ xmvn-connector.spec | 1 + xmvn-mojo.spec | 1 + xmvn-parent.spec | 1 + xmvn-tools.spec | 1 + 5 files changed, 35 insertions(+) create mode 100644 UUID.patch diff --git a/UUID.patch b/UUID.patch new file mode 100644 index 0000000..77897aa --- /dev/null +++ b/UUID.patch @@ -0,0 +1,31 @@ +--- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:18:52.523347251 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:40:07.518257625 +0200 +@@ -185,7 +185,7 @@ + am.setNamespace( repo.getNamespace() ); + + // UUID +- am.setUuid( UUID.randomUUID().toString() ); ++ am.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + + // Compat version + for ( String version : rule.getVersions() ) +--- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:18:52.523347251 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:40:32.748290757 +0200 +@@ -58,7 +58,7 @@ + super( id ); + this.basePackageName = basePackageName; + this.metadataDir = metadataDir; +- metadata.setUuid( UUID.randomUUID().toString() ); ++ metadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + } + + /** +@@ -71,7 +71,7 @@ + private PackageMetadata getSplitMetadata( String namespace ) + { + PackageMetadata splitMetadata = new PackageMetadata(); +- splitMetadata.setUuid( UUID.randomUUID().toString() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); + splitMetadata.setProperties( metadata.getProperties() ); + List allArtifacts = metadata.getArtifacts(); + List splitArtifacts = diff --git a/xmvn-connector.spec b/xmvn-connector.spec index e574e41..f2d977a 100644 --- a/xmvn-connector.spec +++ b/xmvn-connector.spec @@ -28,6 +28,7 @@ Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz +Patch0: UUID.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index 1e29a62..b61ff2d 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -26,6 +26,7 @@ License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz +Patch0: UUID.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: fdupes diff --git a/xmvn-parent.spec b/xmvn-parent.spec index 1699351..1f5eb56 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -26,6 +26,7 @@ License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz +Patch0: UUID.patch BuildRequires: javapackages-local BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) diff --git a/xmvn-tools.spec b/xmvn-tools.spec index fc0fddd..c1858e2 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -27,6 +27,7 @@ Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz +Patch0: UUID.patch BuildRequires: ant BuildRequires: apache-commons-compress BuildRequires: atinject From e24eda00dc24a31410067bcd6a62990c35dd7a1f706b272c80cc49366ed140d1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 08:51:37 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=73 --- UUID.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UUID.patch b/UUID.patch index 77897aa..a957631 100644 --- a/UUID.patch +++ b/UUID.patch @@ -5,7 +5,7 @@ // UUID - am.setUuid( UUID.randomUUID().toString() ); -+ am.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ am.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); // Compat version for ( String version : rule.getVersions() ) @@ -16,7 +16,7 @@ this.basePackageName = basePackageName; this.metadataDir = metadataDir; - metadata.setUuid( UUID.randomUUID().toString() ); -+ metadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ metadata.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); } /** @@ -25,7 +25,7 @@ { PackageMetadata splitMetadata = new PackageMetadata(); - splitMetadata.setUuid( UUID.randomUUID().toString() ); -+ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getEnv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); splitMetadata.setProperties( metadata.getProperties() ); List allArtifacts = metadata.getArtifacts(); List splitArtifacts = From 00e331a7440cfd992cf6b98ca758e58f448db9a59e7eb23cec941b906085bb6f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 09:25:13 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=74 --- UUID.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UUID.patch b/UUID.patch index a957631..0090c2a 100644 --- a/UUID.patch +++ b/UUID.patch @@ -1,16 +1,16 @@ --- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:18:52.523347251 +0200 -+++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 10:40:07.518257625 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java 2023-07-24 11:24:03.362142115 +0200 @@ -185,7 +185,7 @@ am.setNamespace( repo.getNamespace() ); // UUID - am.setUuid( UUID.randomUUID().toString() ); -+ am.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ am.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+repo.getNamespace()+artifact.toString()).getBytes()).toString() ); // Compat version for ( String version : rule.getVersions() ) --- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:18:52.523347251 +0200 -+++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:40:32.748290757 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 11:24:48.612204693 +0200 @@ -58,7 +58,7 @@ super( id ); this.basePackageName = basePackageName; @@ -25,7 +25,7 @@ { PackageMetadata splitMetadata = new PackageMetadata(); - splitMetadata.setUuid( UUID.randomUUID().toString() ); -+ splitMetadata.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ splitMetadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+namespace).getBytes()).toString() ); splitMetadata.setProperties( metadata.getProperties() ); List allArtifacts = metadata.getArtifacts(); List splitArtifacts = From 0e2f6d4f3d50aa61f16d043dec666a523df251b2de5b496ab9b47e39eeb123cb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 09:59:34 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=75 --- UUID.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UUID.patch b/UUID.patch index 0090c2a..badafca 100644 --- a/UUID.patch +++ b/UUID.patch @@ -10,13 +10,13 @@ // Compat version for ( String version : rule.getVersions() ) --- xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 10:18:52.523347251 +0200 -+++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 11:24:48.612204693 +0200 ++++ xmvn-4.2.0/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/JavaPackage.java 2023-07-24 11:56:47.481600604 +0200 @@ -58,7 +58,7 @@ super( id ); this.basePackageName = basePackageName; this.metadataDir = metadataDir; - metadata.setUuid( UUID.randomUUID().toString() ); -+ metadata.setUuid( UUID.nameUUIDFromBytes(System.getenv("SOURCE_DATE_EPOCH").getBytes()).toString() ); ++ metadata.setUuid( UUID.nameUUIDFromBytes((System.getenv("SOURCE_DATE_EPOCH")+basePackageName).getBytes()).toString() ); } /** From 0c4b8f58afd706b3d81f9be2dceec64b93ebfcd950f28ee07ceb766b6760667d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 24 Jul 2023 19:24:15 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=76 --- xmvn-connector.changes | 8 ++++++++ xmvn-mojo.changes | 8 ++++++++ xmvn-parent.changes | 8 ++++++++ xmvn-tools.changes | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/xmvn-connector.changes b/xmvn-connector.changes index ba74e0e..76528a2 100644 --- a/xmvn-connector.changes +++ b/xmvn-connector.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba + +- Added patch: + * UUID.patch + + avoid generating random UUIDs, which makes reproducible build + impossible (bsc#1162112) + ------------------------------------------------------------------- Wed May 3 09:26:56 UTC 2023 - Fridrich Strba diff --git a/xmvn-mojo.changes b/xmvn-mojo.changes index 9160695..9b4e76e 100644 --- a/xmvn-mojo.changes +++ b/xmvn-mojo.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba + +- Added patch: + * UUID.patch + + avoid generating random UUIDs, which makes reproducible build + impossible (bsc#1162112) + ------------------------------------------------------------------- Wed May 3 09:26:56 UTC 2023 - Fridrich Strba diff --git a/xmvn-parent.changes b/xmvn-parent.changes index aee4937..5d759f7 100644 --- a/xmvn-parent.changes +++ b/xmvn-parent.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba + +- Added patch: + * UUID.patch + + avoid generating random UUIDs, which makes reproducible build + impossible (bsc#1162112) + ------------------------------------------------------------------- Wed May 3 09:26:56 UTC 2023 - Fridrich Strba diff --git a/xmvn-tools.changes b/xmvn-tools.changes index 0c33985..e7188bb 100644 --- a/xmvn-tools.changes +++ b/xmvn-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 24 19:21:09 UTC 2023 - Fridrich Strba + +- Added patch: + * UUID.patch + + avoid generating random UUIDs, which makes reproducible build + impossible (bsc#1162112) + ------------------------------------------------------------------- Wed May 3 09:26:56 UTC 2023 - Fridrich Strba