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

@@ -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

kmod.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 12 16:04:41 UTC 2021 - Michal Suchanek <msuchanek@suse.de>
+
+- 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 <jengelh@inai.de>
 

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

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 $<

usr-lib-modprobe.patch

@@ -1,19 +1,58 @@
-From: Jan Engelhardt <jengelh@inai.de>
+From 294bdb1b231e8076de37ed35afef64dd6be37755 Mon Sep 17 00:00:00 2001
-Date: 2020-11-06 12:38:10.597281938 +0100
+From: Michal Suchanek <msuchanek@suse.de>
-References: https://bugzilla.suse.com/show_bug.cgi?id=1092648
+Date: Tue, 12 Jan 2021 16:54:46 +0100
----
+Subject: [PATCH] modprobe.d: load from /usr/lib.
- libkmod/libkmod.c |    1 +
- 1 file changed, 1 insertion(+)
 
-Index: kmod-27/libkmod/libkmod.c
+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
---- kmod-27.orig/libkmod/libkmod.c
+outside of $prefix. Teach kmod to load modprobe.d from $prefix/lib.
-+++ kmod-27/libkmod/libkmod.c
+
-@@ -64,6 +64,7 @@ static struct _index_files {
+Cc: Marcus Rückert <mrueckert@suse.com>
- static const char *default_config_paths[] = {
+Cc: Takashi Iwai <tiwai@suse.com>
+Cc: Dominique Leuenberger <dimstar@opensuse.org>
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+---
+ 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 @@
+   </refnamediv>
+ 
+   <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>/run/modprobe.d/*.conf</filename></para>
+-- 
+2.26.2
+