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-01-18 11:27:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod"
Mon Jan 18 11:27:25 2021 rev:58 rq:863079 version:27
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2020-11-23
18:47:51.817206256 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new.28504/kmod.changes 2021-01-18
11:30:40.644438563 +0100
@@ -1,0 +2,8 @@
+Tue Jan 12 16:04:41 UTC 2021 - Michal Suchanek <msucha...@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
+
+-------------------------------------------------------------------
@@ -41,0 +50 @@
+- Fix testsuite build - requires kernel-default-devel
Old:
----
kmod-testsuite.changes
New:
----
no-stylesheet-download.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmod-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.QbU08A/_old 2021-01-18 11:30:41.556449993 +0100
+++ /var/tmp/diff_new_pack.QbU08A/_new 2021-01-18 11:30:41.556449993 +0100
@@ -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
@@ -36,11 +36,14 @@
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
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.QbU08A/_old 2021-01-18 11:30:41.584450344 +0100
+++ /var/tmp/diff_new_pack.QbU08A/_new 2021-01-18 11:30:41.588450394 +0100
@@ -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 @@
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 ++++++
--- 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 ++++++
--- /var/tmp/diff_new_pack.QbU08A/_old 2021-01-18 11:30:41.668451397 +0100
+++ /var/tmp/diff_new_pack.QbU08A/_new 2021-01-18 11:30:41.672451447 +0100
@@ -1,19 +1,58 @@
-From: Jan Engelhardt <jeng...@inai.de>
-Date: 2020-11-06 12:38:10.597281938 +0100
-References: https://bugzilla.suse.com/show_bug.cgi?id=1092648
+From 294bdb1b231e8076de37ed35afef64dd6be37755 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.
+
+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 <mrueck...@suse.com>
+Cc: Takashi Iwai <ti...@suse.com>
+Cc: Dominique Leuenberger <dims...@opensuse.org>
+Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
- libkmod/libkmod.c | 1 +
- 1 file changed, 1 insertion(+)
+ Makefile.am | 1 +
+ libkmod/libkmod.c | 1 +
+ man/modprobe.d.xml | 1 +
+ 3 files changed, 3 insertions(+)
-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[] = {
+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
+
