Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eclipse for openSUSE:Factory checked in at 2023-09-20 13:30:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse (Old) and /work/SRC/openSUSE:Factory/.eclipse.new.16627 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse" Wed Sep 20 13:30:43 2023 rev:22 rq:1112366 version:4.15 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse/eclipse.changes 2023-09-11 21:25:31.236514115 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse.new.16627/eclipse.changes 2023-09-20 13:34:31.082099057 +0200 @@ -1,0 +2,8 @@ +Tue Sep 19 19:03:22 UTC 2023 - Fridrich Strba <[email protected]> + +- Added patch: + * reproducible-p2_timestamp.patch + + make the p2.timestamp in artifacts.xml file correspond to + SOURCE_DATE_EPOCH environmental variable if it is set + +------------------------------------------------------------------- New: ---- reproducible-p2_timestamp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse.spec ++++++ --- /var/tmp/diff_new_pack.lTiQRi/_old 2023-09-20 13:34:35.262248813 +0200 +++ /var/tmp/diff_new_pack.lTiQRi/_new 2023-09-20 13:34:35.266248957 +0200 @@ -120,6 +120,7 @@ # PATCH-FIX-UPSTREAM bsc#1183728 CVE-2020-27225 Help Subsystem does not authenticate active help requests Patch35: eclipse-CVE-2020-27225.patch Patch36: eclipse-ant.patch +Patch37: reproducible-p2_timestamp.patch BuildRequires: ant >= 1.10.5 BuildRequires: ant-antlr BuildRequires: ant-apache-bcel @@ -531,6 +532,7 @@ %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 # Extend the objectweb-asm requirements sed -i -e 's/org\.objectweb\.asm\.tree;bundle-version="\[6\.0\.0,8\.0\.0)"/org\.objectweb\.asm\.tree;bundle-version="\[6\.0\.0,10\.0\.0)"/g' \ @@ -810,6 +812,7 @@ # Qualifier generated from last modification time of source tarball QUALIFIER=$(date -u -d"$(stat --format=%%y %{SOURCE0})" +v%%Y%%m%%d-%%H%%M) %{mvn_build} -j -f -- -e -DforceContextQualifier=$QUALIFIER \ + -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ %if %{with bootstrap} -P !api-generation,!build-docs \ %endif ++++++ reproducible-p2_timestamp.patch ++++++ diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java --- eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java 2023-09-19 09:52:43.226140542 +0200 +++ eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java 2023-09-19 10:01:45.193553381 +0200 @@ -482,7 +482,7 @@ os = new JarOutputStream(new FileOutputStream(jarFile)); ((JarOutputStream) os).putNextEntry(new JarEntry(new Path(artifactsFile.getAbsolutePath()).lastSegment())); } - super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis())); + super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.getenv("SOURCE_DATE_EPOCH") != null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) : System.currentTimeMillis())); new CompositeRepositoryIO().write(toState(), os, PI_REPOSITORY_TYPE); } catch (IOException e) { LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, getLocation()), e)); diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java --- eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java 2023-09-19 09:52:43.226140542 +0200 +++ eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java 2023-09-19 10:01:27.826755022 +0200 @@ -1314,7 +1314,7 @@ os = new JarOutputStream(new FileOutputStream(jarFile)); ((JarOutputStream) os).putNextEntry(new JarEntry(new Path(artifactsFile.getAbsolutePath()).lastSegment())); } - super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()), new NullProgressMonitor()); + super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.getenv("SOURCE_DATE_EPOCH") != null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) : System.currentTimeMillis()), new NullProgressMonitor()); new SimpleArtifactRepositoryIO(getProvisioningAgent()).write(this, os); } catch (IOException e) { // TODO proper exception handling diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java --- eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java 2023-09-19 09:52:43.236140615 +0200 +++ eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java 2023-09-19 10:00:57.393190912 +0200 @@ -312,7 +312,7 @@ output = new JarOutputStream(new FileOutputStream(jarFile)); ((JarOutputStream) output).putNextEntry(jarEntry); } - super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis())); + super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.getenv("SOURCE_DATE_EPOCH") != null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) : System.currentTimeMillis())); new CompositeRepositoryIO().write(toState(), output, PI_REPOSITORY_TYPE); } catch (IOException e) { LogHelper.log(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, getLocation()), e)); diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java --- eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java 2023-09-19 09:52:43.236140615 +0200 +++ eclipse-platform-sources-I20200305-0155/rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java 2023-09-19 10:02:58.610776767 +0200 @@ -279,7 +279,7 @@ output = new JarOutputStream(new FileOutputStream(jarFile)); ((JarOutputStream) output).putNextEntry(jarEntry); } - super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()), new NullProgressMonitor()); + super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.getenv("SOURCE_DATE_EPOCH") != null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) : System.currentTimeMillis()), new NullProgressMonitor()); new MetadataRepositoryIO(getProvisioningAgent()).write(this, output); } catch (IOException e) { LogHelper.log(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_WRITE, "Error saving metadata repository: " + getLocation(), e)); //$NON-NLS-1$
