Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Factory checked in at 2023-02-10 14:33:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.1848 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Fri Feb 10 14:33:58 2023 rev:21 rq:1063829 version:1.8.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2023-02-03 14:52:02.143716707 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.1848/product-builder-plugin-Tumbleweed.changes
2023-02-10 14:34:03.257466615 +0100
@@ -1,0 +2,6 @@
+Wed Feb 8 11:59:30 UTC 2023 - Adrian Schröter <[email protected]>
+
+- 1.8.1
+ * make use of SPDX SBOM generation tool
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.7.0.obscpio
New:
----
product-builder-plugins-1.8.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.vyYbTV/_old 2023-02-10 14:34:03.741469508 +0100
+++ /var/tmp/diff_new_pack.vyYbTV/_new 2023-02-10 14:34:03.749469556 +0100
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.7.0
+Version: 1.8.1
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
@@ -30,6 +30,7 @@
Requires: product-builder
Requires: perl(YAML::XS)
Supplements: product-builder
+Requires: build >= 20230208
%if 0%{?suse_version}
Requires: instsource-susedata
Requires: mkdosfs
++++++ _service ++++++
--- /var/tmp/diff_new_pack.vyYbTV/_old 2023-02-10 14:34:03.801469867 +0100
+++ /var/tmp/diff_new_pack.vyYbTV/_new 2023-02-10 14:34:03.805469890 +0100
@@ -5,8 +5,8 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="version">1.7.0</param>
- <param name="revision">1.7.0</param>
+ <param name="version">1.8.1</param>
+ <param name="revision">1.8.1</param>
</service>
<service mode="manual" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.7.0.obscpio ->
product-builder-plugins-1.8.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.7.0/KIWIDescrPlugin.pm
new/product-builder-plugins-1.8.1/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.7.0/KIWIDescrPlugin.pm 2023-01-18
11:14:52.000000000 +0100
+++ new/product-builder-plugins-1.8.1/KIWIDescrPlugin.pm 2023-02-08
14:13:44.000000000 +0100
@@ -355,6 +355,31 @@
$out = join("\n",@{$call->[1]});
$this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
return 1 if $status;
+
+ # create SBOM data, if the build tool is available
+ if (-x "/usr/lib/build/generate_sbom") {
+ my $spdx_distro =
$this->collect()->productData()->getInfo("PURL_DISTRO");
+ if (!$spdx_distro) {
+ # some guessing for our old distros to avoid further changes there
+ my $vendor = $this->collect()->productData()->getInfo("VENDOR");
+ my $distname = $this->collect()->productData()->getVar("DISTNAME");
+ my $version = $this->collect()->productData()->getVar("VERSION");
+ if ($vendor eq 'openSUSE') {
+ $spdx_distro = "opensuse-leap-$version" if $distname eq 'Leap';
+ $spdx_distro = "opensuse-tumbleweed" if $distname eq 'openSUSE';
+ }
+ if ($vendor eq 'SUSE') {
+ $spdx_distro = "sles-$version" if $distname eq 'SLES';
+ }
+ }
+ $spdx_distro = "--distro $spdx_distro" if $spdx_distro;
+ $cmd = "/usr/lib/build/generate_spdx_sbom --product $spdx_distro
$masterpath > $masterpath.sbom.json";
+ $call = $this -> callCmd($cmd);
+ $status = $call->[0];
+ $out = join("\n",@{$call->[1]});
+ $this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
+ return 1 if $status;
+ }
}
return 0;
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.vyYbTV/_old 2023-02-10 14:34:03.961470823 +0100
+++ /var/tmp/diff_new_pack.vyYbTV/_new 2023-02-10 14:34:03.965470846 +0100
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.7.0
-mtime: 1674036892
-commit: c95fe9dc0df1d003dcef734b0b252074e1b0d04a
+version: 1.8.1
+mtime: 1675862024
+commit: 700714724c14322e2fdedab96c8b87eafd15acc5
