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-08 00:05:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Fri Oct 8 00:05:44 2021 rev:48 rq:923052 version:16.0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2021-09-20 23:32:08.559098672 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.2443/suse-module-tools.changes
2021-10-08 00:05:51.509733784 +0200
@@ -1,0 +2,9 @@
+Mon Oct 4 14:25:41 UTC 2021 - Martin Wilck <[email protected]>
+
+- Update to version 16.0.11:
+ * inkmp-script(postun): don't pass existing files to weak-modules2
+ (boo#1191200)
+ * kernel-scriptlets: skip cert scriptlet on non-UEFI systems
+ (boo#1191260)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.10+7.obscpio
New:
----
suse-module-tools-16.0.11.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.p9Xuha/_old 2021-10-08 00:05:52.005734625 +0200
+++ /var/tmp/diff_new_pack.p9Xuha/_new 2021-10-08 00:05:52.005734625 +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.10+7
+Version: 16.0.11
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.p9Xuha/_old 2021-10-08 00:05:52.049734699 +0200
+++ /var/tmp/diff_new_pack.p9Xuha/_new 2021-10-08 00:05:52.049734699 +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">609ed9a25a545c259d8b57f3381093cdefc14e16</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">a7078cf368e038ee81cf07c7be27609084a05b5d</param></service></servicedata>
\ No newline at end of file
++++++ suse-module-tools-16.0.10+7.obscpio -> suse-module-tools-16.0.11.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.10+7/.obs/workflows.yml
new/suse-module-tools-16.0.11/.obs/workflows.yml
--- old/suse-module-tools-16.0.10+7/.obs/workflows.yml 2021-09-14
22:53:41.000000000 +0200
+++ new/suse-module-tools-16.0.11/.obs/workflows.yml 2021-10-04
16:23:49.000000000 +0200
@@ -3,4 +3,4 @@
- branch_package:
source_project: home:mwilck:suse-module-tools
source_package: suse-module-tools
-
+ target_project: home:mwilck
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.10+7/kernel-scriptlets/cert-script
new/suse-module-tools-16.0.11/kernel-scriptlets/cert-script
--- old/suse-module-tools-16.0.10+7/kernel-scriptlets/cert-script
2021-09-14 22:53:41.000000000 +0200
+++ new/suse-module-tools-16.0.11/kernel-scriptlets/cert-script 2021-10-04
16:23:49.000000000 +0200
@@ -21,6 +21,14 @@
shift
done
+# 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
+ [ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || \
+ echo "$0: system doesn't support UEFI, skipping certificate handling"
>&2
+ exit 0
+fi
+
run_mokutil () {
[ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || echo mokutil "$@" >&2
mokutil "$@"
@@ -29,58 +37,51 @@
[ -z "$KERNEL_PACKAGE_SCRIPT_DEBUG" ] || echo "cert $op" ca-check: "$ca_check"
certs: "$certs" -- "$@" >&2
script_rc=0
-
case $op in
pre)
;;
post)
- if command -v mokutil >/dev/null; then
- # 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=""
- 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}
- rc=$?
- if [ $rc != 0 ] ; then
- script_rc=$rc
- echo "Failed to import $cert" >&2
- fi
- done
+ # 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=""
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}
+ rc=$?
+ if [ $rc != 0 ] ; then
+ script_rc=$rc
+ echo "Failed to import $cert" >&2
+ fi
+ done
;;
preun)
- if command -v mokutil >/dev/null; then
- for cert in $certs; do
- cert="/etc/uefi/certs/${cert}.crt"
- # 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=$?
- done
- fi
+ for cert in $certs; do
+ cert="/etc/uefi/certs/${cert}.crt"
+ # 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=$?
+ done
;;
postun)
- if command -v mokutil >/dev/null; then
- for cert in $certs; do
- cert="/etc/uefi/certs/${cert}.crt"
- # If the certificate is now gone there are no users left
- # queue -> de-enrollment
- if ! test -e "$cert"; then
- run_mokutil --delete "$cert.delete" --root-pw
- rc=$?
- if [ $rc != 0 ] ; then
- script_rc=$rc
- echo "Failed to delete $cert" >&2
- fi
+ for cert in $certs; do
+ cert="/etc/uefi/certs/${cert}.crt"
+ # If the certificate is now gone there are no users left
+ # queue -> de-enrollment
+ if ! test -e "$cert"; then
+ run_mokutil --delete "$cert.delete" --root-pw
+ rc=$?
+ if [ $rc != 0 ] ; then
+ script_rc=$rc
+ echo "Failed to delete $cert" >&2
fi
- rm "$cert.delete" || script_rc=$?
- done
- fi
+ fi
+ rm "$cert.delete" || script_rc=$?
+ done
;;
posttrans)
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.10+7/kernel-scriptlets/inkmp-script
new/suse-module-tools-16.0.11/kernel-scriptlets/inkmp-script
--- old/suse-module-tools-16.0.10+7/kernel-scriptlets/inkmp-script
2021-09-14 22:53:41.000000000 +0200
+++ new/suse-module-tools-16.0.11/kernel-scriptlets/inkmp-script
2021-10-04 16:23:49.000000000 +0200
@@ -94,18 +94,21 @@
rpm -ql "$nvr" | sed -n '/\.ko\(\.xz\|\.gz\|\.zst\)\?$/p' >
"/var/run/rpm-$nvr-modules" || script_rc=$?
;;
postun)
- if [ -e "$system_map" ]; then
- # the same package was reinstalled or just rebuilt, otherwise the
files
- # would have been deleted by now
- # do not remove anything in this case (bnc#533766)
- rm -f "/var/run/rpm-$nvr-modules"
- exit 0
- fi
-
- modules=( $(cat "/var/run/rpm-$nvr-modules") )
+ mapfile -t modules < "/var/run/rpm-$nvr-modules"
rm -f "/var/run/rpm-$nvr-modules"
- if [ ${#modules[*]} = 0 ]; then
- echo "WARNING: $nvr does not contain any kernel modules" >&2
+
+ # Only pass modules to weak-modules2 which have actually been removed.
+ # Modules can still exist e.g. if a kernel subpackage is updated and
+ # only the build number changed (kernel release remained the same);
+ # in this case the resulting list of modules will actually be empty.
+ # This is similar to the check for $system_map in rpm-script.
+ for __i in "${!modules[@]}"; do
+ if [[ -e "${modules[$__i]}" ]]; then
+ unset -v modules["$__i"]
+ fi
+ done
+ if [[ "${#modules[@]}" == 0 ]]; then
+ echo "$nvr: no kernel modules removed" >&2
exit 0
fi
if [ -x "$wm2" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.10+7/suse-module-tools.rpmlintrc
new/suse-module-tools-16.0.11/suse-module-tools.rpmlintrc
--- old/suse-module-tools-16.0.10+7/suse-module-tools.rpmlintrc 2021-09-14
22:53:41.000000000 +0200
+++ new/suse-module-tools-16.0.11/suse-module-tools.rpmlintrc 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# The package installs different configs for different architectures
-addFilter("no-binary");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.10+7/suse-module-tools.spec
new/suse-module-tools-16.0.11/suse-module-tools.spec
--- old/suse-module-tools-16.0.10+7/suse-module-tools.spec 2021-09-14
22:53:41.000000000 +0200
+++ new/suse-module-tools-16.0.11/suse-module-tools.spec 2021-10-04
16:23:49.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.10
+Version: 16.0.11
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.p9Xuha/_old 2021-10-08 00:05:52.173734909 +0200
+++ /var/tmp/diff_new_pack.p9Xuha/_new 2021-10-08 00:05:52.173734909 +0200
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.10+7
-mtime: 1631652821
-commit: 5d5787e794ec54d5f0a364363a42864eca79eacc
+version: 16.0.11
+mtime: 1633357429
+commit: a7078cf368e038ee81cf07c7be27609084a05b5d
