Accepting request 809713 from Base:System

- Update to release 27 OBS-URL: https://build.opensuse.org/request/show/809713 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=54
2020-06-03 18:28:37 +00:00 · 2020-06-03 18:28:37 +00:00 · c1ecd27bd9
commit c1ecd27bd9
parent 5c59f9e8b4 2223e25346
8 changed files with 57 additions and 51 deletions
--- a/0010-modprobe-Implement-allow-unsupported-modules.patch
+++ b/0010-modprobe-Implement-allow-unsupported-modules.patch
@ -14,12 +14,12 @@ Patch-mainline: never
 create mode 100644 libkmod/libkmod-unsupported.c
 create mode 100644 libkmod/libkmod-unsupported.h

-diff --git a/Makefile.am b/Makefile.am
-index ddb25f0..e332977 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -92,7 +92,9 @@ libkmod_libkmod_la_LIBADD = \
- 	${liblzma_LIBS} ${zlib_LIBS} ${openssl_LIBS}
+Index: kmod-27/Makefile.am
+===================================================================
+--- kmod-27.orig/Makefile.am
+++ kmod-27/Makefile.am
+@@ -93,7 +93,9 @@ libkmod_libkmod_la_LIBADD = \
+ 	${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS}
 
 noinst_LTLIBRARIES += libkmod/libkmod-internal.la
 -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
@ -29,11 +29,10 @@ index ddb25f0..e332977 100644
 libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
 	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
 libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
-diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c
-new file mode 100644
-index 0000000..7ef9fc8
+Index: kmod-27/libkmod/libkmod-unsupported.c
+===================================================================
 --- /dev/null
-+++ b/libkmod/libkmod-unsupported.c
+++ kmod-27/libkmod/libkmod-unsupported.c
@@ -0,0 +1,9 @@
 +#include "libkmod-internal.h"
 +#include "libkmod-unsupported.h"
@ -44,11 +43,10 @@ index 0000000..7ef9fc8
 +
 +	config->block_unsupported = 0;
 +}
-diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h
-new file mode 100644
-index 0000000..a95b4a2
+Index: kmod-27/libkmod/libkmod-unsupported.h
+===================================================================
 --- /dev/null
-+++ b/libkmod/libkmod-unsupported.h
+++ kmod-27/libkmod/libkmod-unsupported.h
@@ -0,0 +1,8 @@
 +#pragma once
 +
@ -58,10 +56,10 @@ index 0000000..a95b4a2
 + * library
 + */
 +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx);
-diff --git a/tools/modprobe.c b/tools/modprobe.c
-index 3be2989..aa4033d 100644
--- a/tools/modprobe.c
-+++ b/tools/modprobe.c
+Index: kmod-27/tools/modprobe.c
+===================================================================
+--- kmod-27.orig/tools/modprobe.c
+++ kmod-27/tools/modprobe.c
@@ -38,6 +38,8 @@
 
 #include "kmod.h"
@ -71,7 +69,7 @@ index 3be2989..aa4033d 100644
 static int log_priority = LOG_CRIT;
 static int use_syslog = 0;
 #define LOG(...) log_printf(log_priority, __VA_ARGS__)
-@@ -755,6 +757,7 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -761,6 +763,7 @@ static int do_modprobe(int argc, char **
 	const char *dirname = NULL;
 	const char *root = NULL;
 	const char *kversion = NULL;
@ -79,7 +77,7 @@ index 3be2989..aa4033d 100644
 	int use_all = 0;
 	int do_remove = 0;
 	int do_show_config = 0;
-@@ -846,7 +849,7 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -852,7 +855,7 @@ static int do_modprobe(int argc, char **
 			kversion = optarg;
 			break;
 		case 128:
@ -88,7 +86,7 @@ index 3be2989..aa4033d 100644
 			break;
 		case 's':
 			env_modprobe_options_append("-s");
-@@ -919,6 +922,9 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -925,6 +928,9 @@ static int do_modprobe(int argc, char **
 
 	log_setup_kmod_log(ctx, verbose);
 
@ -98,6 +96,3 @@ index 3be2989..aa4033d 100644
 	kmod_load_resources(ctx);
 
 	if (do_show_config)
-- 
-2.20.1
-
--- a/kmod-26.tar.sign
+++ b/kmod-26.tar.sign
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJcXKdWAAoJEJuipaYwy+pTY18P/RG8vHLEHLMtymg+hjDroTA9
-uVHx7rLhH56sZa3wssH9FdsZx+CCnPsY5aE2PnfLmAob1AVmDx9IewcLT7JKbLpk
-2dI8n5Ayj/Pz+KKPKHDvfwhuBS0kkw/9ds1Vhl+fZZcwtTzs6/edu+HAJiHAc0sB
-46R/q1tmd9x7HBYGw0usDNgT/rUkCiwwtgIpP9kEr2EimbwMZHbyR8yJ22Ej8oWj
-v3OUkncBQvcyO5J85iCzw51LYGAX6bFpoX/CeExNepXKpvrS05b+lzzbDobOLcYN
-sL1aAJwQClmOCm54yRKONu2kAd7OQhwuMN8wH0vUzWfdnLcW6nnpxhli591LNt2v
-5bZgyTwg3GoVkE7K0XaxRP9eCVgmUDrChARvrT0hqXtumqvzABo1G0BQbkT6knG4
-xyv3seRsPstQvQNOl9cj6elgfu67fT+rhvCyJseg2V9sM1FUT6nyfwDEgIuuKhD/
-2hW4u5SxwSg/w+KnLsxVvfGkrSTJtGPj4YKzfQuqFx7LIF5Rp5GuGEnN5kF6uCMo
-rorVh6tiQYzCyuJvd4xiUkCCpQ/2x5LzTx/krr2OHypjIbTSUTIuwvnL2SjZSGIB
-dKDK9/WLDtgo3VAXWT5mvgRIGzjx5ukLNf1Bc/MXI6OYCgeKhwqZ3p5pzBGBqjiE
-1QurXHkHJjro4R8Otffp
-=PbAJ
-----END PGP SIGNATURE-----
--- a/kmod-26.tar.xz
+++ b/kmod-26.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d
-size 552032
--- a/kmod-27.tar.sign
+++ b/kmod-27.tar.sign
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAl5MeZYACgkQm6KlpjDL
+6lOR4Q/+JEWd9QGHB8wXg971dqsFtdOkm1adCilKtbRJXZj2EK/+Sg9BS7OCwbZC
+1mXFaeSIrdkK3rmZplJADO0VaEGSSNgFHUQkv38nlF0fGI3ZGqPT3b4u4aukKA2E
+HXSxL364gnXqzewzgm0QGrFYwrZDpOEBP/VjqZJS8ICHMY+vUijerptuPRWAU7iC
+SsnVW+2Blv0uUSn1j6f06f0lucSW2axwmlL5RIpyLP07bOBLjDoYfXTqORbvE72F
+2TaQ6MV6lba1WCobvtJDYlzIOWWiPUlDxIU73zDlfDgj1MKZA6Wax+NKNBhfKgtn
+bodfH9OePwLB4ipkeZvAxyf51BlpK2mpUqqH/eZWRGvKuOQdz+Ip1GY7Ab7mvx5a
+GyKQofO/a6NpDzh63y3a90lnBGP6IQ2cg/gCRgQh442i2OV/+2MSmLEegXRDBU7F
+0sSz9+i0B+YkxmJTItPR6bNN5HX2u5DL3m0KCEKOd5LAyaM+k8GRHQ99tCi93Tf
+Bxh/8tqYUo8z//SKFfmsXLC/Xgo7if/D8iXGnFotNziG0ZsfkDLJnFT14HU6B+y7
+onY+NshaUpg9a8IwP1hfM4/lPfJ5fUJYKuQDE2Ibk6RAHrzMVV1dmx7futvTOSrD
+bFxh5L7N1WjXgZYekBevl7yjqA+0N2BA4VEWtKTxgs84skcCW4s=
+=aghD
+-----END PGP SIGNATURE-----
--- a/kmod-27.tar.xz
+++ b/kmod-27.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c
+size 548924
--- a/kmod-testsuite.spec
+++ b/kmod-testsuite.spec
@ -1,7 +1,7 @@
 #
 # spec file for package kmod-testsuite
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@

 Name:           kmod-testsuite
 %define lname	libkmod2
-Version:        26
+Version:        27
 Release:        0
 Summary:        Testsuite of the kmod package
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
--- a/kmod.changes
+++ b/kmod.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May 27 23:31:52 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 27
+  * Link to libcrypto rather than requiring openssl.
+  * Use PKCS#7 instead of CMS for parsing module signature to be
+    compatible with LibreSSL and OpenSSL < 1.1.0.
+  * Teach modinfo to parse modules.builtin.modinfo. When using
+    Linux kernel >= v5.2~rc1, it is possible to get module
+    information from this new file.
+
 -------------------------------------------------------------------
 Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek <msuchanek@suse.com>

--- a/kmod.spec
+++ b/kmod.spec
@ -1,7 +1,7 @@
 #
 # spec file for package kmod
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@

 Name:           kmod
 %define lname	libkmod2
-Version:        26
+Version:        27
 Release:        0
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later