Sync from SUSE:SLFO:1.1 kmod revision a97e77499427fb626779c3e7750fea47

0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch

@@ -13,11 +13,11 @@ Patch-mainline: never
  tools/modprobe.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-Index: kmod-34/tools/modprobe.c
+diff --git a/tools/modprobe.c b/tools/modprobe.c
-===================================================================
+index a9e2331..3be2989 100644
---- kmod-34.orig/tools/modprobe.c
+--- a/tools/modprobe.c
-+++ kmod-34/tools/modprobe.c
++++ b/tools/modprobe.c
-@@ -78,6 +78,8 @@ static const struct option cmdopts[] = {
+@@ -85,6 +85,8 @@ static const struct option cmdopts[] = {
  	{"dirname", required_argument, 0, 'd'},
  	{"set-version", required_argument, 0, 'S'},
  
@@ -26,7 +26,7 @@ Index: kmod-34/tools/modprobe.c
  	{"syslog", no_argument, 0, 's'},
  	{"quiet", no_argument, 0, 'q'},
  	{"verbose", no_argument, 0, 'v'},
-@@ -859,6 +861,9 @@ static int do_modprobe(int argc, char **
+@@ -843,6 +845,9 @@ static int do_modprobe(int argc, char **orig_argv)
  		case 'S':
  			kversion = optarg;
  			break;
@@ -35,4 +35,7 @@ Index: kmod-34/tools/modprobe.c
 +			break;
  		case 's':
  			env_modprobe_options_append("-s");
- 			use_syslog = true;
+ 			use_syslog = 1;
+-- 
+2.20.1
+

0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch

@@ -10,12 +10,12 @@ Patch-mainline: never
  libkmod/libkmod-config.c | 3 +++
  1 file changed, 3 insertions(+)
 
-Index: kmod-34/libkmod/libkmod-config.c
+diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-===================================================================
+index aaac0a1..1b24536 100644
---- kmod-34.orig/libkmod/libkmod-config.c
+--- a/libkmod/libkmod-config.c
-+++ kmod-34/libkmod/libkmod-config.c
++++ b/libkmod/libkmod-config.c
-@@ -855,6 +855,9 @@ static int kmod_config_parse(struct kmod
+@@ -650,6 +650,9 @@ static int kmod_config_parse(struct kmod_config *config, int fd,
- 		} else if (streq(cmd, "include") || streq(cmd, "config")) {
+ 				|| streq(cmd, "config")) {
  			ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n",
  								filename, cmd);
 +		} else if (streq(cmd, "allow_unsupported_modules")) {
@@ -24,3 +24,6 @@ Index: kmod-34/libkmod/libkmod-config.c
  		} else {
  syntax_error:
  			ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n",
+-- 
+2.20.1
+

0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch

@@ -12,11 +12,11 @@ Patch-mainline: never
  libkmod/libkmod-module.c   |   31 +++++++++++++++++++++++++++++++
  3 files changed, 42 insertions(+), 2 deletions(-)
 
-Index: kmod-34/libkmod/libkmod-config.c
+Index: kmod-31/libkmod/libkmod-config.c
 ===================================================================
---- kmod-34.orig/libkmod/libkmod-config.c
+--- kmod-31.orig/libkmod/libkmod-config.c
-+++ kmod-34/libkmod/libkmod-config.c
++++ kmod-31/libkmod/libkmod-config.c
-@@ -856,8 +856,16 @@ static int kmod_config_parse(struct kmod
+@@ -708,8 +708,16 @@ static int kmod_config_parse(struct kmod
  			ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n",
  								filename, cmd);
  		} else if (streq(cmd, "allow_unsupported_modules")) {
@@ -35,23 +35,23 @@ Index: kmod-34/libkmod/libkmod-config.c
  		} else {
  syntax_error:
  			ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n",
-Index: kmod-34/libkmod/libkmod-internal.h
+Index: kmod-31/libkmod/libkmod-internal.h
 ===================================================================
---- kmod-34.orig/libkmod/libkmod-internal.h
+--- kmod-31.orig/libkmod/libkmod-internal.h
-+++ kmod-34/libkmod/libkmod-internal.h
++++ kmod-31/libkmod/libkmod-internal.h
-@@ -105,6 +105,7 @@ struct kmod_config {
+@@ -130,6 +130,7 @@ struct kmod_config {
- 	struct kmod_list *weakdeps;
+ 	struct kmod_list *softdeps;
  
  	struct kmod_list *paths;
 +	int block_unsupported;
  };
  
- _nonnull_all_ int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths);
+ int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths) __attribute__((nonnull(1, 2,3)));
-Index: kmod-34/libkmod/libkmod-module.c
+Index: kmod-31/libkmod/libkmod-module.c
 ===================================================================
---- kmod-34.orig/libkmod/libkmod-module.c
+--- kmod-31.orig/libkmod/libkmod-module.c
-+++ kmod-34/libkmod/libkmod-module.c
++++ kmod-31/libkmod/libkmod-module.c
-@@ -568,6 +568,24 @@ KMOD_EXPORT const char *kmod_module_get_
+@@ -781,6 +781,24 @@ KMOD_EXPORT const char *kmod_module_get_
  	return mod->name;
  }
  
@@ -62,7 +62,7 @@ Index: kmod-34/libkmod/libkmod-module.c
 +	struct kmod_elf *elf;
 +
 +	elf = kmod_file_get_elf(mod->file);
-+	count = kmod_elf_get_modinfo_strings(elf, &strings);
++	count = kmod_elf_get_strings(elf, ".modinfo", &strings);
 +	if (count < 0)
 +		return count;
 +	for (i = 0; i < count; i++)
@@ -73,10 +73,10 @@ Index: kmod-34/libkmod/libkmod-module.c
 +	return 0;
 +}
 +
- KMOD_EXPORT const char *kmod_module_get_path(const struct kmod_module *mod)
+ /**
- {
+  * kmod_module_get_path:
- 	if (mod == NULL)
+  * @mod: kmod module
-@@ -690,6 +708,7 @@ KMOD_EXPORT int kmod_module_insert_modul
+@@ -959,6 +977,7 @@ KMOD_EXPORT int kmod_module_insert_modul
  	int err;
  	const char *path;
  	const char *args = options ? options : "";
@@ -84,7 +84,7 @@ Index: kmod-34/libkmod/libkmod-module.c
  
  	if (mod == NULL)
  		return -ENOENT;
-@@ -708,6 +727,18 @@ KMOD_EXPORT int kmod_module_insert_modul
+@@ -977,6 +996,18 @@ KMOD_EXPORT int kmod_module_insert_modul
  		}
  	}
  

0010-modprobe-Implement-allow-unsupported-modules.patch

@@ -9,17 +9,15 @@ Patch-mainline: never
  Makefile.am                   |    4 +++-
  libkmod/libkmod-unsupported.c |    9 +++++++++
  libkmod/libkmod-unsupported.h |    8 ++++++++
- shared/macro.h                |    1 +
  tools/modprobe.c              |    8 +++++++-
- 5 files changed, 28 insertions(+), 2 deletions(-)
+ 4 files changed, 27 insertions(+), 2 deletions(-)
  create mode 100644 libkmod/libkmod-unsupported.c
  create mode 100644 libkmod/libkmod-unsupported.h
 
-Index: kmod-34/Makefile.am
+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-34.orig/Makefile.am
++++ kmod-28/Makefile.am	2021-01-28 12:59:16.613421834 +0100
-+++ kmod-34/Makefile.am
+@@ -108,7 +108,9 @@
-@@ -113,7 +113,9 @@ libkmod_libkmod_la_LIBADD = \
  	${libzstd_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS}
  
  noinst_LTLIBRARIES += libkmod/libkmod-internal.la
@@ -30,10 +28,10 @@ Index: kmod-34/Makefile.am
  libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
  	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
  libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
-Index: kmod-34/libkmod/libkmod-unsupported.c
+Index: kmod-27/libkmod/libkmod-unsupported.c
 ===================================================================
 --- /dev/null
-+++ kmod-34/libkmod/libkmod-unsupported.c
++++ kmod-27/libkmod/libkmod-unsupported.c
 @@ -0,0 +1,9 @@
 +#include "libkmod-internal.h"
 +#include "libkmod-unsupported.h"
@@ -44,10 +42,10 @@ Index: kmod-34/libkmod/libkmod-unsupported.c
 +
 +	config->block_unsupported = 0;
 +}
-Index: kmod-34/libkmod/libkmod-unsupported.h
+Index: kmod-27/libkmod/libkmod-unsupported.h
 ===================================================================
 --- /dev/null
-+++ kmod-34/libkmod/libkmod-unsupported.h
++++ kmod-27/libkmod/libkmod-unsupported.h
 @@ -0,0 +1,8 @@
 +#pragma once
 +
@@ -57,32 +55,20 @@ Index: kmod-34/libkmod/libkmod-unsupported.h
 + * library
 + */
 +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx);
-Index: kmod-34/shared/macro.h
+Index: kmod-27/tools/modprobe.c
 ===================================================================
---- kmod-34.orig/shared/macro.h
+--- kmod-27.orig/tools/modprobe.c
-+++ kmod-34/shared/macro.h
++++ kmod-27/tools/modprobe.c
-@@ -5,6 +5,7 @@
+@@ -38,6 +38,8 @@
- #pragma once
- 
- #include <stddef.h>
-+#include <stdlib.h>
- 
- #if defined(HAVE_STATIC_ASSERT)
- #define assert_cc(expr) _Static_assert((expr), #expr)
-Index: kmod-34/tools/modprobe.c
-===================================================================
---- kmod-34.orig/tools/modprobe.c
-+++ kmod-34/tools/modprobe.c
-@@ -27,6 +27,8 @@
  
  #include "kmod.h"
  
 +#include "libkmod/libkmod-unsupported.h"
 +
  static int log_priority = LOG_CRIT;
+ static int use_syslog = 0;
  #define LOG(...) log_printf(log_priority, __VA_ARGS__)
- 
+@@ -761,6 +763,7 @@ static int do_modprobe(int argc, char **
-@@ -759,6 +761,7 @@ static int do_modprobe(int argc, char **
  	const char *dirname = NULL;
  	const char *root = NULL;
  	const char *kversion = NULL;
@@ -90,7 +76,7 @@ Index: kmod-34/tools/modprobe.c
  	int use_all = 0;
  	int do_remove = 0;
  	int do_show_config = 0;
-@@ -862,7 +865,7 @@ static int do_modprobe(int argc, char **
+@@ -852,7 +855,7 @@ static int do_modprobe(int argc, char **
  			kversion = optarg;
  			break;
  		case 128:
@@ -99,7 +85,7 @@ Index: kmod-34/tools/modprobe.c
  			break;
  		case 's':
  			env_modprobe_options_append("-s");
-@@ -944,6 +947,9 @@ static int do_modprobe(int argc, char **
+@@ -925,6 +928,9 @@ static int do_modprobe(int argc, char **
  
  	log_setup_kmod_log(ctx, verbose);
  

0012-modprobe-print-unsupported-status.patch

@@ -18,13 +18,13 @@ Patch-mainline: never
  tools/modprobe.c         |  5 +++++
  3 files changed, 19 insertions(+)
 
-Index: kmod-34/libkmod/libkmod-config.c
+diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-===================================================================
+index 550a612..0fc2250 100644
---- kmod-34.orig/libkmod/libkmod-config.c
+--- a/libkmod/libkmod-config.c
-+++ kmod-34/libkmod/libkmod-config.c
++++ b/libkmod/libkmod-config.c
-@@ -1204,6 +1204,19 @@ static struct kmod_config_iter *kmod_con
+@@ -1008,6 +1008,19 @@ static struct kmod_config_iter *kmod_config_iter_new(const struct kmod_ctx* ctx,
- 	return iter;
+  * @short_description: retrieve current libkmod configuration
- }
+  */
  
 +/*
 + * kmod_config_unsupported_allowed:
@@ -39,26 +39,26 @@ Index: kmod-34/libkmod/libkmod-config.c
 +	return !config->block_unsupported;
 +}
 +
- KMOD_EXPORT struct kmod_config_iter *kmod_config_get_blacklists(const struct kmod_ctx *ctx)
+ /**
- {
+  * kmod_config_get_blacklists:
- 	if (ctx == NULL)
+  * @ctx: kmod library context
-Index: kmod-34/libkmod/libkmod.h
+diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h
-===================================================================
+index 352627e..c2b9657 100644
---- kmod-34.orig/libkmod/libkmod.h
+--- a/libkmod/libkmod.h
-+++ kmod-34/libkmod/libkmod.h
++++ b/libkmod/libkmod.h
-@@ -530,6 +530,7 @@ bool kmod_config_iter_next(struct kmod_c
+@@ -115,6 +115,7 @@ const char *kmod_config_iter_get_key(const struct kmod_config_iter *iter);
-  * Since: 4
+ const char *kmod_config_iter_get_value(const struct kmod_config_iter *iter);
-  */
+ bool kmod_config_iter_next(struct kmod_config_iter *iter);
  void kmod_config_iter_free_iter(struct kmod_config_iter *iter);
 +bool kmod_config_unsupported_allowed(const struct kmod_ctx *ctx);
  
- /**
+ /*
-  * SECTION:libkmod-module
+  * kmod_module
-Index: kmod-34/tools/modprobe.c
+diff --git a/tools/modprobe.c b/tools/modprobe.c
-===================================================================
+index aa4033d..4f1c54a 100644
---- kmod-34.orig/tools/modprobe.c
+--- a/tools/modprobe.c
-+++ kmod-34/tools/modprobe.c
++++ b/tools/modprobe.c
-@@ -198,6 +198,11 @@ static int show_config(struct kmod_ctx *
+@@ -201,6 +201,11 @@ static int show_config(struct kmod_ctx *ctx)
  		kmod_config_iter_free_iter(iter);
  	}
  
@@ -70,3 +70,6 @@ Index: kmod-34/tools/modprobe.c
  	puts("\n# End of configuration files. Dumping indexes now:\n");
  	fflush(stdout);
  
+-- 
+2.20.1
+

kmod-32.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmXn4vQACgkQm6KlpjDL
+6lNdrg//Z2RngX3Vl1Y0/0tC77dez36xFZ4MnpW+gYm5B1vPgqyqChFWCc1WbUHG
+mgJc5EU3Zbesg6Pdblp6YIswBvVGSMcH+7zkysGzLJyiO61Az+YjInlWgfuyI8lA
+EG6qlqTFc1O8nExO+2Zci5E8VxjX/6BriB3jzls1zjk7WdI6X8HRjWrG8QgW3yix
+Blt0AiBPw2wM9rdlFoQ8ZIOj7V33ax96dPHmSq6dTfMaZFCtXhPqgb6vh8ZtP9OW
+21aJcWbVcdgalWIeNHKHxq+GOeXi7qs/s5Ss/6ugSVncOTXq3Y6X+WqVjgiQNdn8
+BLm0bK/eL78FlIkrx7xDgWDuHyarICoPa4Y8M+lKpABuKssXWSXm/IoRmYtThWj7
+UdNXx7cpGXsa0OGBA4HvMMKXkRVTLFhYdodEPLllIQm90dOt3oYJrf57a36MU49B
+F03o5MKazuA3BbUlF5u5DQ/eG5lbp/i3kw2J6K+ezC24P/ulR+P5jP+nTeEoOI1T
+QfgMvGvifbVaOX8jy3eisej7QvshBi/fGcpZcYORE/mCyEz0xcXAvhQdoo4UgdtG
+6+qOm4ZSIrb98lmyjOg0LXI3SNJ2+7mbP08K5t4o1nTTa/pjzSrwbeoRU1uPLQyg
+DxUp7bayhKXDwtN1Qgye1ZNbUGj4NvR5neGp0bXKICMV09XESeQ=
+=jQpD
+-----END PGP SIGNATURE-----

kmod-34.1.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmfJMvIACgkQm6KlpjDL
-6lNrTA//Q6hQdpQ/G9nbbzqFvrNZdJ9S+GL6AobAIEH82bYgB2YtYuBNlDM9264A
-H+8XIQ3S+ki7ESbNwpIzKg+FboNiRFCROExGwjz95qSvXBD7HseaotnC6WAPBO3F
-Qhny/qj4t7f9njW2KOc7SDYSwPCTDknRYGCx3GWopwKY9lXsdYi2MfmsaL5S34Ht
-V6KHeNYe3tD6/XdJMwlm7hDnQaH0jPvGWwpOCRPk7UagzoxJlcj93vURWBobxiyC
-dFUkys8HennfcKxX5fISO4AXLvb88x8c8jrMnXfXvOt+wKHitBcpsvGYmHVr7wWA
-5Z9SENhtpnNv7P4v9zHD8zbSDxkgmrNbEFi4K1UmYKEZqKKjOzLIyeF8mhI3lahp
-nSd69vmjv+LGfeSLklGAkaqeGzOYHQalX84rMJJe0LMfPai04NnQgA3/idM7M2VL
-M9YFu1wfbdkJJocAfyhigmgxu0umzF41nQ5y6ejtytLN5KVnmfsg7tKmq+IuaU1G
-HPjAN+zI40AQbrf4YS3cfR/IkdscHEkNL5FpBLLU+lxJxNFZBlrXjHWwm9F7016c
-AX2e6Zt0Ngtdu7LFLqroxex6eCi4OOCGY/2Da0N3VWo8u9KzlTuHJbFOKB3jpSi9
-gXZ0QP1qVHsw7/P3A9HR4qUxbxYjl3rgSTsPbelYXitnOKWWP9Y=
-=B0BB
------END PGP SIGNATURE-----

kmod-testsuite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kmod-testsuite
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 
 Name:           kmod-testsuite
 %define lname	libkmod2
-Version:        34.1
+Version:        32
 Release:        0
 Summary:        Testsuite of the kmod package
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -40,14 +40,15 @@ Patch3:         0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
 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
+Patch16:        no-stylesheet-download.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  kernel-default-devel
 BuildRequires:  libopenssl-devel >= 1.1.0
 BuildRequires:  libtool
-BuildRequires:  pkg-config >= 0.21
+BuildRequires:  libxslt-tools
-BuildRequires:  scdoc
+BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
 BuildRequires:  pkgconfig(liblzma) >= 4.99
 %if 0%{?use_zstd}
@@ -71,8 +72,6 @@ buildloop with the kernel.
 %autopatch -p1
 
 %build
-rm -f m4/gtk-doc.m4 libkmod/docs/gtk-doc.make # dangling symlinks
-touch m4/gtk-doc.m4 libkmod/docs/gtk-doc.make
 GTKDOCIZE=/bin/true autoreconf -fi
 export LDFLAGS="-Wl,-z,relro,-z,now"
 # The extra --includedir gives us the possibility to detect dependent
@@ -96,9 +95,10 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 # empty
 
 %check
-result=0
+%ifarch ppc64
-make check V=1 KDIR="%kdir" || result=$?
+make check V=1 KDIR="%kdir" || echo "Warning: bypass boo#897845"
-find . -name test-suite.log | xargs cat
+%else
-exit $result
+make check V=1 KDIR="%kdir"
+%endif
 
 %changelog

kmod.changes

@@ -1,38 +1,3 @@
--------------------------------------------------------------------
-Wed Mar 12 16:03:22 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
-
-- tests: drop ppc64 workaround, print failed test results if any
-
--------------------------------------------------------------------
-Thu Mar  6 09:22:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 34.1
-  * Build fixes only
-
--------------------------------------------------------------------
-Fri Feb 21 22:41:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 34
-  * modinfo now dlopens compression libraries, and only if needed.
-    (insmod/modprobe exercises the kernel's built-in decompression
-    anyway, so is unaffected).
-  * depmod: add -m option for overriding the module directory at
-    runtime.
-  * depmod: deleted deprecated options --unresolved-error, --quiet,
-    -root and --map.
-  * rmmod: deleted deprecated option -w.
-  * insmod: deleted deprecated options -p, -s.
-- Delete 0001-testsuite-fix-path-for-test-user.patch (obsolete)
-
--------------------------------------------------------------------
-Wed Aug 21 21:19:38 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 33
-  * Add weak dependencies
-  * Stop parsing .alias files from modprobe.d directories
-- Delete no-stylesheet-download.patch (merged)
-- Add 0001-testsuite-fix-path-for-test-user.patch
-
 -------------------------------------------------------------------
 Thu Apr  4 15:13:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
 

kmod.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kmod
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 
 Name:           kmod
 %define lname	libkmod2
-Version:        34.1
+Version:        32
 Release:        0
 Summary:        Utilities to load modules into the kernel
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -41,12 +41,14 @@ Patch3:         0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
 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
+Patch16:        no-stylesheet-download.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libopenssl-devel >= 1.1.0
 BuildRequires:  libtool
-BuildRequires:  pkg-config >= 0.21
+BuildRequires:  libxslt-tools
-BuildRequires:  scdoc
+BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
 BuildRequires:  pkgconfig(liblzma) >= 4.99
 %if 0%{?use_zstd}
@@ -65,8 +67,6 @@ Requires:       suse-module-tools
 Obsoletes:      module-init-tools < 3.16
 Provides:       module-init-tools = 3.16
 Provides:       modutils
-Obsoletes:      %name-bash-completion < %version-%release
-Provides:       %name-bash-completion = %version-%release
 
 %description
 kmod is a set of tools to handle common tasks with Linux kernel
@@ -77,6 +77,18 @@ These tools are designed on top of libkmod, a library that is shipped
 with kmod. The aim is to be compatible with tools, configurations and
 indexes from module-init-tools project.
 
+%package bash-completion
+Summary:        Bash completion routines for the kmod utilities
+License:        GPL-2.0-or-later AND LGPL-2.1-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.
+
 %package -n %lname
 Summary:        Library to interact with Linux kernel modules
 License:        LGPL-2.1-or-later
@@ -101,11 +113,9 @@ in %lname.
 
 %prep
 %autosetup -p1
-cp "%_sourcedir/README.usrmerge" .
+cp %{SOURCE4} .
 
 %build
-rm -f m4/gtk-doc.m4 libkmod/docs/gtk-doc.make # dangling symlinks
-touch m4/gtk-doc.m4 libkmod/docs/gtk-doc.make
 GTKDOCIZE=/bin/true autoreconf -fi
 export LDFLAGS="-Wl,-z,relro,-z,now"
 # The extra --includedir gives us the possibility to detect dependent
@@ -129,6 +139,15 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 b="%buildroot"
 %make_install
 rm -f "$b/%_libdir"/*.la
+
+mkdir -p "$b/%_sbindir" "$b/sbin"
+for i in depmod insmod lsmod modinfo modprobe rmmod; do
+	ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
+	rm "$b/%_bindir/$i"
+%if 0%{?suse_version} < 1550
+	ln -s "%_bindir/kmod" "$b/sbin/$i"
+%endif
+done
 mkdir -p "$b/%_bindir" "$b/bin"
 for i in lsmod; do
 	ln -s "%_bindir/kmod" "$b/%_bindir/$i"
@@ -143,7 +162,8 @@ done
 %posttrans
 %{?regenerate_initrd_posttrans}
 
-%ldconfig_scriptlets -n %lname
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
 %files
 %if 0%{?suse_version} > 1500
@@ -158,7 +178,7 @@ done
 %_sbindir/modprobe
 %_sbindir/rmmod
 %_mandir/man[58]/*.[58]*
-%_datadir/pkgconfig/kmod.pc
+%_libdir/pkgconfig/kmod.pc
 %if 0%{?suse_version} < 1550
 /bin/lsmod
 /sbin/depmod
@@ -168,9 +188,9 @@ done
 /sbin/modprobe
 /sbin/rmmod
 %endif
+
+%files bash-completion
 %_datadir/bash-completion/
-%_datadir/fish/
-%_datadir/zsh/
 
 %files -n %lname
 %_libdir/libkmod.so.2*

no-stylesheet-download.patch

@@ -0,0 +1,27 @@
+From 3bb8f5af80b611238160ceb88f288af7037281e9 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Mon, 6 Sep 2021 14:52:35 +0200
+Subject: [PATCH] Do not download the docbook stylesheet during build, use
+ local copy instead.
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+---
+ man/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index d62ff21c799f..6e6aedf092ad 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -28,7 +28,7 @@ define generate_manpage
+ 		--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/nwalsh/current/manpages/docbook.xsl -
+ endef
+ 
+ %.5: %.5.xml
+-- 
+2.44.0
+