Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-module-tools for
openSUSE:Factory checked in at 2021-10-26 20:13:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Tue Oct 26 20:13:28 2021 rev:49 rq:927057 version:16.0.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2021-10-08 00:05:51.509733784 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.1890/suse-module-tools.changes
2021-10-26 20:13:31.794004612 +0200
@@ -1,0 +2,15 @@
+Fri Oct 22 20:37:38 UTC 2021 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.13:
+ * fixup "rpm-script: fix bad exit status in OpenQA (bsc#1191922)"
+
+-------------------------------------------------------------------
+Fri Oct 22 13:12:38 UTC 2021 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.12:
+ * rpm-script: fix bad exit status in OpenQA (bsc#1191922)
+ * cert-script: Deal with existing $cert.delete file (bsc#1191804).
+ * cert-script: Ignore kernel keyring for kernel certificates (bsc#1191480).
+ * cert-script: Only print mokutil output in verbose mode.
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.11.obscpio
New:
----
suse-module-tools-16.0.13.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.Dgi2dJ/_old 2021-10-26 20:13:32.358004910 +0200
+++ /var/tmp/diff_new_pack.Dgi2dJ/_new 2021-10-26 20:13:32.362004912 +0200
@@ -45,7 +45,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.11
+Version: 16.0.13
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Dgi2dJ/_old 2021-10-26 20:13:32.398004931 +0200
+++ /var/tmp/diff_new_pack.Dgi2dJ/_new 2021-10-26 20:13:32.402004933 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">a7078cf368e038ee81cf07c7be27609084a05b5d</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">78e2a3360cd9727d372174e1ced7f4ad3af01eb8</param></service></servicedata>
\ No newline at end of file
++++++ suse-module-tools-16.0.11.obscpio -> suse-module-tools-16.0.13.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.11/kernel-scriptlets/cert-script
new/suse-module-tools-16.0.13/kernel-scriptlets/cert-script
--- old/suse-module-tools-16.0.11/kernel-scriptlets/cert-script 2021-10-04
16:23:49.000000000 +0200
+++ new/suse-module-tools-16.0.13/kernel-scriptlets/cert-script 2021-10-22
22:30:08.000000000 +0200
@@ -21,9 +21,19 @@
shift
done
+is_efi () {
+ local msg rc=0
+
# The below statement fails if mokutil isn't installed or UEFI is unsupported.
# It doesn't fail if UEFI is available but secure boot is off.
-if ! mokutil --sb-state 2>/dev/null; then
+ msg="$(mokutil --sb-state 2>&1)" || rc=$?
+
+ [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || echo "$msg"
+
+ return $rc
+}
+
+if ! is_efi; then
[ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || \
echo "$0: system doesn't support UEFI, skipping certificate handling"
>&2
exit 0
@@ -41,16 +51,19 @@
pre)
;;
post)
+ MOK_ARGS=""
# Only apply CA check on the kernel package certs (bsc#1173115)
if [ -n "$ca_check" ] && mokutil -h | grep -q "ca-check"; then
- MOK_ARG="--ca-check"
- else
- MOK_ARG=""
+ MOK_ARGS="${MOK_ARGS} --ca-check"
+ fi
+ # Kernel key needs to be enrolled even if it's in the kernel keyring
(bsc#1191480)
+ if [ -n "$ca_check" ] && mokutil -h | grep -q "ignore-keyring"; then
+ MOK_ARGS="${MOK_ARGS} --ignore-keyring"
fi
# XXX: Only call mokutil if UEFI and shim are used
for cert in $certs; do
cert="/etc/uefi/certs/${cert}.crt"
- run_mokutil --import "$cert" --root-pw ${MOK_ARG}
+ run_mokutil --import "$cert" --root-pw ${MOK_ARGS}
rc=$?
if [ $rc != 0 ] ; then
script_rc=$rc
@@ -64,7 +77,10 @@
# Here we queue the certificate for de-enrollment. If by postun
# the certificate does not exist last kernel using it was
# removed and we can queue it for de-enrollment with mokutil.
- ln "$cert" "$cert.delete" || script_rc=$?
+ # The .delete file must exist after package is removed so we cannot
+ # add it to the rpm filelist to be removed by rpm. And if script is
+ # interrupted it may remain. Do not fail when it exists
(bsc#1191804).
+ ln -f "$cert" "$cert.delete" ||:
done
;;
postun)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.11/kernel-scriptlets/rpm-script
new/suse-module-tools-16.0.13/kernel-scriptlets/rpm-script
--- old/suse-module-tools-16.0.11/kernel-scriptlets/rpm-script 2021-10-04
16:23:49.000000000 +0200
+++ new/suse-module-tools-16.0.13/kernel-scriptlets/rpm-script 2021-10-22
22:30:08.000000000 +0200
@@ -179,7 +179,9 @@
post)
# Flag to trigger /etc/init.d/purge-kernels on next reboot (fate#312018)
# ... but avoid the first installion (bsc#1180058)
- [ "$1" -gt 1 ] && trigger_purge_kernels || script_rc=$?
+ if [ "$1" -gt 1 ]; then
+ trigger_purge_kernels || script_rc=$?
+ fi
for x in /boot/"$image" /boot/initrd; do
rm -f $x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.11/suse-module-tools.spec
new/suse-module-tools-16.0.13/suse-module-tools.spec
--- old/suse-module-tools-16.0.11/suse-module-tools.spec 2021-10-04
16:23:49.000000000 +0200
+++ new/suse-module-tools-16.0.13/suse-module-tools.spec 2021-10-22
22:30:08.000000000 +0200
@@ -45,7 +45,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.11
+Version: 16.0.13
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.Dgi2dJ/_old 2021-10-26 20:13:32.526004999 +0200
+++ /var/tmp/diff_new_pack.Dgi2dJ/_new 2021-10-26 20:13:32.526004999 +0200
@@ -1,5 +1,4 @@
name: suse-module-tools
-version: 16.0.11
-mtime: 1633357429
-commit: a7078cf368e038ee81cf07c7be27609084a05b5d
-
+version: 16.0.13
+mtime: 1634934608
+commit: 78e2a3360cd9727d372174e1ced7f4ad3af01eb8
