[packages/kmod] - updated to 34.1

Thu Mar 20 20:49:57 CET 2025

commit 86f444ecdd283a46bf6e3927c33118a98325cb60
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 20 20:40:28 2025 +0100

    - updated to 34.1

 kmod-depmod.d-kver.patch   |  9 +++++----
 kmod-modprobe.d-kver.patch | 12 ++++++------
 kmod.spec                  | 42 +++++++++++++++++++++++++++++-------------
 3 files changed, 40 insertions(+), 23 deletions(-)
---

diff --git a/kmod.spec b/kmod.spec
index 9680fef..906f313 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -13,12 +13,12 @@
 Summary:	Linux kernel module handling
 Summary(pl.UTF-8):	Obsługa modułów jądra Linuksa
 Name:		kmod
-Version:	33
+Version:	34.1
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
-# Source0-md5:	c451c4aa61521adbe8af147f498046f8
+# Source0-md5:	bdc01ba7d330685af597c16c5f58c0e2
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-modprobe.d-kver.patch
@@ -50,6 +50,8 @@ Obsoletes:	module-init-tools < 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/sbin
+%define		_sbindir	/sbin
+%define		_slibdir	/%{_lib}
 
 %description
 kmod is a set of tools to handle common tasks with Linux kernel
@@ -130,12 +132,11 @@ Bashowe uzupełnianie nazw dla narzędzi kmod.
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--disable-test-modules \
 	%{?with_apidocs:--enable-gtk-doc} \
 	%{?with_python2:--enable-python} \
 	--with-distconfdir=/%{_lib} \
+	--with-fishcompletiondir=%{fish_compdir} \
 	%{?with_openssl:--with-openssl} \
-	--with-rootlibdir=/%{_lib} \
 	--with-xz \
 	--with-zlib \
 	--with-zstd
@@ -154,6 +155,10 @@ install -d $RPM_BUILD_ROOT{/etc,/lib}/{depmod.d,modprobe.d}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_slibdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libkmod.so.* $RPM_BUILD_ROOT%{_slibdir}
+ln -sf --relative $RPM_BUILD_ROOT%{_slibdir}/libkmod.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libkmod.so
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libkmod.la
 
@@ -180,12 +185,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/modprobe.d
 
 %attr(755,root,root) %{_bindir}/kmod
-%attr(755,root,root) %{_bindir}/lsmod
-%attr(755,root,root) %{_bindir}/rmmod
-%attr(755,root,root) %{_bindir}/insmod
-%attr(755,root,root) %{_bindir}/modinfo
-%attr(755,root,root) %{_bindir}/modprobe
-%attr(755,root,root) %{_bindir}/depmod
+%attr(755,root,root) %{_sbindir}/lsmod
+%attr(755,root,root) %{_sbindir}/rmmod
+%attr(755,root,root) %{_sbindir}/insmod
+%attr(755,root,root) %{_sbindir}/modinfo
+%attr(755,root,root) %{_sbindir}/modprobe
+%attr(755,root,root) %{_sbindir}/depmod
 
 %{_mandir}/man5/depmod.d.5*
 %{_mandir}/man5/modprobe.d.5*
@@ -199,19 +204,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/modprobe.8*
 %{_mandir}/man8/rmmod.8*
 
+%{fish_compdir}/insmod.fish
+%{fish_compdir}/lsmod.fish
+%{fish_compdir}/rmmod.fish
+
+%{zsh_compdir}/_insmod
+%{zsh_compdir}/_lsmod
+%{zsh_compdir}/_rmmod
+
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libkmod.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libkmod.so.2
+%attr(755,root,root) %{_slibdir}/libkmod.so.*.*.*
+%ghost %{_slibdir}/libkmod.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %doc libkmod/README
-%attr(755,root,root) %{_libdir}/libkmod.so
+%{_libdir}/libkmod.so
 %{_includedir}/libkmod.h
 %{_pkgconfigdir}/libkmod.pc
 %{_npkgconfigdir}/kmod.pc
 
 %files -n bash-completion-kmod
 %defattr(644,root,root,755)
+%{bash_compdir}/insmod
 %{bash_compdir}/kmod
+%{bash_compdir}/lsmod
+%{bash_compdir}/rmmod
diff --git a/kmod-depmod.d-kver.patch b/kmod-depmod.d-kver.patch
index b863c81..cb5ffe8 100644
--- a/kmod-depmod.d-kver.patch
+++ b/kmod-depmod.d-kver.patch
@@ -1,16 +1,17 @@
---- kmod-26/tools/depmod.c.orig	2019-03-31 13:50:56.277614760 +0200
-+++ kmod-26/tools/depmod.c	2019-03-31 13:53:23.093456646 +0200
-@@ -50,7 +50,9 @@
+--- kmod-34.1/tools/depmod.c.orig	2025-03-06 06:25:07.000000000 +0100
++++ kmod-34.1/tools/depmod.c	2025-03-20 19:52:09.144205408 +0100
+@@ -38,8 +38,10 @@ static int verbose = DEFAULT_VERBOSE;
  
  static const char CFG_BUILTIN_KEY[] = "built-in";
  static const char CFG_EXTERNAL_KEY[] = "external";
 +static char kver_config_path[PATH_MAX] = SYSCONFDIR "/depmod.d/X.Y.Z";
  static const char *const default_cfg_paths[] = {
+ 	// clang-format off
 +	kver_config_path,
  	SYSCONFDIR "/depmod.d",
  	"/run/depmod.d",
  	"/usr/local/lib/depmod.d",
-@@ -815,8 +817,16 @@
+@@ -895,8 +897,16 @@ static int cfg_load(struct cfg *cfg, con
  	size_t i, n_files = 0;
  	struct cfg_file **files = NULL;
  
diff --git a/kmod-modprobe.d-kver.patch b/kmod-modprobe.d-kver.patch
index d013d47..f0c853a 100644
--- a/kmod-modprobe.d-kver.patch
+++ b/kmod-modprobe.d-kver.patch
@@ -1,17 +1,17 @@
-diff -ur kmod-12/libkmod/libkmod.c kmod-12-modprobe.d-kver/libkmod/libkmod.c
---- kmod-12/libkmod/libkmod.c	2012-11-08 04:59:03.663747793 +0100
-+++ kmod-12-modprobe.d-kver/libkmod/libkmod.c	2012-12-12 19:43:19.385242679 +0100
-@@ -58,7 +58,9 @@
- 	[KMOD_INDEX_MODULES_BUILTIN] = { .fn = "modules.builtin", .prefix = ""},
+--- kmod-34.1/libkmod/libkmod.c.orig	2025-03-06 06:25:07.000000000 +0100
++++ kmod-34.1/libkmod/libkmod.c	2025-03-20 19:46:31.547435280 +0100
+@@ -41,8 +41,10 @@ static const struct {
+ 	// clang-format on
  };
  
 +static char kver_config_path[PATH_MAX] = SYSCONFDIR "/modprobe.d/X.Y.Z";
  static const char *const default_config_paths[] = {
+ 	// clang-format off
 +	kver_config_path,
  	SYSCONFDIR "/modprobe.d",
  	"/run/modprobe.d",
  	"/usr/local/lib/modprobe.d",
-@@ -258,8 +260,16 @@
+@@ -242,8 +244,16 @@ KMOD_EXPORT struct kmod_ctx *kmod_new(co
  
  	ctx->kernel_compression = get_kernel_compression(ctx);
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kmod.git/commitdiff/86f444ecdd283a46bf6e3927c33118a98325cb60

