Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aqute-bnd for openSUSE:Factory
checked in at 2024-09-24 17:32:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old)
and /work/SRC/openSUSE:Factory/.aqute-bnd.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqute-bnd"
Tue Sep 24 17:32:39 2024 rev:13 rq:1202685 version:6.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2024-09-10
21:14:33.101333220 +0200
+++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/aqute-bnd.changes
2024-09-24 17:32:54.968174664 +0200
@@ -1,0 +2,10 @@
+Mon Sep 23 09:26:03 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use SOURCE_DATE_EPOCH for reproducible builds
+- Added patch:
+ * 0006-Set-reproducible-build-from-environment.patch
+ + SOURCE_DATE_EPOCH environmental variable triggers reproducible
+ use of the bnd-maven-plugin if it is not requested already
+ using the project.build.outputTimestamp option.
+
+-------------------------------------------------------------------
bnd-maven-plugin.changes: same change
New:
----
0006-Set-reproducible-build-from-environment.patch
BETA DEBUG BEGIN:
New:/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/aqute-bnd.changes-- Added
patch:
/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/aqute-bnd.changes: *
0006-Set-reproducible-build-from-environment.patch
/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/aqute-bnd.changes- +
SOURCE_DATE_EPOCH environmental variable triggers reproducible
--
/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/bnd-maven-plugin.changes--
Added patch:
/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/bnd-maven-plugin.changes: *
0006-Set-reproducible-build-from-environment.patch
/work/SRC/openSUSE:Factory/.aqute-bnd.new.29891/bnd-maven-plugin.changes- +
SOURCE_DATE_EPOCH environmental variable triggers reproducible
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aqute-bnd.spec ++++++
--- /var/tmp/diff_new_pack.sESBgh/_old 2024-09-24 17:32:55.916214352 +0200
+++ /var/tmp/diff_new_pack.sESBgh/_new 2024-09-24 17:32:55.920214520 +0200
@@ -38,6 +38,7 @@
Patch3: 0003-Remove-unmet-dependencies.patch
Patch4: 0004-reproducible-timestamps.patch
Patch5: 0005-reproducible-packages-list.patch
+Patch6: 0006-Set-reproducible-build-from-environment.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local >= 6
@@ -91,6 +92,7 @@
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
+%patch -P 6 -p1
# the commands pull in more dependencies than we want (felix-resolver, jetty)
rm
biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java
++++++ bnd-maven-plugin.spec ++++++
--- /var/tmp/diff_new_pack.sESBgh/_old 2024-09-24 17:32:55.968216530 +0200
+++ /var/tmp/diff_new_pack.sESBgh/_new 2024-09-24 17:32:55.972216697 +0200
@@ -30,6 +30,7 @@
Patch3: 0003-Remove-unmet-dependencies.patch
Patch4: 0004-reproducible-timestamps.patch
Patch5: 0005-reproducible-packages-list.patch
+Patch6: 0006-Set-reproducible-build-from-environment.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) >= %{version}
@@ -56,6 +57,7 @@
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
+%patch -P 6 -p1
cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration
maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions
maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
@@ -83,7 +85,9 @@
%build
pushd maven
-%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8
+%{mvn_build} -f -- \
+ -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date
+%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
+ -Dproject.build.sourceEncoding=UTF-8 -Dsource=8
popd
%install
++++++ 0006-Set-reproducible-build-from-environment.patch ++++++
>From e2a396594fc53b2e839a5b0e017a9f6ed8669d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Mon, 23 Sep 2024 11:20:44 +0200
Subject: [PATCH 6/6] Set reproducible build from environment
---
.../aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git
a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java
b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java
index b6458080..4c58d632 100644
---
a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java
+++
b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java
@@ -363,6 +363,13 @@ public abstract class AbstractBndMavenPlugin extends
AbstractMojo {
// no timestamp configured (1 character
configuration is useful
// to override a full value during pom
inheritance)
&& ((outputTimestamp.length() > 1) ||
Character.isDigit(outputTimestamp.charAt(0)));
+ if (!isReproducible) {
+ String sde = System.getenv("SOURCE_DATE_EPOCH");
+ if (sde != null) {
+ outputTimestamp = sde;
+ isReproducible = true;
+ }
+ }
if (isReproducible) {
builder.setProperty(Constants.REPRODUCIBLE,
outputTimestamp);
if
(builder.getProperty(Constants.NOEXTRAHEADERS) == null) {
--
2.46.1
