From d6a067dd9c4c14eec15c5a8879436a89d3e7c47136380bf5ac3fad0a3c0bf0e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 13 Jan 2021 09:00:05 +0000 Subject: [PATCH 1/2] Accepting request 862710 from home:michals - Update usr-lib-modprobe.patch to upstream submission (boo#1180821). - Require libxslt-tools for xsltproc and use local stylesheet. + no-stylesheet-download.patch OBS-URL: https://build.opensuse.org/request/show/862710 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=174 --- kmod-testsuite.spec | 2 +- kmod.changes | 8 +++++ kmod.spec | 5 ++- no-stylesheet-download.patch | 8 +++++ usr-lib-modprobe.patch | 65 ++++++++++++++++++++++++++++-------- 5 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 no-stylesheet-download.patch diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index 7686e80..9e377b4 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package kmod-testsuite # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/kmod.changes b/kmod.changes index a61f6e9..a931f76 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 12 16:04:41 UTC 2021 - Michal Suchanek + +- Update usr-lib-modprobe.patch to upstream submission (boo#1180821). + +- Require libxslt-tools for xsltproc and use local stylesheet. + + no-stylesheet-download.patch + ------------------------------------------------------------------- Fri Nov 6 11:41:50 UTC 2020 - Jan Engelhardt diff --git a/kmod.spec b/kmod.spec index 9992733..7f9a203 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,10 +36,13 @@ Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch 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 BuildRequires: autoconf BuildRequires: automake +BuildRequires: docbook5-xsl-stylesheets BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libtool +BuildRequires: libxslt-tools BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 diff --git a/no-stylesheet-download.patch b/no-stylesheet-download.patch new file mode 100644 index 0000000..1f24ecb --- /dev/null +++ b/no-stylesheet-download.patch @@ -0,0 +1,8 @@ +--- kmod-27/man/Makefile.am~ 2018-01-31 18:10:59.569903733 +0100 ++++ kmod-27/man/Makefile.am 2021-01-12 21:48:28.488571775 +0100 +@@ -22,4 +22,4 @@ + --nonet \ + --stringparam man.output.quietly 1 \ + --param funcsynopsis.style "'ansi'" \ +- http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< ++ /usr/share/xml/docbook/stylesheet/nwalsh5/current/manpages/docbook.xsl $< diff --git a/usr-lib-modprobe.patch b/usr-lib-modprobe.patch index ec6e86d..a686eca 100644 --- a/usr-lib-modprobe.patch +++ b/usr-lib-modprobe.patch @@ -1,19 +1,58 @@ -From: Jan Engelhardt -Date: 2020-11-06 12:38:10.597281938 +0100 -References: https://bugzilla.suse.com/show_bug.cgi?id=1092648 ---- - libkmod/libkmod.c | 1 + - 1 file changed, 1 insertion(+) +From 294bdb1b231e8076de37ed35afef64dd6be37755 Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Tue, 12 Jan 2021 16:54:46 +0100 +Subject: [PATCH] modprobe.d: load from /usr/lib. -Index: kmod-27/libkmod/libkmod.c -=================================================================== ---- kmod-27.orig/libkmod/libkmod.c -+++ kmod-27/libkmod/libkmod.c -@@ -64,6 +64,7 @@ static struct _index_files { - static const char *default_config_paths[] = { +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 +outside of $prefix. Teach kmod to load modprobe.d from $prefix/lib. + +Cc: Marcus Rückert +Cc: Takashi Iwai +Cc: Dominique Leuenberger +Signed-off-by: Michal Suchanek +--- + Makefile.am | 1 + + libkmod/libkmod.c | 1 + + man/modprobe.d.xml | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index b29e943a4d29..702a665f0334 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,6 +19,7 @@ AM_CPPFLAGS = \ + -include $(top_builddir)/config.h \ + -I$(top_srcdir) \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ ++ -DPREFIX=\""$(prefix)"\" \ + ${zlib_CFLAGS} + + AM_CFLAGS = $(OUR_CFLAGS) +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 43423d63a889..9399c6c902f8 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", -+ "/usr/lib/modprobe.d", "/lib/modprobe.d", ++ PREFIX "/lib/modprobe.d", NULL }; + +diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml +index 211af8488abb..ae5a83986a52 100644 +--- a/man/modprobe.d.xml ++++ b/man/modprobe.d.xml +@@ -40,6 +40,7 @@ + + + ++ /usr/lib/modprobe.d/*.conf + /lib/modprobe.d/*.conf + /etc/modprobe.d/*.conf + /run/modprobe.d/*.conf +-- +2.26.2 + From 0ad80d3c523eb38d11dd9e090a83a5f89617878dd4c54fa432cc2555c3aa47c1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 14 Jan 2021 12:48:37 +0000 Subject: [PATCH 2/2] Accepting request 862900 from home:michals - Fix testsuite build - requires kernel-default-devel OBS-URL: https://build.opensuse.org/request/show/862900 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=175 --- kmod-testsuite.changes | 131 ----------------------------------------- kmod-testsuite.spec | 3 + kmod.changes | 1 + 3 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 kmod-testsuite.changes diff --git a/kmod-testsuite.changes b/kmod-testsuite.changes deleted file mode 100644 index c69274a..0000000 --- a/kmod-testsuite.changes +++ /dev/null @@ -1,131 +0,0 @@ -------------------------------------------------------------------- -Fri Nov 6 11:41:50 UTC 2020 - Jan Engelhardt - -- Add usr-lib-modprobe.patch [boo#1092648] - -------------------------------------------------------------------- -Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek - -- Enable PKCS#7 signature parsing again - requires openssl -- Fix testsuite build - requires kernel-default-devel - -------------------------------------------------------------------- -Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt - -- Update to new upstream release 26 - * depmod now handles parallel invocations better by protecting - the temporary files being used. - * modprobe has a new --show-exports option. Under the hood, - this reads the .symtab and .strtab sections rather than - __versions so it shows useful data even if kernel is - configured without modversions (CONFIG_MODVERSIONS). - * modinfo supports PKCS#7 parsing by using openssl. -- Replaced the asn1c-based parser by an openssl-based PKCS - parser. -- Remove libkmod-signature-Fix-crash-when-module-signature-is.patch, - libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch, - libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch - (not accepted upstream) -- Remove enum.patch, - depmod-Prevent-module-dependency-files-corruption-du.patch, - depmod-Prevent-module-dependency-files-missing-durin.patch, - depmod-shut-up-gcc-insufficinet-buffer-warning.patch - (accepted upstream) - -------------------------------------------------------------------- -Fri Dec 7 14:55:21 UTC 2018 - Michal Suchanek - -- Fix module dependency file corruption on parallel invocation (bsc#1118629). -- Add depmod-Prevent-module-dependency-files-corruption-du.patch -- Add depmod-Prevent-module-dependency-files-missing-durin.patch -- Add depmod-shut-up-gcc-insufficinet-buffer-warning.patch - -------------------------------------------------------------------- -Wed Jul 18 08:51:06 UTC 2018 - jengelh@inai.de - -- Remove enum padding constants, add enum.patch. - -------------------------------------------------------------------- -Fri Jun 8 21:37:14 UTC 2018 - vlad.botanic@gmail.com - -- allow 'modprobe -c' print the status of "allow_unsupported_modules" option. - Add 0012-modprobe-print-unsupported-status.patch - -------------------------------------------------------------------- -Fri Apr 6 10:43:42 UTC 2018 - msuchanek@suse.com - -- Fix crash when PKCS#7 signer name is not present in signature (bsc#1088244) - Add libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch - -------------------------------------------------------------------- -Fri Mar 16 13:08:14 CET 2018 - ro@suse.de - -- for sle, buildexclude the 32bit platforms in kmod-testsuite, - they have no kernel binaries anyway (bnc#1085640) - -------------------------------------------------------------------- -Thu Mar 8 16:34:16 UTC 2018 - msuchanek@suse.com - -- Fix PKCS#7 signature display in modinfo (bsc#1077693). - * Add libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch - * Add libkmod-signature-Fix-crash-when-module-signature-is.patch - * Refresh 0010-modprobe-Implement-allow-unsupported-modules.patch - -------------------------------------------------------------------- -Thu Feb 1 13:49:25 UTC 2018 - msuchanek@suse.com - -- Update to kmod v25 - -------------------------------------------------------------------- -Thu Jul 6 08:07:50 UTC 2017 - jengelh@inai.de - -- Update to new upstream release 24 - * libkmod: fix use of strcpy - * depmod: fix string overflow - * depmod: ignore related modules in depmod_report_cycles - * libkmod: Fix handling of quotes in kernel command line - * libkmod-config: replace 0/1 with bool - * depmod: handle nested loops -- Drop 0001-use-correct-sort-method-in-test-array.patch, - 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch, - 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch - (applied upstream) - -------------------------------------------------------------------- -Tue Nov 22 09:13:47 UTC 2016 - yousaf.kaukab@suse.com - -- 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch: - Add test case where cyclic and non-cyclic dependencies are present - at the same time. (boo#1008186) - -------------------------------------------------------------------- -Thu Mar 31 16:53:28 UTC 2016 - normand@linux.vnet.ibm.com - -- Ignore make check error of ppc64 architecture, bypass boo#897845 - -------------------------------------------------------------------- -Mon Dec 7 14:27:13 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 22 -* support `insmod -f` -* depmod: do not fall back to uname on bad version - -------------------------------------------------------------------- -Sat Nov 7 10:40:29 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 21 -* Cache built modules so it is easier to run "make check" on - build servers by distro maintainers. If kmod is configured with - --disable-test-modules, the modules from cache will be used by - "make check". No changes to the tests are needed and all of - them can run fine. -- Specify KDIR explicitly to resolve build failure with `osc build` - (because kmod uses `uname -r` and the kernel versions need not - match between build env and local host) - -------------------------------------------------------------------- -Tue Apr 21 12:43:39 UTC 2015 - mmarek@suse.cz - -- Run the kmod testsuite in a separate build, to avoid a buildloop - with the kernel. - diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index 9e377b4..cf78fc5 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -36,11 +36,14 @@ Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch 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 BuildRequires: autoconf BuildRequires: automake +BuildRequires: docbook5-xsl-stylesheets BuildRequires: kernel-default-devel BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libtool +BuildRequires: libxslt-tools BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 diff --git a/kmod.changes b/kmod.changes index a931f76..fec44e1 100644 --- a/kmod.changes +++ b/kmod.changes @@ -47,6 +47,7 @@ Wed May 27 23:31:52 UTC 2020 - Jan Engelhardt Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek - Enable PKCS#7 signature parsing again - requires openssl +- Fix testsuite build - requires kernel-default-devel ------------------------------------------------------------------- Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt