From 0a94b832833d8afe7143b31f863613cfc81c742ec146ed8725c8da9453ffb265 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 Jan 2021 12:11:04 +0000 Subject: [PATCH 1/4] Accepting request 867442 from home:pevik:branches:Base:System - Backport upstream fix 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch OBS-URL: https://build.opensuse.org/request/show/867442 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=177 --- ...fo-F-always-shows-name-for-built-ins.patch | 43 +++++++++++++++++++ kmod-testsuite.spec | 1 + kmod.changes | 5 +++ kmod.spec | 1 + 4 files changed, 50 insertions(+) create mode 100644 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch diff --git a/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch b/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch new file mode 100644 index 0000000..533d46b --- /dev/null +++ b/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch @@ -0,0 +1,43 @@ +From 45dd8d3d2859b58c203d9be16ab7ed77d98b7714 Mon Sep 17 00:00:00 2001 +From: Marco d'Itri +Date: Thu, 7 Jan 2021 20:17:48 -0800 +Subject: [PATCH] Fix "modinfo -F always shows name for built-ins" + +Bug reported by Ben Hutchings : +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970871 + + Now that the kernel provides module information for potentially + modular code that's actually built-in, it's possible to query these + built-ins with "modinfo -F". However, this doesn't work quite right: + + $ modinfo -Flicense e1000e + GPL v2 + $ modinfo -Flicense bitrev + name: bitrev + GPL +Reviewed-by: Petr Vorel +[ Patch-mainline: fa67110f896cdef67f42cbc2206ae2a8524acee6 ] +--- + tools/modinfo.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tools/modinfo.c b/tools/modinfo.c +index 0231bb0..f6a971f 100644 +--- a/tools/modinfo.c ++++ b/tools/modinfo.c +@@ -178,7 +178,11 @@ static int modinfo_do(struct kmod_module *mod) + is_builtin = (filename == NULL); + + if (is_builtin) { +- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); ++ if (field == NULL) ++ printf("%-16s%s%c", "name:", ++ kmod_module_get_name(mod), separator); ++ else if (field != NULL && streq(field, "name")) ++ printf("%s%c", kmod_module_get_name(mod), separator); + filename = "(builtin)"; + } + +-- +2.30.0 + diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index cf78fc5..d994cf2 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -37,6 +37,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch 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 BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets diff --git a/kmod.changes b/kmod.changes index fec44e1..a90de1b 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 28 11:03:09 UTC 2021 - Petr Vorel + +- Backport upstream fix 0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch + ------------------------------------------------------------------- Tue Jan 12 16:04:41 UTC 2021 - Michal Suchanek diff --git a/kmod.spec b/kmod.spec index 7f9a203..9a92261 100644 --- a/kmod.spec +++ b/kmod.spec @@ -37,6 +37,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch 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 BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets From 4b791e5eadbebb1f303aa347c116b356dd068655f47d67818ffe05763b9dc8f6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 Jan 2021 12:13:21 +0000 Subject: [PATCH 2/4] reretrieve patch from git OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=178 --- ...fo-F-always-shows-name-for-built-ins.patch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch b/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch index 533d46b..5ea1ecb 100644 --- a/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch +++ b/0001-Fix-modinfo-F-always-shows-name-for-built-ins.patch @@ -1,4 +1,4 @@ -From 45dd8d3d2859b58c203d9be16ab7ed77d98b7714 Mon Sep 17 00:00:00 2001 +From fa67110f896cdef67f42cbc2206ae2a8524acee6 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Thu, 7 Jan 2021 20:17:48 -0800 Subject: [PATCH] Fix "modinfo -F always shows name for built-ins" @@ -15,17 +15,15 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970871 $ modinfo -Flicense bitrev name: bitrev GPL -Reviewed-by: Petr Vorel -[ Patch-mainline: fa67110f896cdef67f42cbc2206ae2a8524acee6 ] --- - tools/modinfo.c | 6 +++++- + tools/modinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/tools/modinfo.c b/tools/modinfo.c -index 0231bb0..f6a971f 100644 ---- a/tools/modinfo.c -+++ b/tools/modinfo.c -@@ -178,7 +178,11 @@ static int modinfo_do(struct kmod_module *mod) +Index: kmod-27/tools/modinfo.c +=================================================================== +--- kmod-27.orig/tools/modinfo.c ++++ kmod-27/tools/modinfo.c +@@ -178,7 +178,11 @@ static int modinfo_do(struct kmod_module is_builtin = (filename == NULL); if (is_builtin) { @@ -38,6 +36,3 @@ index 0231bb0..f6a971f 100644 filename = "(builtin)"; } --- -2.30.0 - From 69a0fd03fcc20564dd193c97d94f870c53b23a1c7afe9018429dea61d62532fc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 Jan 2021 12:56:33 +0000 Subject: [PATCH 3/4] Accepting request 867471 from home:michals - Update to v28 * Add Zstandard to the supported compression formats using libzstd (tests only - cannot be disabled in tests) * Ignore ill-formed kernel command line, e.g. with "ivrs_acpihid[00:14.5]=AMD0020:0" option in it * Fix some memory leaks * Fix 0-length builtin.alias.bin: it needs at least the index header OBS-URL: https://build.opensuse.org/request/show/867471 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=179 --- ...obe-Implement-allow-unsupported-modules.patch | 11 +++++------ kmod-27.tar.sign | 16 ---------------- kmod-27.tar.xz | 3 --- kmod-28.tar.sign | 16 ++++++++++++++++ kmod-28.tar.xz | 3 +++ kmod-testsuite.spec | 5 ++++- kmod.changes | 11 +++++++++++ kmod.spec | 2 +- 8 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 kmod-27.tar.sign delete mode 100644 kmod-27.tar.xz create mode 100644 kmod-28.tar.sign create mode 100644 kmod-28.tar.xz diff --git a/0010-modprobe-Implement-allow-unsupported-modules.patch b/0010-modprobe-Implement-allow-unsupported-modules.patch index 2af1f95..58d333d 100644 --- a/0010-modprobe-Implement-allow-unsupported-modules.patch +++ b/0010-modprobe-Implement-allow-unsupported-modules.patch @@ -14,12 +14,11 @@ Patch-mainline: never create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h -Index: kmod-27/Makefile.am -=================================================================== ---- kmod-27.orig/Makefile.am -+++ kmod-27/Makefile.am -@@ -93,7 +93,9 @@ libkmod_libkmod_la_LIBADD = \ - ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} +diff -u kmod-28.orig/Makefile.am kmod-28/Makefile.am +--- kmod-28.orig/Makefile.am 2021-01-07 19:29:12.972438665 +0100 ++++ kmod-28/Makefile.am 2021-01-28 12:59:16.613421834 +0100 +@@ -108,7 +108,9 @@ + ${libzstd_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) diff --git a/kmod-27.tar.sign b/kmod-27.tar.sign deleted file mode 100644 index e8d2227..0000000 --- a/kmod-27.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAl5MeZYACgkQm6KlpjDL -6lOR4Q/+JEWd9QGHB8wXg971dqsFtdOkm1adCilKtbRJXZj2EK/+Sg9BS7OCwbZC -1mXFaeSIrdkK3rmZplJADO0VaEGSSNgFHUQkv38nlF0fGI3ZGqPT3b4u4aukKA2E -HXSxL364gnXqzewzgm0QGrFYwrZDpOEBP/VjqZJS8ICHMY+vUijerptuPRWAU7iC -SsnVW+2Blv0uUSn1j6f06f0lucSW2axwmlL5RIpyLP07bOBLjDoYfXTqORbvE72F -2TaQ6MV6lba1WCobvtJDYlzIOWWiPUlDxIU73zDlfDgj1MKZA6Wax+NKNBhfKgtn -bodfH9OePwLB4ipkeZvAxyf51BlpK2mpUqqH/eZWRGvKuOQdz+Ip1GY7Ab7mvx5a -GyKQofO/a6NpDzh63y3a90lnBGP6IQ2cg/gCRgQh442i2OV/+2MSmLEegXRDBU7F -+0sSz9+i0B+YkxmJTItPR6bNN5HX2u5DL3m0KCEKOd5LAyaM+k8GRHQ99tCi93Tf -Bxh/8tqYUo8z//SKFfmsXLC/Xgo7if/D8iXGnFotNziG0ZsfkDLJnFT14HU6B+y7 -onY+NshaUpg9a8IwP1hfM4/lPfJ5fUJYKuQDE2Ibk6RAHrzMVV1dmx7futvTOSrD -bFxh5L7N1WjXgZYekBevl7yjqA+0N2BA4VEWtKTxgs84skcCW4s= -=aghD ------END PGP SIGNATURE----- diff --git a/kmod-27.tar.xz b/kmod-27.tar.xz deleted file mode 100644 index 1b65b16..0000000 --- a/kmod-27.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c -size 548924 diff --git a/kmod-28.tar.sign b/kmod-28.tar.sign new file mode 100644 index 0000000..0787a7c --- /dev/null +++ b/kmod-28.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAl/3VpUACgkQm6KlpjDL +6lP1zQ/7BNcz4G6460xko6TypvAiZ7VDvJzBWgdH9EgNgXMPxIAE9PhpfVgvtT+w +k0dHy8zKAvnjoaPaa1vbP2ZGUDjaWoviJGOkmEwc2RVrWcwESDLJx1BKEAT7qh++ +0isr8OhCMeiaW1+hcz/XcZ6arHL29/lIpeWw2ZgSj4JlRC4YVD+t+v6Citkko53v +t6odio4yF06EuGhAmffMDWwrjscMNtW6UR1ce/69UENkR3Kq8c9blu5Q0Go4I3yI +K7U5nKyJxhoEm1OPml6x1td940Z4EqC/BR+sUYK1izXM9Uo8d+3J5hiHI83xOFz4 +9xrzcftHnM524aUYmHe5h83Li9XfW1BfIyePIYEMseEewfFF60bQqugciK+RCPoc +F+mC//ZBj1Xs2FLyAZhHdeZPjPCcGF6MrCuWUWavy8nxFStJgw8R59tatRhTGv5+ +QMk5DhJsKk8sCDeFWo6CBOHN99lNTJ06yI4hYfzcVCXE8deqHI5tBxmhhgFioqfE +UGj7fiG8bYqy4foXCW5SgD7Gmvg5fy/zpc8+h9MtmXW0Fqx3jABFknnolbEsJzBu +YJQ+UypKrARy8RpdRHsX8k2zH+hw5p5p7uHGGOy2j3Zff/Mx8zxAsOlpplt4b4cZ +PC+/D/cwNtEUDcW7ql33YmpkylAguKbivzMKSe2yb9DgNw3o3N4= +=FrBq +-----END PGP SIGNATURE----- diff --git a/kmod-28.tar.xz b/kmod-28.tar.xz new file mode 100644 index 0000000..dc16ace --- /dev/null +++ b/kmod-28.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3969fc0f13daa98084256337081c442f8749310089e48aa695c9b4dfe1b3a26c +size 552448 diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index d994cf2..a50c2a4 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -18,7 +18,7 @@ Name: kmod-testsuite %define lname libkmod2 -Version: 27 +Version: 28 Release: 0 Summary: Testsuite of the kmod package License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -47,7 +47,9 @@ BuildRequires: libtool BuildRequires: libxslt-tools BuildRequires: pkgconfig >= 0.21 BuildRequires: xz +BuildRequires: zstd BuildRequires: pkgconfig(liblzma) >= 4.99 +BuildRequires: pkgconfig(libzstd) >= 1.4.4 BuildRequires: pkgconfig(zlib) Requires: suse-module-tools %if !0%{?is_opensuse} @@ -72,6 +74,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now" %configure \ --with-xz \ --with-zlib \ + --with-zstd \ --with-openssl \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ diff --git a/kmod.changes b/kmod.changes index a90de1b..d4ec7f8 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 28 12:05:17 UTC 2021 - Michal Suchanek + +- Update to v28 + * Add Zstandard to the supported compression formats using libzstd + (tests only - cannot be disabled in tests) + * Ignore ill-formed kernel command line, e.g. with "ivrs_acpihid[00:14.5]=AMD0020:0" + option in it + * Fix some memory leaks + * Fix 0-length builtin.alias.bin: it needs at least the index header + ------------------------------------------------------------------- Thu Jan 28 11:03:09 UTC 2021 - Petr Vorel diff --git a/kmod.spec b/kmod.spec index 9a92261..4623d91 100644 --- a/kmod.spec +++ b/kmod.spec @@ -18,7 +18,7 @@ Name: kmod %define lname libkmod2 -Version: 27 +Version: 28 Release: 0 Summary: Utilities to load modules into the kernel License: LGPL-2.1-or-later AND GPL-2.0-or-later From 2cfe7463ef1be2b9c7a9c2977e406dc60f0e3d84c1cda6d9be757a43190d767f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 31 Jan 2021 00:43:05 +0000 Subject: [PATCH 4/4] Accepting request 867700 from home:dimstar:Factory - Supplement bash-completion subpackage against the main package and bash-completion. - Also require the main package plus bash-completion: the completion package is useless without either of the two. OBS-URL: https://build.opensuse.org/request/show/867700 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=180 --- kmod.changes | 8 ++++++++ kmod.spec | 3 +++ 2 files changed, 11 insertions(+) diff --git a/kmod.changes b/kmod.changes index d4ec7f8..f26aa6e 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 29 11:54:30 UTC 2021 - Dominique Leuenberger + +- Supplement bash-completion subpackage against the main package + and bash-completion. +- Also require the main package plus bash-completion: the + completion package is useless without either of the two. + ------------------------------------------------------------------- Thu Jan 28 12:05:17 UTC 2021 - Michal Suchanek diff --git a/kmod.spec b/kmod.spec index 4623d91..144674b 100644 --- a/kmod.spec +++ b/kmod.spec @@ -70,6 +70,9 @@ Summary: Bash completion routines for the kmod utilities License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Shells BuildArch: noarch +Requires: %{name} +Requires: bash-completion +Supplements: (%{name} and bash-completion) %description bash-completion Contains bash completion support for kmod utilities.