From patchwork Tue Jan 4 18:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4952 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JT1Nt6SZlz3wjq for ; Tue, 4 Jan 2022 18:29:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JT1Ns6v2Dz1Sh; Tue, 4 Jan 2022 18:29:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JT1Ns59Vtz2yTr; Tue, 4 Jan 2022 18:29:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JT1Nr3nlZz2xNW for ; Tue, 4 Jan 2022 18:29:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JT1Nq4Mbczj4 for ; Tue, 4 Jan 2022 18:29:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1641320972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4PmnjzZc9mIsIexpj2i1MDhtLbACEnoAePlsEB2/SQ=; b=+vWABnPpDH8AXewxyIE/+lduA6YK0ldBzxFWIdKOKuZDwpwxShjz5EBuUnkAztTdXTp4s0 Ii53Qa7nZmGQ/JAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1641320972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4PmnjzZc9mIsIexpj2i1MDhtLbACEnoAePlsEB2/SQ=; b=pHbWSndd81hCWqvnUO0k6cfrI2RzQtnvM+jev/jP5ntqkmN2NAdEDgDlAlA+gU/zT6tQt2 9yHzDOBr7JLJnz5I2XhCEhUzpaEhZbDsp0ZC5zbrZPi15jxXQ4CfWty1R5gSai/Feq//C3 t65StDjkr6NQa7xj7R3WzAInpQgJdI/39EVQEE7bn1+ziw4P+jWU+yS7EXE4zZ4H8T451a iqxOqvyUUs/qhfA1cBDySUmQuGXt82yJ5/7OY0gDaFZhMS1SsrODz9VBSFxXjgvkYSU/nD PT35c0IIGNj3clRBVfMttm5QfdEybFa1wnKrXyf7DW4tE37hrTwl/I7hYf5DDA== Message-ID: <35e9cc23-d37f-c45f-dfbe-acedd98d1a41@ipfire.org> Date: Tue, 4 Jan 2022 19:29:25 +0100 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] kmod: Update to 29 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Full changelog as given in the NEWS file: kmod 29 ======= - Improvements - Add support to use /usr/local as a place for configuration files. This makes it easier to install locally without overriding distro files. - Bug fixes - Fix `modinfo -F` when module is builtin: when we asked by a specific field from modinfo, it was not working correctly if the module was builtin - Documentation fixes on precedence order of /etc and /run: the correct order is /etc/modprobe.d, /run/modprobe.d, /lib/modprobe.d - Fix the priority order that we use for searching configuration files. The correct one is /etc, /run, /usr/local/lib, /lib, for both modprobe.d and depmo.d - Fix kernel command line parsing when there are quotes present. Grub mangles the command line and changes it from 'module.option="val with spaces"' to '"module.option=val with spaces"'. Although this is weird behavior and grub could have been fixed, the kernel understands it correctly for builtin modules. So change libkmod to also parse it correctly. This also brings another hidden behavior from the kernel: newline in the kernel command line is also allowed and can be used to separate options. - Fix a memory leak, overflow and double free on error path - Fix documentation for return value from kmod_module_get_info(): we return the number of entries we added to the list - Fix output of modules.builtin.alias.bin index: we were writing an empty file due to the misuse of kmod_module_get_info() - Infra/internal - Retire integration with semaphoreci - Declare the github mirror also as an official upstream source: now besides accepting patches via mailing list, PRs on github are also acceptable - Misc improvements to testsuite, so we can use it reliably regardless of the configuration used: now tests will skip if we don't have the build dependencies) Signed-off-by: Peter Müller Reviewed-by: Michael Tremer --- config/rootfiles/common/kmod | 2 +- lfs/kmod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index 56806fd1f..f46db860b 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -9,6 +9,6 @@ sbin/rmmod #usr/lib/libkmod.la #usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.3.6 +usr/lib/libkmod.so.2.3.7 #usr/lib/pkgconfig/libkmod.pc #usr/share/bash-completion/completions/kmod diff --git a/lfs/kmod b/lfs/kmod index 3d9acd899..5499002b6 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 28 +VER = 29 THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0a2b887b1b3dfb8c0b3f41f598203e56 +$(DL_FILE)_MD5 = e81e63acd80697d001c8d85c1acb38a0 install : $(TARGET)