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-03-19 16:16:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Sun Mar 19 16:16:18 2023 rev:23 rq:1072660 version:1.8.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2023-02-16 21:09:57.380259637 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.31432/product-builder-plugin-Tumbleweed.changes
2023-03-19 16:16:39.611345952 +0100
@@ -1,0 +2,8 @@
+Thu Mar 16 17:29:47 CET 2023 - r...@suse.de
+
+- 1.8.3
+ * rerun generate_sbom for full media on the combined trees
+ * handle full media like pool media (which it contains)
+ (bsc#1209384)
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.8.2.obscpio
New:
----
product-builder-plugins-1.8.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.kTOINS/_old 2023-03-19 16:16:40.199348811 +0100
+++ /var/tmp/diff_new_pack.kTOINS/_new 2023-03-19 16:16:40.203348830 +0100
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.8.2
+Version: 1.8.3
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
++++++ _service ++++++
--- /var/tmp/diff_new_pack.kTOINS/_old 2023-03-19 16:16:40.239349005 +0100
+++ /var/tmp/diff_new_pack.kTOINS/_new 2023-03-19 16:16:40.243349025 +0100
@@ -5,8 +5,8 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="version">1.8.2</param>
- <param name="revision">1.8.2</param>
+ <param name="version">1.8.3</param>
+ <param name="revision">1.8.3</param>
</service>
<service mode="manual" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.8.2.obscpio ->
product-builder-plugins-1.8.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.8.2/KIWIBasePlugin.pm
new/product-builder-plugins-1.8.3/KIWIBasePlugin.pm
--- old/product-builder-plugins-1.8.2/KIWIBasePlugin.pm 2023-02-15
14:10:30.000000000 +0100
+++ new/product-builder-plugins-1.8.3/KIWIBasePlugin.pm 2023-03-16
17:18:25.000000000 +0100
@@ -215,7 +215,7 @@
my @paths = values(%{$basesubdirs});
@paths = grep { $_ =~ /[^0]$/x } @paths; # remove Media0
my %path = map { $_ => 1 } @paths;
- if($flavor =~ m{ftp}i || $flavor =~ m{pool}i) {
+ if($flavor =~ m{ftp}i || $flavor =~ m{pool}i || $flavor =~ m{full}i) {
# 1: FTP tree, all subdirs get a separate call.
my @d = sort(keys(%path));
foreach(@d) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.8.2/KIWIPackagesDVDPlugin.pm
new/product-builder-plugins-1.8.3/KIWIPackagesDVDPlugin.pm
--- old/product-builder-plugins-1.8.2/KIWIPackagesDVDPlugin.pm 2023-02-15
14:10:30.000000000 +0100
+++ new/product-builder-plugins-1.8.3/KIWIPackagesDVDPlugin.pm 2023-03-16
17:18:25.000000000 +0100
@@ -93,6 +93,41 @@
# drop main repodata on on fedora
system("rm -rf $dir/repodata") if -e "$dir/.discinfo";
+
+ # create SBOM data, if the build tool is available
+ if (-x "/usr/lib/build/generate_sbom") {
+ # SPDX
+ 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;
+ my $cmd = "/usr/lib/build/generate_sbom $spdx_distro --product $dir
> $dir.spdx.json";
+ my $call = $this -> callCmd($cmd);
+ my $status = $call->[0];
+ my $out = join("\n",@{$call->[1]});
+ $this->logMsg("I", "Called $cmd exit status: <$status> output:
$out");
+ return 1 if $status;
+
+ # CycloneDX
+ $cmd = "/usr/lib/build/generate_sbom --format cyclonedx --product
$dir > $dir.cdx.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.kTOINS/_old 2023-03-19 16:16:40.363349609 +0100
+++ /var/tmp/diff_new_pack.kTOINS/_new 2023-03-19 16:16:40.367349627 +0100
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.8.2
-mtime: 1676466630
-commit: 0ffe995660daddbe8b0c3226fb7ca1ce2cafd78c
+version: 1.8.3
+mtime: 1678983505
+commit: 77122bebc1b35e0706467f625e023d8de1882995
