[packages/kmod] up to 31

[atler]

commit 7cac58cde987b033b67dc3a6b8dc233c26087464
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Sep 29 22:58:21 2023 +0200

    up to 31

 kmod-depmod.d-kver.patch        |  2 +-
 kmod-modprobe.d-kver.patch      |  6 +++---
 kmod.spec                       |  8 +++-----
 uninitialized-var-in-test.patch | 31 -------------------------------
 4 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/kmod.spec b/kmod.spec
index ef348c3..a029c64 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -14,17 +14,16 @@
 Summary:	Linux kernel module handling
 Summary(pl.UTF-8):	Obsługa modułów jądra Linuksa
 Name:		kmod
-Version:	30
-Release:	2
+Version:	31
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
-# Source0-md5:	85202f0740a75eb52f2163c776f9b564
+# Source0-md5:	6165867e1836d51795a11ea4762ff66a
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-modprobe.d-kver.patch
 Patch1:		%{name}-depmod.d-kver.patch
-Patch2:		uninitialized-var-in-test.patch
 URL:		https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11
@@ -152,7 +151,6 @@ Wiązania Pythona 3 do API kmod.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/kmod-depmod.d-kver.patch b/kmod-depmod.d-kver.patch
index 7e656e9..b863c81 100644
--- a/kmod-depmod.d-kver.patch
+++ b/kmod-depmod.d-kver.patch
@@ -5,7 +5,7 @@
  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 *default_cfg_paths[] = {
+ static const char *const default_cfg_paths[] = {
 +	kver_config_path,
  	SYSCONFDIR "/depmod.d",
  	"/run/depmod.d",
diff --git a/kmod-modprobe.d-kver.patch b/kmod-modprobe.d-kver.patch
index c3eb9b8..d013d47 100644
--- a/kmod-modprobe.d-kver.patch
+++ b/kmod-modprobe.d-kver.patch
@@ -6,14 +6,14 @@ diff -ur kmod-12/libkmod/libkmod.c kmod-12-modprobe.d-kver/libkmod/libkmod.c
  };
  
 +static char kver_config_path[PATH_MAX] = SYSCONFDIR "/modprobe.d/X.Y.Z";
- static const char *default_config_paths[] = {
+ static const char *const default_config_paths[] = {
 +	kver_config_path,
  	SYSCONFDIR "/modprobe.d",
  	"/run/modprobe.d",
  	"/usr/local/lib/modprobe.d",
 @@ -258,8 +260,16 @@
- 	if (env != NULL)
- 		kmod_set_log_priority(ctx, log_priority(env));
+ 
+ 	ctx->kernel_compression = get_kernel_compression(ctx);
  
 -	if (config_paths == NULL)
 -		config_paths = default_config_paths;
diff --git a/uninitialized-var-in-test.patch b/uninitialized-var-in-test.patch
deleted file mode 100644
index 75d40ad..0000000
--- a/uninitialized-var-in-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 16c086f48c2270ad6412ad7226df53079f825270 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh at inai.de>
-Date: Thu, 30 Jun 2022 18:47:25 +0200
-Subject: testsuite: repair read of uninitialized memory
-
-Function ``test_backoff_time`` does not initialize ``delta``, and
-``get_backoff_delta_msec`` then performs a read from uninitialized
-memory with the ``!*delta`` expression.
-
-Signed-off-by: Jan Engelhardt <jengelh at inai.de>
-Signed-off-by: Lucas De Marchi <lucas.de.marchi at gmail.com>
----
- testsuite/test-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/test-util.c b/testsuite/test-util.c
-index fb8c9ef..5766584 100644
---- a/testsuite/test-util.c
-+++ b/testsuite/test-util.c
-@@ -231,7 +231,7 @@ DEFINE_TEST(test_addu64_overflow,
- 
- static int test_backoff_time(const struct test *t)
- {
--	unsigned long long delta;
-+	unsigned long long delta = 0;
- 
- 	/* Check exponential increments */
- 	get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
--- 
-cgit 
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kmod.git/commitdiff/251d482f10356be3de96dde84915166a4e31108e