Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2021-06-05 23:30:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod" Sat Jun 5 23:30:23 2021 rev:62 rq:896327 version:29 Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2021-02-22 14:23:07.871594591 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.1898/kmod.changes 2021-06-05 23:30:42.992352877 +0200 @@ -1,0 +2,23 @@ +Sat May 29 09:58:09 UTC 2021 - Michal Suchanek <msucha...@suse.de> + +- /usr/lib should override /lib where both are available. Support /usr/lib for + depmod.d as well. + * Refresh usr-lib-modprobe.patch +- Remove test patches included in release 29 + - kmod-populate-modules-Use-more-bash-more-quotes.patch + - kmod-testsuite-compress-modules-if-feature-is-enabled.patch + - kmod-also-test-xz-compression.patch + +------------------------------------------------------------------- +Thu May 27 22:20:42 UTC 2021 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 29 + * Fix `modinfo -F` not working for built-in modules and + certain fields. + * Fix a memory leak, overflow and double free on error path. +- Drop 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch, + 0001-libkmod-config-revamp-kcmdline-parsing-into-a-state-.patch, + 0002-libkmod-config-re-quote-option-from-kernel-cmdline.patch + (all merged) + +------------------------------------------------------------------- Old: ---- 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch 0001-libkmod-config-revamp-kcmdline-parsing-into-a-state-.patch 0002-libkmod-config-re-quote-option-from-kernel-cmdline.patch kmod-28.tar.sign kmod-28.tar.xz kmod-also-test-xz-compression.patch kmod-populate-modules-Use-more-bash-more-quotes.patch kmod-testsuite-compress-modules-if-feature-is-enabled.patch New: ---- kmod-29.tar.sign kmod-29.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.i7Ti9c/_old 2021-06-05 23:30:43.660354039 +0200 +++ /var/tmp/diff_new_pack.i7Ti9c/_new 2021-06-05 23:30:43.660354039 +0200 @@ -18,10 +18,10 @@ Name: kmod-testsuite %define lname libkmod2 -Version: 28 +Version: 29 Release: 0 Summary: Testsuite of the kmod package -License: LGPL-2.1-or-later AND GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Kernel URL: https://www.kernel.org/pub/linux/utils/kernel/kmod/ @@ -37,10 +37,6 @@ Patch6: 0012-modprobe-print-unsupported-status.patch Patch7: usr-lib-modprobe.patch Patch8: no-stylesheet-download.patch -Patch9: 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch -Patch10: kmod-populate-modules-Use-more-bash-more-quotes.patch -Patch11: kmod-testsuite-compress-modules-if-feature-is-enabled.patch -Patch12: kmod-also-test-xz-compression.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets @@ -79,7 +75,7 @@ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" -make %{?_smp_mflags} V=1 KDIR="%kdir" +%make_build KDIR="%kdir" %install # empty ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.i7Ti9c/_old 2021-06-05 23:30:43.684354080 +0200 +++ /var/tmp/diff_new_pack.i7Ti9c/_new 2021-06-05 23:30:43.684354080 +0200 @@ -18,10 +18,10 @@ Name: kmod %define lname libkmod2 -Version: 28 +Version: 29 Release: 0 Summary: Utilities to load modules into the kernel -License: LGPL-2.1-or-later AND GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Kernel URL: https://www.kernel.org/pub/linux/utils/kernel/kmod/ @@ -37,9 +37,6 @@ Patch6: 0012-modprobe-print-unsupported-status.patch Patch7: usr-lib-modprobe.patch Patch8: no-stylesheet-download.patch -Patch9: 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch -Patch10: 0001-libkmod-config-revamp-kcmdline-parsing-into-a-state-.patch -Patch11: 0002-libkmod-config-re-quote-option-from-kernel-cmdline.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets @@ -69,7 +66,7 @@ %package bash-completion Summary: Bash completion routines for the kmod utilities -License: LGPL-2.1-or-later AND GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Shells BuildArch: noarch Requires: %{name} @@ -116,7 +113,7 @@ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" -make %{?_smp_mflags} V=1 +%make_build %install b="%buildroot" ++++++ kmod-28.tar.xz -> kmod-29.tar.xz ++++++ ++++ 17665 lines of diff (skipped) ++++++ usr-lib-modprobe.patch ++++++ --- /var/tmp/diff_new_pack.i7Ti9c/_old 2021-06-05 23:30:44.044354706 +0200 +++ /var/tmp/diff_new_pack.i7Ti9c/_new 2021-06-05 23:30:44.044354706 +0200 @@ -1,7 +1,10 @@ -From 294bdb1b231e8076de37ed35afef64dd6be37755 Mon Sep 17 00:00:00 2001 +From fc1b2c14e2ca4d7ccd4a3b75a435ab7d927533bc Mon Sep 17 00:00:00 2001 From: Michal Suchanek <msucha...@suse.de> Date: Tue, 12 Jan 2021 16:54:46 +0100 -Subject: [PATCH] modprobe.d: load from /usr/lib. +Subject: [PATCH] modprobe.d, depmod.d: load from /usr/lib. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit There is an ongoing effort to limit use of files outside of /usr (or $prefix on general). Currently all modprobe.d paths are hardcoded to @@ -14,11 +17,13 @@ --- Makefile.am | 1 + libkmod/libkmod.c | 1 + + man/depmod.d.xml | 1 + man/modprobe.d.xml | 1 + - 3 files changed, 3 insertions(+) + tools/depmod.c | 1 + + 5 files changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am -index b29e943a4d29..702a665f0334 100644 +index d859c240178f..8553368988c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ AM_CPPFLAGS = \ @@ -30,29 +35,53 @@ AM_CFLAGS = $(OUR_CFLAGS) diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c -index 43423d63a889..9399c6c902f8 100644 +index 7c2b889d713e..ddf13fb3d822 100644 --- a/libkmod/libkmod.c +++ b/libkmod/libkmod.c @@ -65,6 +65,7 @@ static const char *default_config_paths[] = { SYSCONFDIR "/modprobe.d", "/run/modprobe.d", - "/lib/modprobe.d", + "/usr/local/lib/modprobe.d", + PREFIX "/lib/modprobe.d", + "/lib/modprobe.d", NULL }; +diff --git a/man/depmod.d.xml b/man/depmod.d.xml +index b315e931d635..8a898cf4a9eb 100644 +--- a/man/depmod.d.xml ++++ b/man/depmod.d.xml +@@ -39,6 +39,7 @@ + </refnamediv> + <refsynopsisdiv> ++ <para><filename>/lib/depmod.d/*.conf</filename></para> + <para><filename>/usr/lib/depmod.d/*.conf</filename></para> + <para><filename>/usr/local/lib/depmod.d/*.conf</filename></para> + <para><filename>/run/depmod.d/*.conf</filename></para> diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml -index 211af8488abb..ae5a83986a52 100644 +index 0ab3e9110a7e..8a7c696dcee1 100644 --- a/man/modprobe.d.xml +++ b/man/modprobe.d.xml -@@ -40,6 +40,7 @@ - </refnamediv> +@@ -41,6 +41,7 @@ <refsynopsisdiv> -+ <para><filename>/usr/lib/modprobe.d/*.conf</filename></para> <para><filename>/lib/modprobe.d/*.conf</filename></para> - <para><filename>/etc/modprobe.d/*.conf</filename></para> ++ <para><filename>/usr/lib/modprobe.d/*.conf</filename></para> + <para><filename>/usr/local/lib/modprobe.d/*.conf</filename></para> <para><filename>/run/modprobe.d/*.conf</filename></para> + <para><filename>/etc/modprobe.d/*.conf</filename></para> +diff --git a/tools/depmod.c b/tools/depmod.c +index eb810b811e35..8f6a4f8cd7cb 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -54,6 +54,7 @@ static const char *default_cfg_paths[] = { + SYSCONFDIR "/depmod.d", + "/run/depmod.d", + "/usr/local/lib/depmod.d", ++ PREFIX "/lib/depmod.d", + "/lib/depmod.d", + NULL + }; -- 2.26.2
