commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2020-11-09 13:56:54
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.11331 (New)
Package is "kmod"
Mon Nov 9 13:56:54 2020 rev:56 rq:846461 version:27
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2019-05-06
13:19:32.104285865 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.11331/kmod-testsuite.changes
2020-11-09 13:58:19.435844697 +0100
@@ -1,0 +2,5 @@
+Fri Nov 6 11:41:50 UTC 2020 - Jan Engelhardt
+
+- Add usr-lib-modprobe.patch [boo#1092648]
+
+---
kmod.changes: same change
New:
usr-lib-modprobe.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.0ScnAs/_old 2020-11-09 13:58:20.411842568 +0100
+++ /var/tmp/diff_new_pack.0ScnAs/_new 2020-11-09 13:58:20.411842568 +0100
@@ -35,6 +35,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
+Patch7: usr-lib-modprobe.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: kernel-default-devel
++ kmod.spec ++
--- /var/tmp/diff_new_pack.0ScnAs/_old 2020-11-09 13:58:20.447842489 +0100
+++ /var/tmp/diff_new_pack.0ScnAs/_new 2020-11-09 13:58:20.451842480 +0100
@@ -35,6 +35,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
+Patch7: usr-lib-modprobe.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libopenssl-devel >= 1.1.0
@@ -98,7 +99,7 @@
autoreconf -fi
export LDFLAGS="-Wl,-z,relro,-z,now"
# The extra --includedir gives us the possibility to detect dependent
-# packages which fail to properly use pkgconfig.
+# packages which fail to properly use pkgconfig, cf.
bugzilla.opensuse.org/795968
%configure \
--with-xz \
--with-zlib \
++ usr-lib-modprobe.patch ++
From: Jan Engelhardt
Date: 2020-11-06 12:38:10.597281938 +0100
References: https://bugzilla.suse.com/show_bug.cgi?id=1092648
---
libkmod/libkmod.c |1 +
1 file changed, 1 insertion(+)
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[] = {
SYSCONFDIR "/modprobe.d",
"/run/modprobe.d",
+ "/usr/lib/modprobe.d",
"/lib/modprobe.d",
NULL
};
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2020-07-29 17:14:06
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.3592 (New)
Package is "kmod"
Wed Jul 29 17:14:06 2020 rev:55 rq:819240 version:27
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2020-06-03
20:28:46.600490378 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.3592/kmod.changes 2020-07-29
17:14:09.944245226 +0200
@@ -1,0 +2,16 @@
+Tue Jul 7 13:05:53 UTC 2020 - Jan Engelhardt
+
+- Drop old RPM constructs from the build recipe.
+
+---
+Fri Jul 3 11:36:22 UTC 2020 - Michal Suchanek
+
+- Drop kmod-compat (boo#1173353):
+ The symlinks in kmod-compat are not obsolete. They are
+ desirable for kernel module autoload. The "kernel.modprobe"
+ sysctl references /sbin/modprobe, and changing it to
+ "/usr/bin/kmod load" is not possible, because this sysctl
+ specifies a single executable, not a command (so spaces will be
+ treated as part of the filename).
+
+---
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.B8VEOO/_old 2020-07-29 17:14:10.816245901 +0200
+++ /var/tmp/diff_new_pack.B8VEOO/_new 2020-07-29 17:14:10.816245901 +0200
@@ -35,7 +35,6 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: kernel-default-devel
++ kmod.spec ++
--- /var/tmp/diff_new_pack.B8VEOO/_old 2020-07-29 17:14:10.840245919 +0200
+++ /var/tmp/diff_new_pack.B8VEOO/_new 2020-07-29 17:14:10.840245919 +0200
@@ -35,7 +35,6 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libopenssl-devel >= 1.1.0
@@ -45,7 +44,12 @@
BuildRequires: pkgconfig(liblzma) >= 4.99
BuildRequires: pkgconfig(zlib)
Requires(post): coreutils
-Conflicts: kmod-compat < 25
+Obsoletes: kmod-compat < %version-%release
+Provides: kmod-compat = %version-%release
+Requires: suse-module-tools
+Obsoletes: module-init-tools < 3.16
+Provides: module-init-tools = 3.16
+Provides: modutils
%description
kmod is a set of tools to handle common tasks with Linux kernel
@@ -65,23 +69,6 @@
%description bash-completion
Contains bash completion support for kmod utilities.
-%package compat
-Summary:Compat symlinks for kernel module utilities
-License:GPL-2.0-or-later
-Group: System/Kernel
-Requires: kmod = %version-%release
-Requires: suse-module-tools
-Obsoletes: module-init-tools < 3.16
-Provides: module-init-tools = 3.16
-Provides: modutils
-
-%description compat
-kmod is a set of tools to handle common tasks with Linux kernel
-modules like insert, remove, list, check properties, resolve
-dependencies and aliases.
-
-This package contains traditional name symlinks (lsmod, etc.)
-
%package -n %lname
Summary:Library to interact with Linux kernel modules
License:LGPL-2.1-or-later
@@ -147,7 +134,6 @@
%postun -n %lname -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%_bindir/kmod
%_bindir/lsmod
%_sbindir/depmod
@@ -157,31 +143,23 @@
%_sbindir/modprobe
%_sbindir/rmmod
%_mandir/man[58]/*.[58]*
+/bin/lsmod
+/sbin/depmod
+/sbin/insmod
+/sbin/lsmod
+/sbin/modinfo
+/sbin/modprobe
+/sbin/rmmod
%files bash-completion
-%defattr(-,root,root)
%_datadir/bash-completion/
%files -n %lname
-%defattr(-,root,root)
%_libdir/libkmod.so.2*
%files -n libkmod-devel
-%defattr(-,root,root)
%_includedir/*
%_libdir/pkgconfig/libkmod.pc
%_libdir/libkmod.so
-%files compat
-%defattr(-,root,root)
-# The very very old paths (UsrMerge)
-/bin/lsmod
-/sbin/depmod
-/sbin/insmod
-/sbin/lsmod
-/sbin/modinfo
-/sbin/modprobe
-/sbin/rmmod
-# EndUsrMerge
-
%changelog
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2020-06-03 20:28:37
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.3606 (New)
Package is "kmod"
Wed Jun 3 20:28:37 2020 rev:54 rq:809713 version:27
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2019-05-06
13:19:32.352286429 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.3606/kmod.changes 2020-06-03
20:28:46.600490378 +0200
@@ -1,0 +2,11 @@
+Wed May 27 23:31:52 UTC 2020 - Jan Engelhardt
+
+- 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.
+
+---
Old:
kmod-26.tar.sign
kmod-26.tar.xz
New:
kmod-27.tar.sign
kmod-27.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.N0Cl06/_old 2020-06-03 20:28:48.580496397 +0200
+++ /var/tmp/diff_new_pack.N0Cl06/_new 2020-06-03 20:28:48.584496408 +0200
@@ -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
++ kmod.spec ++
--- /var/tmp/diff_new_pack.N0Cl06/_old 2020-06-03 20:28:48.612496494 +0200
+++ /var/tmp/diff_new_pack.N0Cl06/_new 2020-06-03 20:28:48.616496506 +0200
@@ -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
++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++
--- /var/tmp/diff_new_pack.N0Cl06/_old 2020-06-03 20:28:48.648496603 +0200
+++ /var/tmp/diff_new_pack.N0Cl06/_new 2020-06-03 20:28:48.648496603 +0200
@@ -6,20 +6,20 @@
References: fate#316971
Patch-mainline: never
---
- Makefile.am | 4 +++-
- libkmod/libkmod-unsupported.c | 9 +
- libkmod/libkmod-unsupported.h | 8
- tools/modprobe.c | 8 +++-
+ Makefile.am |4 +++-
+ libkmod/libkmod-unsupported.c |9 +
+ libkmod/libkmod-unsupported.h |8
+ tools/modprobe.c |8 +++-
4 files changed, 27 insertions(+), 2 deletions(-)
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 @@
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 000..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 @@
+
+ config->block_unsupported = 0;
+}
-diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h
-new
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2019-05-06 13:19:09 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new.5148 (New) Package is "kmod" Mon May 6 13:19:09 2019 rev:53 rq:699853 version:26 Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-12-28 12:32:11.152094353 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.5148/kmod-testsuite.changes 2019-05-06 13:19:32.104285865 +0200 @@ -1,0 +2,29 @@ +Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek + +- Enable PKCS#7 signature parsing again - requires openssl +- Fix testsuite build - requires kernel-default-devel + +--- +Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 26 + * depmod now handles parallel invocations better by protecting +the temporary files being used. + * modprobe has a new --show-exports option. Under the hood, +this reads the .symtab and .strtab sections rather than +__versions so it shows useful data even if kernel is +configured without modversions (CONFIG_MODVERSIONS). + * modinfo supports PKCS#7 parsing by using openssl. +- Replaced the asn1c-based parser by an openssl-based PKCS + parser. +- Remove libkmod-signature-Fix-crash-when-module-signature-is.patch, + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch, + libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch + (not accepted upstream) +- Remove enum.patch, + depmod-Prevent-module-dependency-files-corruption-du.patch, + depmod-Prevent-module-dependency-files-missing-durin.patch, + depmod-shut-up-gcc-insufficinet-buffer-warning.patch + (accepted upstream) + +--- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2018-12-28 12:32:11.252094284 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.5148/kmod.changes 2019-05-06 13:19:32.352286429 +0200 @@ -1,0 +2,28 @@ +Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek + +- Enable PKCS#7 signature parsing again - requires openssl + +--- +Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 26 + * depmod now handles parallel invocations better by protecting +the temporary files being used. + * modprobe has a new --show-exports option. Under the hood, +this reads the .symtab and .strtab sections rather than +__versions so it shows useful data even if kernel is +configured without modversions (CONFIG_MODVERSIONS). + * modinfo supports PKCS#7 parsing by using openssl. +- Replaced the asn1c-based parser by an openssl-based PKCS + parser. +- Remove libkmod-signature-Fix-crash-when-module-signature-is.patch, + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch, + libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch + (not accepted upstream) +- Remove enum.patch, + depmod-Prevent-module-dependency-files-corruption-du.patch, + depmod-Prevent-module-dependency-files-missing-durin.patch, + depmod-shut-up-gcc-insufficinet-buffer-warning.patch + (accepted upstream) + +--- @@ -12 +40 @@ -- Remove enum padding constants, add enum.patch. +- Remove enum padding constants, add enum.patch (boo#1097869). Old: depmod-Prevent-module-dependency-files-corruption-du.patch depmod-Prevent-module-dependency-files-missing-durin.patch depmod-shut-up-gcc-insufficinet-buffer-warning.patch enum.patch kmod-25.tar.sign kmod-25.tar.xz libkmod-signature-Fix-crash-when-module-signature-is.patch libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch New: kmod-26.tar.sign kmod-26.tar.xz Other differences: -- ++ kmod-testsuite.spec ++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:35.452293492 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:35.472293538 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmod-testsuite # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,37 +18,28 @@ Name: kmod-testsuite %define lname libkmod2 -Version:25 +Version:26 Release:0 Summary:Testsuite of the kmod package License:LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Kernel -Url:
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-12-28 12:32:09
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.28833 (New)
Package is "kmod"
Fri Dec 28 12:32:09 2018 rev:52 rq:659771 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-04-16
12:43:26.373226487 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.28833/kmod-testsuite.changes
2018-12-28 12:32:11.152094353 +0100
@@ -1,0 +2,19 @@
+Fri Dec 7 14:55:21 UTC 2018 - Michal Suchanek
+
+- Fix module dependency file corruption on parallel invocation (bsc#1118629).
+- Add depmod-Prevent-module-dependency-files-corruption-du.patch
+- Add depmod-Prevent-module-dependency-files-missing-durin.patch
+- Add depmod-shut-up-gcc-insufficinet-buffer-warning.patch
+
+---
+Wed Jul 18 08:51:06 UTC 2018 - jeng...@inai.de
+
+- Remove enum padding constants, add enum.patch.
+
+---
+Fri Jun 8 21:37:14 UTC 2018 - vlad.bota...@gmail.com
+
+- allow 'modprobe -c' print the status of "allow_unsupported_modules" option.
+ Add 0012-modprobe-print-unsupported-status.patch
+
+---
@@ -5 +24 @@
- + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
+ Add libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2018-07-28
12:38:12.612173083 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.28833/kmod.changes 2018-12-28
12:32:11.252094284 +0100
@@ -1,0 +2,8 @@
+Fri Dec 7 14:55:21 UTC 2018 - Michal Suchanek
+
+- Fix module dependency file corruption on parallel invocation (bsc#1118629).
+- Add depmod-Prevent-module-dependency-files-corruption-du.patch
+- Add depmod-Prevent-module-dependency-files-missing-durin.patch
+- Add depmod-shut-up-gcc-insufficinet-buffer-warning.patch
+
+---
@@ -4 +12 @@
-- Add enum.patch.
+- Remove enum padding constants, add enum.patch.
@@ -10 +18 @@
- + 0012-modprobe-print-unsupported-status.patch
+ Add 0012-modprobe-print-unsupported-status.patch
@@ -16 +24 @@
- + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
+ Add libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
New:
depmod-Prevent-module-dependency-files-corruption-du.patch
depmod-Prevent-module-dependency-files-missing-durin.patch
depmod-shut-up-gcc-insufficinet-buffer-warning.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.vmAVoX/_old 2018-12-28 12:32:11.736093949 +0100
+++ /var/tmp/diff_new_pack.vmAVoX/_new 2018-12-28 12:32:11.736093949 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -38,6 +38,11 @@
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
+Patch8: 0012-modprobe-print-unsupported-status.patch
+Patch9: enum.patch
+Patch10:depmod-Prevent-module-dependency-files-missing-durin.patch
+Patch11:depmod-Prevent-module-dependency-files-corruption-du.patch
+Patch12:depmod-shut-up-gcc-insufficinet-buffer-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asn1c
BuildRequires: autoconf
@@ -62,7 +67,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
+%autopatch -p1
%build
autoreconf -fi
++ kmod.spec ++
--- /var/tmp/diff_new_pack.vmAVoX/_old 2018-12-28 12:32:11.752093938 +0100
+++ /var/tmp/diff_new_pack.vmAVoX/_new 2018-12-28 12:32:11.756093935 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -39,6 +39,9 @@
Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
Patch8: 0012-modprobe-print-unsupported-status.patch
Patch9: enum.patch
+Patch10:depmod-Prevent-module-dependency-files-missing-durin.patch
+Patch11:depmod-Prevent-module-dependency-files-corruption-du.patch
+Patch12:
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-07-28 12:38:04
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Sat Jul 28 12:38:04 2018 rev:51 rq:624075 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2018-06-22
13:13:52.330399714 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2018-07-28
12:38:12.612173083 +0200
@@ -1,0 +2,5 @@
+Wed Jul 18 08:51:06 UTC 2018 - jeng...@inai.de
+
+- Add enum.patch.
+
+---
New:
enum.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.3XijQA/_old 2018-07-28 12:38:13.412174619 +0200
+++ /var/tmp/diff_new_pack.3XijQA/_new 2018-07-28 12:38:13.416174627 +0200
@@ -38,6 +38,7 @@
Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
Patch8: 0012-modprobe-print-unsupported-status.patch
+Patch9: enum.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asn1c
BuildRequires: autoconf
@@ -110,7 +111,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -p1
+%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -p1
%build
autoreconf -fi
++ enum.patch ++
>From d5840458e01184e068a0226ec636cb1a454a1386 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt
Date: Wed, 18 Jul 2018 10:39:12 +0200
Subject: [PATCH] libkmod: drop _PAD enum constants
When are enums ever mapped to something smaller than int, other than
willful packing into a bitfield?
[Remove it until there is a better reasoning for its existence.]
---
libkmod/libkmod.h | 4
1 file changed, 4 deletions(-)
diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h
index 352627e..4fb5ba8 100644
--- a/libkmod/libkmod.h
+++ b/libkmod/libkmod.h
@@ -71,8 +71,6 @@ enum kmod_index {
KMOD_INDEX_MODULES_ALIAS,
KMOD_INDEX_MODULES_SYMBOL,
KMOD_INDEX_MODULES_BUILTIN,
- /* Padding to make sure enum is not mapped to char */
- _KMOD_INDEX_PAD = (1 << 31),
};
int kmod_dump_index(struct kmod_ctx *ctx, enum kmod_index type, int fd);
@@ -210,8 +208,6 @@ enum kmod_module_initstate {
KMOD_MODULE_LIVE,
KMOD_MODULE_COMING,
KMOD_MODULE_GOING,
- /* Padding to make sure enum is not mapped to char */
- _KMOD_MODULE_PAD = (1 << 31),
};
const char *kmod_module_initstate_str(enum kmod_module_initstate state);
int kmod_module_get_initstate(const struct kmod_module *mod);
--
2.18.0
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-06-22 13:13:50
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Fri Jun 22 13:13:50 2018 rev:50 rq:616225 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2018-04-16
12:43:26.485222411 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2018-06-22
13:13:52.330399714 +0200
@@ -1,0 +2,6 @@
+Fri Jun 8 21:37:14 UTC 2018 - vlad.bota...@gmail.com
+
+- allow 'modprobe -c' print the status of "allow_unsupported_modules" option.
+ + 0012-modprobe-print-unsupported-status.patch
+
+---
@@ -88,0 +95,6 @@
+Thu Jul 21 09:37:54 UTC 2016 - mma...@suse.com
+
+- Regenerate initrd on kmod update (bsc#989788)
+- Sync specfile with openSUSE:Factory
+
+---
@@ -126 +138 @@
-
+* includes 0001-Fix-race-while-loading-modules.patch (bsc#998906)
@@ -196,0 +209,8 @@
+Fri Apr 11 07:27:16 UTC 2014 - mma...@suse.cz
+
+- testsutie: Uncompress most modules (updated test-files.tar.xz)
+- testsuite: Do not run tests with *.ko.gz if zlib is not enabled
+- Disable compression support, as other tools do not support it
+ (e.g. module signing)
+
+---
@@ -215,0 +236,12 @@
+---
+Tue Apr 1 13:01:28 UTC 2014 - mma...@suse.cz
+
+- libkmod: Ignore errors from softdeps (bnc#831227)
+- config: also parse softdeps from modules (bnc#831227)
+
+---
+Mon Mar 31 16:14:58 UTC 2014 - mma...@suse.cz
+
+- libkmod-config,depmod: Accept special files as configuration
+ files, too
+- libkmod-config: Only match dot before '=' in /proc/cmdline
New:
0012-modprobe-print-unsupported-status.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.LjQGub/_old 2018-06-22 13:13:53.962339198 +0200
+++ /var/tmp/diff_new_pack.LjQGub/_new 2018-06-22 13:13:53.966339050 +0200
@@ -37,6 +37,7 @@
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
+Patch8: 0012-modprobe-print-unsupported-status.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asn1c
BuildRequires: autoconf
@@ -109,7 +110,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
+%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -p1
%build
autoreconf -fi
++ 0012-modprobe-print-unsupported-status.patch ++
>From 7e04a4a70e514aec5ed2328cb0a2d48bf6408197 Mon Sep 17 00:00:00 2001
From: Vlad Bespalov
Date: Fri, 8 Jun 2018 21:13:00 +
Subject: [PATCH] modprobe: print status of "allow_unsupported_modules"
variable
In SLES11 modprobe printed everything referenced in /etc/modprobe.d
in SLES12 config parsing changed to explicitly find and print
specific groups of modprobe options, which did not print
the status of "allow_unsupported_modules" option when running
modprobe -c
The proposed patch fixes this deficiency
Patch-mainline: never
---
libkmod/libkmod-config.c | 13 +
libkmod/libkmod.h| 1 +
tools/modprobe.c | 5 +
3 files changed, 19 insertions(+)
diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 550a612..0fc2250 100644
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -1008,6 +1008,19 @@ static struct kmod_config_iter
*kmod_config_iter_new(const struct kmod_ctx* ctx,
* @short_description: retrieve current libkmod configuration
*/
+/*
+ * kmod_config_unsupported_allowed:
+ * @ctx: kmod library context
+ *
+ * Retrieve status of unsupported modules
+ */
+KMOD_EXPORT bool kmod_config_unsupported_allowed(const struct kmod_ctx *ctx)
+{
+ struct kmod_config *config = (struct kmod_config *)kmod_get_config(ctx);
+
+ return !config->block_unsupported;
+}
+
/**
* kmod_config_get_blacklists:
* @ctx: kmod library context
diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h
index f9e33c6..0ae8ab3 100644
--- a/libkmod/libkmod.h
+++ b/libkmod/libkmod.h
@@ -115,6 +115,7 @@ const char *kmod_config_iter_get_key(const struct
kmod_config_iter *iter);
const char *kmod_config_iter_get_value(const struct kmod_config_iter *iter);
bool kmod_config_iter_next(struct kmod_config_iter *iter);
void kmod_config_iter_free_iter(struct kmod_config_iter *iter);
+bool
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-04-16 12:43:24
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Mon Apr 16 12:43:24 2018 rev:49 rq:595282 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-03-26
12:02:08.912796271 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2018-04-16
12:43:26.373226487 +0200
@@ -1,0 +2,6 @@
+Fri Apr 6 10:43:42 UTC 2018 - msucha...@suse.com
+
+- Fix crash when PKCS#7 signer name is not present in signature (bsc#1088244)
+ + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
+
+---
kmod.changes: same change
New:
libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.M9p8Dx/_old 2018-04-16 12:43:27.225195485 +0200
+++ /var/tmp/diff_new_pack.M9p8Dx/_new 2018-04-16 12:43:27.225195485 +0200
@@ -37,6 +37,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
+Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asn1c
BuildRequires: autoconf
@@ -61,7 +62,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
%build
autoreconf -fi
++ kmod.spec ++
--- /var/tmp/diff_new_pack.M9p8Dx/_old 2018-04-16 12:43:27.245194757 +0200
+++ /var/tmp/diff_new_pack.M9p8Dx/_new 2018-04-16 12:43:27.245194757 +0200
@@ -36,6 +36,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
+Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asn1c
BuildRequires: autoconf
@@ -108,7 +109,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
%build
autoreconf -fi
++ libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch ++
>From 22afe9ca4bd26287554f282cbed9a367deb77186 Mon Sep 17 00:00:00 2001
From: Michal Suchanek
Date: Fri, 6 Apr 2018 12:36:41 +0200
Subject: [PATCH] libkmod-signature: pkcs#7: fix crash when signer info is not
present.
Reported-by: Kazuya Saito
Signed-off-by: Michal Suchanek
---
libkmod/libkmod-signature.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index fae074e6dd1d..782e96f69fef 100644
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -166,7 +166,7 @@ kmod_module_signature_info_pkcs7(const char *mem,
sig_info->key_id_len = cert->key_id_size;
sig_info->signer = cert->signer;
- sig_info->signer_len = strlen(cert->signer);
+ sig_info->signer_len = cert->signer ? strlen(cert->signer) : 0;
sig_info->algo = NULL;
sig_info->hash_algo = cert->hash_algo;
--
2.13.6
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-03-26 12:02:04
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Mon Mar 26 12:02:04 2018 rev:48 rq:589122 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-03-12
12:02:34.603119863 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2018-03-26
12:02:08.912796271 +0200
@@ -1,0 +2,6 @@
+Fri Mar 16 13:08:14 CET 2018 - r...@suse.de
+
+- for sle, buildexclude the 32bit platforms in kmod-testsuite,
+ they have no kernel binaries anyway (bnc#1085640)
+
+---
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2018-03-12
12:02:34.643118429 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2018-03-26
12:02:10.364743889 +0200
@@ -1,0 +2,6 @@
+Fri Mar 16 13:08:14 CET 2018 - r...@suse.de
+
+- for sle, buildexclude the 32bit platforms in kmod-testsuite,
+ they have no kernel binaries anyway (bnc#1085640)
+
+---
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.JaqU06/_old 2018-03-26 12:02:11.784692660 +0200
+++ /var/tmp/diff_new_pack.JaqU06/_new 2018-03-26 12:02:11.792692372 +0200
@@ -49,6 +49,9 @@
BuildRequires: pkgconfig(liblzma) >= 4.99
BuildRequires: pkgconfig(zlib)
Requires: suse-module-tools
+%if !0%{?is_opensuse}
+ExcludeArch:%ix86 s390
+%endif
%define kdir /usr/src/linux-obj/%_target_cpu/default
%description
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-03-12 12:02:00
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Mon Mar 12 12:02:00 2018 rev:47 rq:584632 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-02-06
16:41:38.101179281 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2018-03-12
12:02:34.603119863 +0100
@@ -1,0 +2,8 @@
+Thu Mar 8 16:34:16 UTC 2018 - msucha...@suse.com
+
+- Fix PKCS#7 signature display in modinfo (bsc#1077693).
+ * Add libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch
+ * Add libkmod-signature-Fix-crash-when-module-signature-is.patch
+ * Refresh 0010-modprobe-Implement-allow-unsupported-modules.patch
+
+---
kmod.changes: same change
New:
libkmod-signature-Fix-crash-when-module-signature-is.patch
libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.lS7LGX/_old 2018-03-12 12:02:35.599084171 +0100
+++ /var/tmp/diff_new_pack.lS7LGX/_new 2018-03-12 12:02:35.603084028 +0100
@@ -21,7 +21,7 @@
Version:25
Release:0
Summary:Testsuite of the kmod package
-License:LGPL-2.1+ and GPL-2.0+
+License:LGPL-2.1-or-later AND GPL-2.0-or-later
Group: System/Kernel
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/664801/
@@ -30,12 +30,15 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz
Source2:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign
+Patch0: libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch
Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: asn1c
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: git-core
@@ -55,7 +58,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%build
autoreconf -fi
@@ -68,6 +71,7 @@
--includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \
--bindir="%_bindir"
+make -C libkmod/pkcs7/asn1c-gen regen
make %{?_smp_mflags} V=1 KDIR="%kdir"
%install
++ kmod.spec ++
--- /var/tmp/diff_new_pack.lS7LGX/_old 2018-03-12 12:02:35.631083025 +0100
+++ /var/tmp/diff_new_pack.lS7LGX/_new 2018-03-12 12:02:35.643082595 +0100
@@ -21,7 +21,7 @@
Version:25
Release:0
Summary:Utilities to load modules into the kernel
-License:LGPL-2.1+ and GPL-2.0+
+License:LGPL-2.1-or-later AND GPL-2.0-or-later
Group: System/Kernel
Url:https://www.kernel.org/pub/linux/utils/kernel/kmod/
@@ -29,12 +29,15 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz
Source2:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign
+Patch0: libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch
Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: asn1c
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -57,7 +60,7 @@
%package bash-completion
Summary:Bash completion routines for the kmod utilities
-License:LGPL-2.1+ and GPL-2.0+
+License:LGPL-2.1-or-later AND GPL-2.0-or-later
Group: System/Shells
BuildArch: noarch
@@ -66,7
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2018-02-06 16:41:34
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Tue Feb 6 16:41:34 2018 rev:46 rq:572302 version:25
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2017-07-12
19:30:28.695160565 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2018-02-06
16:41:38.101179281 +0100
@@ -1,0 +2,5 @@
+Thu Feb 1 13:49:25 UTC 2018 - msucha...@suse.com
+
+- Update to kmod v25
+
+---
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-12-09
20:25:44.734528653 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2018-02-06
16:41:38.277171045 +0100
@@ -1,0 +2,7 @@
+Thu Feb 1 13:49:25 UTC 2018 - msucha...@suse.com
+
+- Update to kmod v25
+ * Fix resolving symbols with MODULE_REL_CRCS (bsc#1077867)
+- Drop depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
+
+---
Old:
depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
kmod-24.tar.sign
kmod-24.tar.xz
New:
kmod-25.tar.sign
kmod-25.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.BI5EXq/_old 2018-02-06 16:41:39.085133235 +0100
+++ /var/tmp/diff_new_pack.BI5EXq/_new 2018-02-06 16:41:39.089133048 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod-testsuite
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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:24
+Version:25
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
++ kmod.spec ++
--- /var/tmp/diff_new_pack.BI5EXq/_old 2018-02-06 16:41:39.105132299 +0100
+++ /var/tmp/diff_new_pack.BI5EXq/_new 2018-02-06 16:41:39.109132112 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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:24
+Version:25
Release:0
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
@@ -34,7 +34,6 @@
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
-Patch6: depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -45,7 +44,7 @@
BuildRequires: pkgconfig(liblzma) >= 4.99
BuildRequires: pkgconfig(zlib)
Requires(post): coreutils
-Conflicts: kmod-compat < 24
+Conflicts: kmod-compat < %version
%description
kmod is a set of tools to handle common tasks with Linux kernel
@@ -95,7 +94,7 @@
Summary:Development files for libkmod
License:LGPL-2.1+
Group: Development/Libraries/C and C++
-Requires: %lname = %{version}
+Requires: %lname = %version
%description -n libkmod-devel
libkmod was created to allow programs to easily insert, remove and
@@ -106,7 +105,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%build
autoreconf -fi
++ kmod-24.tar.xz -> kmod-25.tar.xz ++
13638 lines of diff (skipped)
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2017-12-09 20:25:40
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Sat Dec 9 20:25:40 2017 rev:45 rq:555182 version:24
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-12-01
15:53:28.920374179 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-12-09
20:25:44.734528653 +0100
@@ -1,0 +2,6 @@
+Thu Dec 7 12:56:32 UTC 2017 - msucha...@suse.com
+
+- Fix resolving .TOC. in modules on 4.4 and older kernel (bsc#1070209)
+ depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
+
+---
New:
depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.A9gp0r/_old 2017-12-09 20:25:45.546489978 +0100
+++ /var/tmp/diff_new_pack.A9gp0r/_new 2017-12-09 20:25:45.550489788 +0100
@@ -34,6 +34,7 @@
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6: depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -105,7 +106,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%build
autoreconf -fi
++ depmod-Don-t-add-.TOC.-when-it-s-in-the-kernel.patch ++
>From d43ed9df0c22aa06b254b86dcf6dfbad04699242 Mon Sep 17 00:00:00 2001
From: Michal Suchanek
Date: Thu, 7 Dec 2017 13:51:31 +0100
Subject: [PATCH] depmod: Don't add .TOC. when it's in the kernel.
References: bsc#1070209
d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol") adds fake
.TOC. unconditionally but when there is .TOC. in the kernel adding the
fake one breaks resolving .TOC.
Fixes: d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol")
Signed-off-by: Michal Suchanek
---
tools/depmod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/depmod.c b/tools/depmod.c
index 7ff3e9ed191e..9db602d76ee4 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2480,7 +2480,8 @@ static void depmod_add_fake_syms(struct depmod *depmod)
/* On S390, this is faked up too */
depmod_symbol_add(depmod, "_GLOBAL_OFFSET_TABLE_", true, 0, NULL);
/* On PowerPC64 ABIv2, .TOC. is more or less _GLOBAL_OFFSET_TABLE_ */
- depmod_symbol_add(depmod, "TOC.", true, 0, NULL);
+ if (!depmod_symbol_find(depmod, "TOC."))
+ depmod_symbol_add(depmod, "TOC.", true, 0, NULL);
}
static int depmod_load_symvers(struct depmod *depmod, const char *filename)
--
2.13.6
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2017-12-01 15:53:28 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is "kmod" Fri Dec 1 15:53:28 2017 rev:44 rq:546550 version:24 Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-11-23 09:40:37.688802974 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-12-01 15:53:28.920374179 +0100 @@ -64 +64 @@ -- Fix kernel master build for ppc64le +- Fix kernel master build for ppc64le (bsc#1070209) Other differences: -- kmod.spec: same change
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2017-11-23 09:40:23 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is "kmod" Thu Nov 23 09:40:23 2017 rev:43 rq:543991 version:24 Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-10-17 01:49:28.870970661 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-11-23 09:40:37.688802974 +0100 @@ -1,0 +2,5 @@ +Mon Nov 20 14:34:59 UTC 2017 - msucha...@suse.com + +- Move dependency on suse-module-tools to kmod-compat (bsc#1047911). + +--- Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.HtRVE2/_old 2017-11-23 09:40:39.620732487 +0100 +++ /var/tmp/diff_new_pack.HtRVE2/_new 2017-11-23 09:40:39.624732341 +0100 @@ -44,7 +44,6 @@ BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) Requires(post): coreutils -Requires: suse-module-tools Conflicts: kmod-compat < 24 %description @@ -70,6 +69,7 @@ License:GPL-2.0+ Group: System/Kernel Requires: kmod = %version-%release +Requires: suse-module-tools Obsoletes: module-init-tools < 3.16 Provides: module-init-tools = 3.16 Provides: modutils
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2017-10-17 01:49:25 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is "kmod" Tue Oct 17 01:49:25 2017 rev:42 rq:533088 version:24 Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-08-12 19:32:27.676371457 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-10-17 01:49:28.870970661 +0200 @@ -1,0 +2,5 @@ +Mon Aug 28 13:42:33 UTC 2017 - mma...@suse.com + +- Add missing coreutils dependency for initrd macros (bsc#1055492). + +--- Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.djkHKP/_old 2017-10-17 01:49:30.214907692 +0200 +++ /var/tmp/diff_new_pack.djkHKP/_new 2017-10-17 01:49:30.214907692 +0200 @@ -43,6 +43,7 @@ BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) +Requires(post): coreutils Requires: suse-module-tools Conflicts: kmod-compat < 24
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2017-08-12 19:32:23 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is "kmod" Sat Aug 12 19:32:23 2017 rev:41 rq:514061 version:24 Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2017-07-12 19:30:28.719157180 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-08-12 19:32:27.676371457 +0200 @@ -1,0 +2,5 @@ +Wed Jul 26 13:27:59 UTC 2017 - jeng...@inai.de + +- Add versioned requires between kmod-compat -> kmod + +--- Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.jZS7bU/_old 2017-08-12 19:32:29.708086565 +0200 +++ /var/tmp/diff_new_pack.jZS7bU/_new 2017-08-12 19:32:29.716085443 +0200 @@ -44,6 +44,7 @@ BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) Requires: suse-module-tools +Conflicts: kmod-compat < 24 %description kmod is a set of tools to handle common tasks with Linux kernel @@ -67,7 +68,7 @@ Summary:Compat symlinks for kernel module utilities License:GPL-2.0+ Group: System/Kernel -Requires: kmod +Requires: kmod = %version-%release Obsoletes: module-init-tools < 3.16 Provides: module-init-tools = 3.16 Provides: modutils
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2017-07-12 19:30:27
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Wed Jul 12 19:30:27 2017 rev:40 rq:508706 version:24
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2016-11-24
21:18:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2017-07-12
19:30:28.695160565 +0200
@@ -1,0 +2,15 @@
+Thu Jul 6 08:07:50 UTC 2017 - jeng...@inai.de
+
+- Update to new upstream release 24
+ * libkmod: fix use of strcpy
+ * depmod: fix string overflow
+ * depmod: ignore related modules in depmod_report_cycles
+ * libkmod: Fix handling of quotes in kernel command line
+ * libkmod-config: replace 0/1 with bool
+ * depmod: handle nested loops
+- Drop 0001-use-correct-sort-method-in-test-array.patch,
+ 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch,
+ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
+ (applied upstream)
+
+---
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2016-11-24
21:18:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2017-07-12
19:30:28.719157180 +0200
@@ -1,0 +2,19 @@
+Thu Jul 6 08:07:50 UTC 2017 - jeng...@inai.de
+
+- Update to new upstream release 24
+ * libkmod: fix use of strcpy
+ * depmod: fix string overflow
+ * depmod: ignore related modules in depmod_report_cycles
+ * libkmod: Fix handling of quotes in kernel command line
+ * libkmod-config: replace 0/1 with bool
+ * depmod: handle nested loops
+- Drop 0001-use-correct-sort-method-in-test-array.patch,
+ 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch,
+ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
+ (applied upstream)
+- Remove support for openSUSE < 13.2 (non-dracut mkinitrd)
+- Separate bash completion functions into extra package
+- Move some of the symlinks from kmod-compat to kmod,
+ as kmod still does not have native support for all functions.
+
+---
Old:
0001-testsuite-depmod-add-module-dependency-outside-cycli.patch
0001-use-correct-sort-method-in-test-array.patch
0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch
kmod-23.tar.sign
kmod-23.tar.xz
New:
kmod-24.tar.sign
kmod-24.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.bNd0qz/_old 2017-07-12 19:30:29.363066328 +0200
+++ /var/tmp/diff_new_pack.bNd0qz/_new 2017-07-12 19:30:29.367065764 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kmod-testsuite
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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:23
+Version:24
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
@@ -28,16 +28,13 @@
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
-Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz
-Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign
+Source:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz
+Source2:
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign
Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
-Patch7: 0001-use-correct-sort-method-in-test-array.patch
-Patch8: 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch
-Patch9: 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -46,13 +43,8 @@
BuildRequires: libtool
BuildRequires: pkgconfig >= 0.21
BuildRequires: xz
-%if 0%{?sles_version} == 11
-BuildRequires: xz-devel >= 4.99
-BuildRequires: zlib-devel
-%else
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2016-11-24 21:18:51
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2016-04-06
11:50:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2016-11-24
21:18:52.0 +0100
@@ -1,0 +2,7 @@
+Tue Nov 22 09:13:47 UTC 2016 - yousaf.kau...@suse.com
+
+- 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch:
+ Add test case where cyclic and non-cyclic dependencies are present
+ at the same time. (boo#1008186)
+
+---
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2016-07-28
23:44:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2016-11-24
21:18:52.0 +0100
@@ -1,0 +2,7 @@
+Tue Nov 22 09:10:54 UTC 2016 - yousaf.kau...@suse.com
+
+- 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch:
+ Fix buffer overflow when printing modules in cyclic dependency
+ chain (boo#1008186)
+
+---
New:
0001-testsuite-depmod-add-module-dependency-outside-cycli.patch
0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.TPrMB1/_old 2016-11-24 21:18:53.0 +0100
+++ /var/tmp/diff_new_pack.TPrMB1/_new 2016-11-24 21:18:53.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod-testsuite
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
+Patch8: 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch
+Patch9: 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -61,7 +63,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
%build
autoreconf -fi
++ kmod.spec ++
--- /var/tmp/diff_new_pack.TPrMB1/_old 2016-11-24 21:18:53.0 +0100
+++ /var/tmp/diff_new_pack.TPrMB1/_new 2016-11-24 21:18:53.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,8 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
+Patch8: 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch
+Patch9: 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -100,7 +102,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
%build
autoreconf -fi
++ 0001-testsuite-depmod-add-module-dependency-outside-cycli.patch ++
>From 965886b55ab2f80fc242c1bc7e92423c87424718 Mon Sep 17 00:00:00 2001
From: Mian Yousaf Kaukab
Date: Tue, 8 Nov 2016 17:45:49 +0100
Subject: [PATCH 1/2] testsuite: depmod: add module dependency outside cyclic
chain
Check that depmod do not report modules outside cyclic chain
Two modules f and g are added which do not have any dependency.
modules a and b are made dependent on f and g.
Here is the output of loop dependency check test after adding this
patch:
TESTSUITE: ERR: wrong:
depmod: ERROR: Found 7 modules in dependency cycles!
depmod: ERROR: Cycle detected: mod_loop_d -> mod_loop_e -> mod_loop_d
depmod: ERROR: Cycle detected: mod_loop_b -> mod_loop_c -> mod_loop_a ->
mod_loop_b
depmod: ERROR: Cycle detected: mod_loop_b -> mod_loop_c -> mod_loop_a ->
mod_loop_g
depmod: ERROR: Cycle detected:
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2016-07-28 23:44:15
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2016-07-10
18:46:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2016-07-28
23:44:18.0 +0200
@@ -1,0 +2,13 @@
+Thu Jul 21 09:56:02 UTC 2016 - jeng...@inai.de
+
+- Update to new upstream release 23
+* Don't add comment to modules.devname if it would otherwise be
+ empty.
+* Ignore .TOC. symbols in depmod parsing.
+* Fix crash on modinfo while checking for available signature of
+ unknown type.
+* Teach modinfo about PKCS#7 module signatures.
+- Drop depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch (merged),
+ 0001-libkmod-Handle-long-lines-in-proc-modules.patch (merged)
+
+---
Old:
0001-libkmod-Handle-long-lines-in-proc-modules.patch
depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
kmod-22.tar.sign
kmod-22.tar.xz
New:
kmod-23.tar.sign
kmod-23.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.IK873y/_old 2016-07-28 23:44:19.0 +0200
+++ /var/tmp/diff_new_pack.IK873y/_new 2016-07-28 23:44:19.0 +0200
@@ -18,7 +18,7 @@
Name: kmod-testsuite
%define lname libkmod2
-Version:22
+Version:23
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
@@ -36,8 +36,6 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
-Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
-Patch9: 0001-libkmod-Handle-long-lines-in-proc-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -63,7 +61,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
%build
autoreconf -fi
++ kmod.spec ++
--- /var/tmp/diff_new_pack.IK873y/_old 2016-07-28 23:44:19.0 +0200
+++ /var/tmp/diff_new_pack.IK873y/_new 2016-07-28 23:44:19.0 +0200
@@ -18,13 +18,12 @@
Name: kmod
%define lname libkmod2
-Version:22
+Version:23
Release:0
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
-#Announce: https://lwn.net/Articles/664801/
+Url:https://www.kernel.org/pub/linux/utils/kernel/kmod/
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
@@ -36,8 +35,6 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
-Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
-Patch9: 0001-libkmod-Handle-long-lines-in-proc-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -103,7 +100,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
%build
autoreconf -fi
@@ -122,40 +119,40 @@
make %{?_smp_mflags} V=1
%install
-b="%buildroot";
-make install DESTDIR="$b";
+b="%buildroot"
+%make_install
rm -f "$b/%_libdir"/*.la
-mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin";
+mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin"
for i in depmod insmod lsmod modinfo modprobe rmmod; do
#
# kmod-compat and kmod-compat(usrmerge)
#
- ln -s "%_bindir/kmod" "$b/%_sbindir/$i";
- ln -s "%_bindir/kmod" "$b/sbin/$i";
+ ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
+ ln -s "%_bindir/kmod" "$b/sbin/$i"
#
# Make symlinks also available in normal fashion,
# so one can actually run it.
#
- ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i";
-done;
-mkdir -p "$b/%_bindir" "$b/bin";
+ ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i"
+done
+mkdir -p "$b/%_bindir" "$b/bin"
for i in lsmod; do
- ln -s "%_bindir/kmod" "$b/%_bindir/$i";
- ln -s "%_bindir/kmod" "$b/bin/$i";
-done;
+
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2016-07-10 18:46:20
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2016-02-18
12:35:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2016-07-10
18:46:21.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 15:18:29 UTC 2016 - mma...@suse.cz
+
+- libkmod: Handle long lines in /proc/modules (bsc#983754)
+ 0001-libkmod-Handle-long-lines-in-proc-modules.patch
+
+---
New:
0001-libkmod-Handle-long-lines-in-proc-modules.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.tJ3suf/_old 2016-07-10 18:46:22.0 +0200
+++ /var/tmp/diff_new_pack.tJ3suf/_new 2016-07-10 18:46:22.0 +0200
@@ -36,6 +36,8 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
+Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
+Patch9: 0001-libkmod-Handle-long-lines-in-proc-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -61,7 +63,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
%build
autoreconf -fi
++ kmod.spec ++
--- /var/tmp/diff_new_pack.tJ3suf/_old 2016-07-10 18:46:22.0 +0200
+++ /var/tmp/diff_new_pack.tJ3suf/_new 2016-07-10 18:46:22.0 +0200
@@ -37,6 +37,7 @@
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
+Patch9: 0001-libkmod-Handle-long-lines-in-proc-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -102,7 +103,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 -P 8 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -P 8 -P 9 -p1
%build
autoreconf -fi
++ 0001-libkmod-Handle-long-lines-in-proc-modules.patch ++
>From d1a89109faebc3db7e01d10fb8ac6f9dd2332a8f Mon Sep 17 00:00:00 2001
From: Michal Marek
Date: Thu, 16 Jun 2016 09:18:52 +0200
Subject: [PATCH] libkmod: Handle long lines in /proc/modules
Patch-mainline: Submitted to linux-modu...@vger.kernel.org on 2016-06-17
References: bsc#983754
kmod_module_new_from_loaded() calls fgets with a 4k buffer. When a
module such as usbcore is used by too many modules, the rest of the line
is considered a beginning of another lines and we eventually get errors
like these from lsmod:
libkmod: kmod_module_get_holders: could not open '/sys/module/100,/holders': No
such file or directory
together with bogus entries in the output. In kmod_module_get_size, the
problem does not affect functionality, but the line numbers in error
messages will be wrong.
Signed-off-by: Michal Marek
---
I wrote a test case for this as well, but it is failing because the
testsuite itself has problems with output larger than 4k. I'll send
something later.
Also, the buffer could be shrinked now, so that we do not use that much
space on stack. Not sure if this is of interest or not. I left it as is.
Michal
---
libkmod/libkmod-module.c | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 1460c6746cc4..25dcda7667b7 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -1660,13 +1660,14 @@ KMOD_EXPORT int kmod_module_new_from_loaded(struct
kmod_ctx *ctx,
struct kmod_module *m;
struct kmod_list *node;
int err;
+ size_t len = strlen(line);
char *saveptr, *name = strtok_r(line, " \t", );
err = kmod_module_new_from_name(ctx, name, );
if (err < 0) {
ERR(ctx, "could not get module from name '%s': %s\n",
name, strerror(-err));
- continue;
+ goto eat_line;
}
node = kmod_list_append(l, m);
@@ -1676,6 +1677,9 @@ KMOD_EXPORT int kmod_module_new_from_loaded(struct
kmod_ctx *ctx,
ERR(ctx, "out of memory\n");
kmod_module_unref(m);
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2016-04-06 11:50:47 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is "kmod" Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2015-12-18 21:51:48.0 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2016-04-06 11:50:48.0 +0200 @@ -1,0 +2,5 @@ +Thu Mar 31 16:53:28 UTC 2016 - norm...@linux.vnet.ibm.com + +- Ignore make check error of ppc64 architecture, bypass boo#897845 + +--- Other differences: -- ++ kmod-testsuite.spec ++ --- /var/tmp/diff_new_pack.4jnApN/_old 2016-04-06 11:50:49.0 +0200 +++ /var/tmp/diff_new_pack.4jnApN/_new 2016-04-06 11:50:49.0 +0200 @@ -83,6 +83,10 @@ # empty %check +%ifarch ppc64 +make check V=1 KDIR="%kdir" || echo "Warning: bypass boo#897845" +%else make check V=1 KDIR="%kdir" +%endif %changelog
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2016-02-18 11:05:55
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2015-12-18
21:51:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2016-02-18
12:35:34.0 +0100
@@ -1,0 +2,6 @@
+Tue Feb 9 15:15:56 UTC 2016 - dval...@suse.com
+
+- Fix kernel master build for ppc64le
+ depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
+
+---
New:
depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.juh1Lq/_old 2016-02-18 12:35:35.0 +0100
+++ /var/tmp/diff_new_pack.juh1Lq/_new 2016-02-18 12:35:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod-testsuite
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ kmod.spec ++
--- /var/tmp/diff_new_pack.juh1Lq/_old 2016-02-18 12:35:35.0 +0100
+++ /var/tmp/diff_new_pack.juh1Lq/_new 2016-02-18 12:35:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
+Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -101,7 +102,7 @@
%prep
%setup -q -n kmod-%version
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 -P 8 -p1
%build
autoreconf -fi
++ depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch ++
Subject: [PATCH] depmod: Ignore PowerPC64 ABIv2 .TOC. symbo
The .TOC. symbol on the PowerPC64 ABIv2 identifies the GOT
pointer, similar to how other architectures use _GLOBAL_OFFSET_TABLE_.
This is not a symbol that needs relocation, and should be ignored
by depmod.
---
tools/depmod.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/depmod.c b/tools/depmod.c
index 6e9bb4d..a2e07c1 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2153,6 +2153,8 @@ static void depmod_add_fake_syms(struct depmod *depmod)
depmod_symbol_add(depmod, "__this_module", true, 0, NULL);
/* On S390, this is faked up too */
depmod_symbol_add(depmod, "_GLOBAL_OFFSET_TABLE_", true, 0, NULL);
+ /* On PowerPC64 ABIv2, .TOC. is more or less _GLOBAL_OFFSET_TABLE_ */
+ depmod_symbol_add(depmod, "TOC.", true, 0, NULL);
}
static int depmod_load_symvers(struct depmod *depmod, const char *filename)
--
2.5.0
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-12-18 21:51:47
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2015-11-18
22:31:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2015-12-18
21:51:48.0 +0100
@@ -1,0 +2,7 @@
+Mon Dec 7 14:27:13 UTC 2015 - jeng...@inai.de
+
+- Update to new upstream release 22
+* support `insmod -f`
+* depmod: do not fall back to uname on bad version
+
+---
kmod.changes: same change
Old:
kmod-21.tar.sign
kmod-21.tar.xz
New:
kmod-22.tar.sign
kmod-22.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.HY5PfN/_old 2015-12-18 21:51:49.0 +0100
+++ /var/tmp/diff_new_pack.HY5PfN/_new 2015-12-18 21:51:49.0 +0100
@@ -18,13 +18,13 @@
Name: kmod-testsuite
%define lname libkmod2
-Version:21
+Version:22
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
-#Announce: https://lkml.org/lkml/2015/3/1/152
+#Announce: https://lwn.net/Articles/664801/
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
++ kmod.spec ++
--- /var/tmp/diff_new_pack.HY5PfN/_old 2015-12-18 21:51:49.0 +0100
+++ /var/tmp/diff_new_pack.HY5PfN/_new 2015-12-18 21:51:49.0 +0100
@@ -18,13 +18,13 @@
Name: kmod
%define lname libkmod2
-Version:21
+Version:22
Release:0
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
-#Announce: https://lkml.org/lkml/2015/3/1/152
+#Announce: https://lwn.net/Articles/664801/
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
@@ -150,9 +150,10 @@
#
mkdir -p "$b"/{bin,sbin,%_lib};
ln -s "%_bindir/kmod" "$b/bin/";
+ls -l "$b/%_libdir/"
%if "%_libdir" != "/%_lib"
ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
-ln -s "%_libdir/libkmod.so.2.2.11" "$b/%_lib/";
+ln -s "%_libdir/libkmod.so.2.3.0" "$b/%_lib/";
%endif
%post
++ kmod-21.tar.xz -> kmod-22.tar.xz ++
7755 lines of diff (skipped)
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-11-18 22:31:30
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is "kmod"
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2015-04-27
22:07:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2015-11-18
22:31:31.0 +0100
@@ -1,0 +2,13 @@
+Sat Nov 7 10:40:29 UTC 2015 - jeng...@inai.de
+
+- Update to new upstream release 21
+* Cache built modules so it is easier to run "make check" on
+ build servers by distro maintainers. If kmod is configured with
+ --disable-test-modules, the modules from cache will be used by
+ "make check". No changes to the tests are needed and all of
+ them can run fine.
+- Specify KDIR explicitly to resolve build failure with `osc build`
+ (because kmod uses `uname -r` and the kernel versions need not
+ match between build env and local host)
+
+---
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2015-04-27
22:07:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-11-18
22:31:32.0 +0100
@@ -1,0 +2,7 @@
+Sat Nov 7 10:29:54 UTC 2015 - jeng...@inai.de
+
+- Update to new upstream release 21
+* The kmod tool now prints the relevant configuration options it was built
+ with when the "--version" argument is passed.
+
+---
Old:
kmod-20.tar.sign
kmod-20.tar.xz
New:
kmod-21.tar.sign
kmod-21.tar.xz
Other differences:
--
++ kmod-testsuite.spec ++
--- /var/tmp/diff_new_pack.Rnpego/_old 2015-11-18 22:31:33.0 +0100
+++ /var/tmp/diff_new_pack.Rnpego/_new 2015-11-18 22:31:33.0 +0100
@@ -18,7 +18,7 @@
Name: kmod-testsuite
%define lname libkmod2
-Version:20
+Version:21
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
@@ -52,6 +52,7 @@
BuildRequires: pkgconfig(zlib)
%endif
Requires: suse-module-tools
+%define kdir /usr/src/linux-obj/%_target_cpu/default
%description
This spec file does not produce any binary RPMs. It just builds kmod and
@@ -76,12 +77,12 @@
--includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \
--bindir="%_bindir"
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1 KDIR="%kdir"
%install
# empty
%check
-make check V=1
+make check V=1 KDIR="%kdir"
%changelog
++ kmod.spec ++
--- /var/tmp/diff_new_pack.Rnpego/_old 2015-11-18 22:31:33.0 +0100
+++ /var/tmp/diff_new_pack.Rnpego/_new 2015-11-18 22:31:33.0 +0100
@@ -18,7 +18,7 @@
Name: kmod
%define lname libkmod2
-Version:20
+Version:21
Release:0
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
@@ -152,7 +152,7 @@
ln -s "%_bindir/kmod" "$b/bin/";
%if "%_libdir" != "/%_lib"
ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
-ln -s "%_libdir/libkmod.so.2.2.10" "$b/%_lib/";
+ln -s "%_libdir/libkmod.so.2.2.11" "$b/%_lib/";
%endif
%post
++ kmod-20.tar.xz -> kmod-21.tar.xz ++
2739 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/kmod-20/Makefile.am new/kmod-21/Makefile.am
--- old/kmod-20/Makefile.am 2015-03-01 17:54:51.0 +0100
+++ new/kmod-21/Makefile.am 2015-06-09 07:35:37.0 +0200
@@ -7,6 +7,7 @@
DISTCLEAN_LOCAL_HOOKS =
EXTRA_DIST =
CLEANFILES = $(BUILT_FILES)
+DISTCLEANFILES =
BUILT_FILES =
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
@@ -40,7 +41,7 @@
$(SED_PROCESS)
LIBKMOD_CURRENT=4
-LIBKMOD_REVISION=10
+LIBKMOD_REVISION=11
LIBKMOD_AGE=2
noinst_LTLIBRARIES = shared/libshared.la
@@ -127,6 +128,13 @@
tools/modinfo.c tools/modprobe.c \
tools/depmod.c tools/log.h tools/log.c \
tools/static-nodes.c
+
+if BUILD_EXPERIMENTAL
+tools_kmod_SOURCES += \
+ tools/insert.c \
+ tools/remove.c
+endif
+
tools_kmod_LDADD = \
shared/libshared.la \
libkmod/libkmod-internal.la
@@ -216,6 +224,7 @@
CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS))
&& \
cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-04-27 22:07:33
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
New Changes file:
--- /dev/null 2015-03-12 01:14:30.992027505 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2015-04-27
22:07:48.0 +0200
@@ -0,0 +1,6 @@
+---
+Tue Apr 21 12:43:39 UTC 2015 - mma...@suse.cz
+
+- Run the kmod testsuite in a separate build, to avoid a buildloop
+ with the kernel.
+
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2015-04-06
00:25:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-04-27
22:07:48.0 +0200
@@ -1,0 +2,14 @@
+Tue Apr 21 14:38:55 UTC 2015 - mma...@suse.cz
+
+- Update to kmod 20
+* More robust ELF parsing
+* To fix a race, modprobe only looks at modules.builtin to
+ determine a builtin module, so e.g. 'modprobe vt' will no longer
+ work.
+* Other fixes
+* Testsuite moved to a separate package, since it is now building
+ the test modules from sources, which requires the kernel package.
+* dropped kmod-blacklist-fixtest.patch (merged upstream)
+
+
+---
Old:
kmod-19.tar.sign
kmod-19.tar.xz
kmod-blacklist-fixtest.patch
New:
kmod-20.tar.sign
kmod-20.tar.xz
kmod-testsuite.changes
kmod-testsuite.spec
Other differences:
--
++ kmod-testsuite.spec ++
#
# spec file for package kmod-testsuite
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kmod-testsuite
%define lname libkmod2
Version:20
Release:0
Summary:Testsuite of the kmod package
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lkml.org/lkml/2015/3/1/152
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign
Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch7: 0001-use-correct-sort-method-in-test-array.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: git-core
BuildRequires: kernel-default-devel
BuildRequires: libtool
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
%if 0%{?sles_version} == 11
BuildRequires: xz-devel = 4.99
BuildRequires: zlib-devel
%else
BuildRequires: pkgconfig(liblzma) = 4.99
BuildRequires: pkgconfig(zlib)
%endif
Requires: suse-module-tools
%description
This spec file does not produce any binary RPMs. It just builds kmod and
runs its testsuite. It has been split off the kmod package to avoid a
buildloop with the kernel.
%prep
%setup -q -n kmod-%version
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
%build
autoreconf -fi
export LDFLAGS=-Wl,-z,relro,-z,now
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
%if 0%{?sles_version} == 11
zlib_CFLAGS= zlib_LIBS=-lz \
%endif
--with-xz \
--with-zlib \
--includedir=%_includedir/kmod \
--with-rootlibdir=%_libdir \
--bindir=%_bindir
make %{?_smp_mflags} V=1
%install
# empty
%check
make check V=1
%changelog
++ kmod.spec ++
--- /var/tmp/diff_new_pack.Q2PSNP/_old 2015-04-27 22:07:49.0 +0200
+++
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-04-06 00:25:37
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2015-03-16
06:55:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-04-06
00:25:38.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 2 18:24:23 UTC 2015 - crrodrig...@opensuse.org
+
+- If kmod packge changes, regenerate the initrd.
+
+---
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.md4CHO/_old 2015-04-06 00:25:39.0 +0200
+++ /var/tmp/diff_new_pack.md4CHO/_new 2015-04-06 00:25:39.0 +0200
@@ -42,6 +42,7 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig = 0.21
+BuildRequires: suse-module-tools
BuildRequires: xz
%if 0%{?sles_version} == 11
BuildRequires: xz-devel = 4.99
@@ -158,6 +159,12 @@
%check
make check V=1
+%post
+%{?regenerate_initrd_post}
+
+%posttrans
+%{?regenerate_initrd_posttrans}
+
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-03-16 06:55:53
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2015-02-25
02:16:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-03-16
06:55:55.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 6 07:58:19 UTC 2015 - meiss...@suse.com
+
+- 0001-use-correct-sort-method-in-test-array.patch: use correct test
+ bsc#920930
+
+---
New:
0001-use-correct-sort-method-in-test-array.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.xVQGoM/_old 2015-03-16 06:55:56.0 +0100
+++ /var/tmp/diff_new_pack.xVQGoM/_new 2015-03-16 06:55:56.0 +0100
@@ -36,6 +36,7 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: kmod-blacklist-fixtest.patch
+Patch7: 0001-use-correct-sort-method-in-test-array.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -100,7 +101,7 @@
%prep
%setup -q
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
%build
autoreconf -fi
++ 0001-use-correct-sort-method-in-test-array.patch ++
From 813357548c7f9063996783e2ac8382501e32a4ed Mon Sep 17 00:00:00 2001
From: Marcus Meissner meiss...@suse.de
Date: Fri, 6 Mar 2015 08:57:10 +0100
Subject: [PATCH] use correct sort method in test-array
Status: mailed to upstream
the pointers we get are char ** not char *
---
testsuite/test-array.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/testsuite/test-array.c b/testsuite/test-array.c
index 3c72a8a..8e1b2ba 100644
--- a/testsuite/test-array.c
+++ b/testsuite/test-array.c
@@ -90,6 +90,14 @@ static int test_array_append_unique(const struct test *t)
DEFINE_TEST(test_array_append_unique,
.description = test array append unique);
+static int array_strcmp(void *a, void *b)
+{
+ char *pa = *(char **)a;
+ char *pb = *(char **)b;
+
+ return strcmp(pa, pb);
+}
+
static int test_array_sort(const struct test *t)
{
struct array array;
@@ -104,7 +112,7 @@ static int test_array_sort(const struct test *t)
array_append(array, c2);
array_append(array, c3);
array_append(array, c1);
- array_sort(array, (int (*)(const void *a, const void *b)) strcmp);
+ array_sort(array, (int (*)(const void *a, const void *b))
array_strcmp);
assert_return(array.count == 6, EXIT_FAILURE);
assert_return(array.array[0] == c1, EXIT_FAILURE);
assert_return(array.array[1] == c1, EXIT_FAILURE);
--
2.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-02-25 02:16:27
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-11-29
08:39:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-02-25
02:16:29.0 +0100
@@ -1,0 +2,5 @@
+Sun Feb 22 10:41:40 UTC 2015 - meiss...@suse.com
+
+- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly
+
+---
New:
kmod-blacklist-fixtest.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.SbAcZH/_old 2015-02-25 02:16:30.0 +0100
+++ /var/tmp/diff_new_pack.SbAcZH/_new 2015-02-25 02:16:30.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6: kmod-blacklist-fixtest.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -99,7 +100,7 @@
%prep
%setup -q
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%build
autoreconf -fi
@@ -154,7 +155,7 @@
%endif
%check
-make check
+make check V=1
%post -n %lname -p /sbin/ldconfig
++ kmod-blacklist-fixtest.patch ++
In upstream git:
0af8f786c0bae8c10d9b463d72e72cc6e80c26a2
From: Marcus Meissner
and
d2db083ab6f8491e806c72888d897d15584f9f17
From: Lucas De Marchi
Index: kmod-19/testsuite/test-blacklist.c
===
--- kmod-19.orig/testsuite/test-blacklist.c
+++ kmod-19/testsuite/test-blacklist.c
@@ -92,14 +92,13 @@ fail_lookup:
kmod_unref(ctx);
return EXIT_FAILURE;
}
-static const struct test sblacklist_1 = {
- .name = blacklist_1,
+
+DEFINE_TEST(blacklist_1,
.description = check if modules are correctly blacklisted,
- .func = blacklist_1,
.config = {
[TC_ROOTFS] = TESTSUITE_ROOTFS test-blacklist/,
},
.need_spawn = true,
-};
+);
TESTSUITE_MAIN();
Index: kmod-19/testsuite/test-dependencies.c
===
--- kmod-19.orig/testsuite/test-dependencies.c
+++ kmod-19/testsuite/test-dependencies.c
@@ -76,15 +76,13 @@ static int test_dependencies(const struc
return EXIT_SUCCESS;
}
-static const struct test stest_dependencies = {
- .name = test_dependencies,
+DEFINE_TEST(test_dependencies,
.description = test if kmod_module_get_dependencies works,
- .func = test_dependencies,
.config = {
[TC_ROOTFS] = TESTSUITE_ROOTFS test-dependencies/,
[TC_UNAME_R] = TEST_UNAME,
},
.need_spawn = true,
-};
+)
TESTSUITE_MAIN();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-11-29 08:39:49
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-11-18
22:56:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-11-29
08:39:52.0 +0100
@@ -1,0 +2,15 @@
+Sun Nov 16 20:54:36 UTC 2014 - jeng...@inai.de
+
+- Move include files out of pkg/ into a normal subdir of includedir.
+
+---
+Sun Nov 16 18:22:37 UTC 2014 - crrodrig...@opensuse.org
+
+- Update to kmod 19
+* Fix missing CLOEXEC in library
+* Fix error message while opening kmod's index
+* static-nodes: when writing in tmpfiles format, indicate that
+ creation of static nodes should only happen at boot. This is used
+ and required by systemd-217+.
+
+---
Old:
kmod-18.tar.sign
kmod-18.tar.xz
New:
kmod-19.tar.sign
kmod-19.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.1Ohq2K/_old 2014-11-29 08:39:53.0 +0100
+++ /var/tmp/diff_new_pack.1Ohq2K/_new 2014-11-29 08:39:53.0 +0100
@@ -21,10 +21,10 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:18
+Version:19
Release:0
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
-#Announce: https://lwn.net/Articles/577962/
+#Announce: https://lkml.org/lkml/2014/11/16/97
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
@@ -41,7 +41,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
-%if 0%{?sles_version}
+%if 0%{?sles_version} == 11
BuildRequires: xz-devel = 4.99
BuildRequires: zlib-devel
%else
@@ -107,12 +107,12 @@
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
-%if 0%{?sles_version}
+%if 0%{?sles_version} == 11
zlib_CFLAGS= zlib_LIBS=-lz \
%endif
--with-xz \
--with-zlib \
- --includedir=%_includedir/pkg/%name \
+ --includedir=%_includedir/%name \
--with-rootlibdir=%_libdir \
--bindir=%_bindir
make %{?_smp_mflags} V=1
@@ -150,7 +150,7 @@
ln -s %_bindir/kmod $b/bin/;
%if %_libdir != /%_lib
ln -s %_libdir/libkmod.so.2 $b/%_lib/;
-ln -s %_libdir/libkmod.so.2.2.8 $b/%_lib/;
+ln -s %_libdir/libkmod.so.2.2.9 $b/%_lib/;
%endif
%check
@@ -166,6 +166,7 @@
%_libexecdir/%name
/bin/kmod
%_datadir/bash-completion/
+%_mandir/man8/kmod.8*
%files -n %lname
%defattr(-,root,root)
++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++
--- /var/tmp/diff_new_pack.1Ohq2K/_old 2014-11-29 08:39:53.0 +0100
+++ /var/tmp/diff_new_pack.1Ohq2K/_new 2014-11-29 08:39:53.0 +0100
@@ -14,12 +14,10 @@
create mode 100644 libkmod/libkmod-unsupported.c
create mode 100644 libkmod/libkmod-unsupported.h
-diff --git a/Makefile.am b/Makefile.am
-index eb63073..1c3eee4 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -79,7 +79,9 @@ libkmod_libkmod_la_LIBADD = libkmod/libkmod-util.la \
- ${liblzma_LIBS} ${zlib_LIBS}
+--- kmod-19.orig/Makefile.am
kmod-19/Makefile.am
+@@ -86,7 +86,9 @@ libkmod_libkmod_la_LIBADD = \
+ ${liblzma_LIBS} ${zlib_LIBS}
noinst_LTLIBRARIES += libkmod/libkmod-internal.la
-libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
@@ -29,11 +27,8 @@
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 000..7ef9fc8
--- /dev/null
-+++ b/libkmod/libkmod-unsupported.c
kmod-19/libkmod/libkmod-unsupported.c
@@ -0,0 +1,9 @@
+#include libkmod-internal.h
+#include libkmod-unsupported.h
@@ -44,11 +39,8 @@
+
+ config-block_unsupported = 0;
+}
-diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h
-new file mode 100644
-index 000..a95b4a2
--- /dev/null
-+++ b/libkmod/libkmod-unsupported.h
kmod-19/libkmod/libkmod-unsupported.h
@@ -0,0 +1,8 @@
+#pragma once
+
@@ -58,19 +50,18 @@
+ * library
+ */
+void kmod_internal_allow_unsupported(struct kmod_ctx *ctx);
-diff --git
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-11-18 22:55:48
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-09-07
11:09:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-11-18
22:56:01.0 +0100
@@ -1,0 +2,6 @@
+Sat Nov 8 00:16:55 UTC 2014 - crrodrig...@opensuse.org
+
+- Build with full RELRO.
+- Enable verbose build (build checks depend on that)
+
+---
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.80CWbL/_old 2014-11-18 22:56:03.0 +0100
+++ /var/tmp/diff_new_pack.80CWbL/_new 2014-11-18 22:56:03.0 +0100
@@ -103,6 +103,7 @@
%build
autoreconf -fi
+export LDFLAGS=-Wl,-z,relro,-z,now
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
@@ -114,7 +115,7 @@
--includedir=%_includedir/pkg/%name \
--with-rootlibdir=%_libdir \
--bindir=%_bindir
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
b=%buildroot;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-09-07 11:09:41
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-06-26
10:42:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-09-07
11:09:42.0 +0200
@@ -1,0 +2,7 @@
+Thu Sep 4 09:16:19 UTC 2014 - mma...@suse.cz
+
+- Do not filter unsupported modules when running a vanilla kernel
+ (bnc#871066). New patch:
+ 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+
+---
New:
0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.oVQkR9/_old 2014-09-07 11:09:43.0 +0200
+++ /var/tmp/diff_new_pack.oVQkR9/_new 2014-09-07 11:09:43.0 +0200
@@ -30,10 +30,11 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
-Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
-Patch9: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
-Patch10:0010-modprobe-Implement-allow-unsupported-modules.patch
+Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
+Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
+Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
+Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
+Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -98,7 +99,7 @@
%prep
%setup -q
-%patch -P 2 -P 3 -P 9 -P 10 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%build
autoreconf -fi
++ 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch ++
--- /var/tmp/diff_new_pack.oVQkR9/_old 2014-09-07 11:09:43.0 +0200
+++ /var/tmp/diff_new_pack.oVQkR9/_new 2014-09-07 11:09:43.0 +0200
@@ -1,7 +1,7 @@
-From 820ce4a006eeb230ee597e7565b17cec464ef15d Mon Sep 17 00:00:00 2001
+From ae166d55534d92e12e4892431075539474c59918 Mon Sep 17 00:00:00 2001
From: Michal Marek mma...@suse.cz
Date: Wed, 26 Feb 2014 13:48:55 +0100
-Subject: [PATCH 02/10] modprobe: Recognize --allow-unsupported-modules on
+Subject: [PATCH 1/5] modprobe: Recognize --allow-unsupported-modules on
commandline
The option does not do anything yet, but it does not return error
++ 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch ++
--- /var/tmp/diff_new_pack.oVQkR9/_old 2014-09-07 11:09:43.0 +0200
+++ /var/tmp/diff_new_pack.oVQkR9/_new 2014-09-07 11:09:43.0 +0200
@@ -1,7 +1,7 @@
-From 717e10547654bceebbcb84144be72a40d78e577a Mon Sep 17 00:00:00 2001
+From d607994c7b086afae09a8cded8bf6c5e8682541e Mon Sep 17 00:00:00 2001
From: Michal Marek mma...@suse.cz
Date: Wed, 26 Feb 2014 13:53:38 +0100
-Subject: [PATCH 03/10] libkmod-config: Recognize allow_unsupported_modules in
+Subject: [PATCH 2/5] libkmod-config: Recognize allow_unsupported_modules in
the configuration
References: fate#316971
@@ -11,10 +11,10 @@
1 file changed, 3 insertions(+)
diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index 32adb8b..3950923 100644
+index 0953924..79bfb9b 100644
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
-@@ -662,6 +662,9 @@ static int kmod_config_parse(struct kmod_config *config,
int fd,
+@@ -667,6 +667,9 @@ static int kmod_config_parse(struct kmod_config *config,
int fd,
|| streq(cmd, config)) {
ERR(ctx, %s: command %s is deprecated and not parsed
anymore\n,
filename, cmd);
++ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch ++
--- /var/tmp/diff_new_pack.oVQkR9/_old 2014-09-07 11:09:43.0 +0200
+++ /var/tmp/diff_new_pack.oVQkR9/_new 2014-09-07 11:09:43.0 +0200
@@ -1,8 +1,8 @@
-From 36bb8bc7f4100d7ffc4d6d0436e36e48fa7c075f Mon Sep 17 00:00:00 2001
+From 153da67042852b7667ce4479d14835450c908417 Mon Sep 17 00:00:00 2001
From: Michal Marek mma...@suse.cz
Date: Wed, 5 Mar 2014 14:40:14 +0100
-Subject: [PATCH 09/10] libkmod: Implement
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-06-26 10:42:38
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-05-18
06:49:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-06-26
10:42:44.0 +0200
@@ -1,0 +2,12 @@
+Tue Jun 24 13:15:37 UTC 2014 - jeng...@inai.de
+
+- Update to new upstream release 18
+* Calling depmod with modules creating a dependency loop will now
+ make depmod return an error and not update the indexes. This is
+ to protect the current index not being overridden by another
+ index that may cause a boot failure, depending on the buggy module.
+- Remove last vestiges of gpg-offline
+- Remove 0001-depmod-Make-dependency-loops-be-fatal.patch
+ (applied upstream)
+
+---
Old:
0001-depmod-Make-dependency-loops-be-fatal.patch
kmod-17.tar.sign
kmod-17.tar.xz
New:
kmod-18.tar.sign
kmod-18.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.xdZWk3/_old 2014-06-26 10:42:46.0 +0200
+++ /var/tmp/diff_new_pack.xdZWk3/_new 2014-06-26 10:42:46.0 +0200
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:17
+Version:18
Release:0
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/577962/
@@ -30,7 +30,6 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-Patch1: 0001-depmod-Make-dependency-loops-be-fatal.patch
Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch9: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
@@ -98,13 +97,8 @@
in %lname.
%prep
-%{?gpg_verify: xz -dk %{S:0}; %gpg_verify %{S:2}}
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch9 -p1
-%patch10 -p1
+%patch -P 2 -P 3 -P 9 -P 10 -p1
%build
autoreconf -fi
@@ -116,7 +110,7 @@
%endif
--with-xz \
--with-zlib \
- --includedir=%_includedir/%name-%version \
+ --includedir=%_includedir/pkg/%name \
--with-rootlibdir=%_libdir \
--bindir=%_bindir
make %{?_smp_mflags}
@@ -154,7 +148,7 @@
ln -s %_bindir/kmod $b/bin/;
%if %_libdir != /%_lib
ln -s %_libdir/libkmod.so.2 $b/%_lib/;
-ln -s %_libdir/libkmod.so.2.2.7 $b/%_lib/;
+ln -s %_libdir/libkmod.so.2.2.8 $b/%_lib/;
%endif
%check
++ kmod-17.tar.xz - kmod-18.tar.xz ++
6026 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-05-18 06:49:15
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-04-15
07:35:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-05-18
06:49:22.0 +0200
@@ -1,0 +2,6 @@
+Fri May 16 11:00:43 UTC 2014 - matwey.korni...@gmail.com
+
+- Remove 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
+- Add 0001-depmod-Make-dependency-loops-be-fatal.patch (upstream fix for
bnc#872715)
+
+---
Old:
0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
New:
0001-depmod-Make-dependency-loops-be-fatal.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.BSS1LA/_old 2014-05-18 06:49:23.0 +0200
+++ /var/tmp/diff_new_pack.BSS1LA/_new 2014-05-18 06:49:23.0 +0200
@@ -30,7 +30,7 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-Patch1: 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
+Patch1: 0001-depmod-Make-dependency-loops-be-fatal.patch
Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Patch9: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
++ 0001-depmod-Make-dependency-loops-be-fatal.patch ++
From c48b269d64e4c2e23194f0a7c20d27e7727cdf3d Mon Sep 17 00:00:00 2001
From: Lucas De Marchi lucas.demar...@intel.com
Date: Fri, 9 May 2014 08:22:02 -0300
Subject: [PATCH] depmod: Make dependency loops be fatal
Since the beginning depmod just warned about dependency loops and upon
creation of modules.dep{,.bin} it skipped the modules that were part of
a loop. However just skipping the modules may come as a surprise to
kernel module developers: they will need to try to load the module (or
to pay attention to the log messages) to notice thavt the module has not
been put in the index. Also, differently from module-init-tools we were
not skipping modules that depend on modules with dependency loops,
leading to a segfault in depmod.
So this is a summary of the change in behavior with this patch:
Loop 1)
A - B - C -
^ |
'
Before:
depmod: WARNING: found 3 modules in dependency cycles!
depmod: WARNING:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleB.ko in dependency cycle!
depmod: WARNING:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleC.ko in dependency cycle!
depmod: WARNING:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleA.ko in dependency cycle!
return code: 0
After:
depmod: ERROR: Found 3 modules in dependency cycles!
depmod: ERROR:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleB.ko in dependency cycle!
depmod: ERROR:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleC.ko in dependency cycle!
depmod: ERROR:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleA.ko in dependency cycle!
return code: 2
Loop 2)
A - B - C -
^ |
'---
Before:
depmod: WARNING: found 2 modules in dependency cycles!
depmod: WARNING:
/tmp/test-kmod//lib/modules/3.14.2-1-ARCH/kernel/moduleB.ko in dependency cycle!
depmod: WARNING:
/tmp/test-kmod//lib/modules/3.14.2-1-ARCH/kernel/moduleC.ko in dependency cycle!
Segmentation fault (core dumped)
After:
depmod: ERROR: Found 2 modules in dependency cycles!
depmod: ERROR:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleB.ko in dependency cycle!
depmod: ERROR:
/tmp/test-kmod/lib/modules/3.14.2-1-ARCH/kernel/moduleC.ko in dependency cycle!
return code: 2
The segfault above could be fixed, but let's just fail everything
because dependency cycles should be fixed in the modules rather than
just be skipped in the index.
---
tools/depmod.c | 55 +--
1 file changed, 9 insertions(+), 46 deletions(-)
diff --git a/tools/depmod.c b/tools/depmod.c
index 1aedaaf..7ac1e26 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -927,7 +927,6 @@ struct mod {
int dep_sort_idx; /* topological sort index */
uint16_t idx; /* index in depmod-modules.array */
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-04-15 07:35:27
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-03-01
14:38:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-04-15
07:35:28.0 +0200
@@ -1,0 +2,48 @@
+Sat Apr 12 12:33:16 UTC 2014 - matwey.korni...@gmail.com
+
+- Add 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
+* Fix segfault at cycled deps (bnc#872715)
+
+---
+Tue Apr 8 08:36:22 UTC 2014 - mma...@suse.cz
+
+- Remove the now obsolete test-files.tar.xz tarball
+
+---
+Mon Apr 7 19:07:17 UTC 2014 - mma...@suse.com
+
+- Updated to kmod 17
+* Do not require xsltproc for build
+* Parse softdeps stored in kernel modules
+* Add experimental python bindings (not enabled in the package yet)
+* Misc bugfixes
+- Deleted patches that went upstream. Only the unsupported modules
+ feature remains:
+ 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
+ 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
+ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
+ 0010-modprobe-Implement-allow-unsupported-modules.patch
+
+---
+Tue Mar 11 13:38:23 UTC 2014 - mma...@suse.cz
+
+- Provide and obsolete module-init-tools (bnc#867442)
+
+---
+Fri Mar 7 09:25:02 UTC 2014 - mma...@suse.cz
+
+- testsuite: Fix uname() during glibc startup
+
+---
+Wed Mar 5 14:50:34 UTC 2014 - mma...@suse.cz
+
+- testsuite: Check the list of loaded modules after a test
+- testsuite: Add test for modprobe --force
+- testsuite: Do not provide finit_module(2) on older kernels
+- Add some tests for kernels without finit_module(2)
+- libkmod-module: Simplify kmod_module_insert_module()
+- libkmod: Implement filtering of unsupported modules (fate#316971)
+- modprobe: Implement --allow-unsupported-modules (fate#316971)
+- make the %check section fatal
+
+---
Old:
0001-Remove-rmmod-w-documentation-and-getopt-entry.patch
kmod-16.tar.sign
kmod-16.tar.xz
New:
0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
0010-modprobe-Implement-allow-unsupported-modules.patch
kmod-17.tar.sign
kmod-17.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.A8Ytz4/_old 2014-04-15 07:35:29.0 +0200
+++ /var/tmp/diff_new_pack.A8Ytz4/_new 2014-04-15 07:35:29.0 +0200
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:16
+Version:17
Release:0
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/577962/
@@ -30,18 +30,15 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-Patch1: 0001-Remove-rmmod-w-documentation-and-getopt-entry.patch
+Patch1: 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch
Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
+Patch9: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
+Patch10:0010-modprobe-Implement-allow-unsupported-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-%if 0%{?suse_version} = 1220
-BuildRequires: libxslt-tools
-%else
-BuildRequires: libxslt
-%endif
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
%if 0%{?sles_version}
@@ -67,8 +64,9 @@
License:GPL-2.0+
Group: System/Kernel
Requires: kmod
+Obsoletes: module-init-tools 3.16
+Provides: module-init-tools = 3.16
Provides: modutils
-Conflicts: module-init-tools
%description compat
kmod is a set of tools to handle common tasks with Linux kernel
@@ -103,9 +101,10 @@
%{?gpg_verify: xz -dk
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2014-03-01 14:38:41
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2014-01-13
16:53:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-03-01
14:38:44.0 +0100
@@ -1,0 +2,15 @@
+Wed Feb 26 13:23:41 UTC 2014 - mma...@suse.cz
+
+- Remove rmmod -w documentation and getopt entry
+- modprobe: Recognize --allow-unsupported-modules on commandline
+ (fate#316971)
+- libkmod-config: Recognize allow_unsupported_modules in the
+ configuration (fate#316971)
+
+---
+Wed Feb 26 13:09:21 UTC 2014 - mma...@suse.cz
+
+- Drop the non-upstream kmod-no-static.diff; the size difference is
+ negligible.
+
+---
Old:
kmod-no-static.diff
New:
0001-Remove-rmmod-w-documentation-and-getopt-entry.patch
0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.dm95aB/_old 2014-03-01 14:38:45.0 +0100
+++ /var/tmp/diff_new_pack.dm95aB/_new 2014-03-01 14:38:45.0 +0100
@@ -30,7 +30,9 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-Patch1: kmod-no-static.diff
+Patch1: 0001-Remove-rmmod-w-documentation-and-getopt-entry.patch
+Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch
+Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -100,7 +102,10 @@
%prep
%{?gpg_verify: xz -dk %{S:0}; %gpg_verify %{S:2}}
%setup -q
-%patch -P 1 -p1
+%patch1 -p1
+touch man/rmmod.8
+%patch2 -p1
+%patch3 -p1
%build
autoreconf -fi
++ 0001-Remove-rmmod-w-documentation-and-getopt-entry.patch ++
From f81194e28e56dd57588edb5f19c5a3b1f38d1eb8 Mon Sep 17 00:00:00 2001
From: Stephen Kitt st...@sk2.org
Date: Sun, 26 Jan 2014 18:00:23 -0200
Subject: [PATCH 1/3] Remove rmmod -w documentation and getopt entry
This patch removes the cmdopts declaration and the documentation. They
were leftover from the -w removal.
(cherry picked from commit a4bd1441e5c7e8903a9ae065801d4f06f13d06e9)
[mmarek: regenerated man/rmmod.8]
---
man/rmmod.8 | 12 +---
man/rmmod.xml | 17 -
tools/rmmod.c | 1 -
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/man/rmmod.8 b/man/rmmod.8
index cd97efa..e5d879a 100644
--- a/man/rmmod.8
+++ b/man/rmmod.8
@@ -31,7 +31,7 @@
rmmod \- Simple program to remove a module from the Linux Kernel
.SH SYNOPSIS
.HP \w'\fBrmmod\fR\ 'u
-\fBrmmod\fR [\fB\-f\fR] [\fB\-w\fR] [\fB\-s\fR] [\fB\-v\fR] [\fImodulename\fR]
+\fBrmmod\fR [\fB\-f\fR] [\fB\-s\fR] [\fB\-v\fR] [\fImodulename\fR]
.SH DESCRIPTION
.PP
\fBrmmod\fR
@@ -55,16 +55,6 @@ This option can be extremely dangerous: it has no effect
unless CONFIG_MODULE_FO
\fBlsmod\fR(8))\.
.RE
.PP
-\fB\-w\fR \fB\-\-wait\fR
-.RS 4
-Normally,
-\fBrmmod\fR
-will refuse to unload modules which are in use\. With this option,
-\fBrmmod\fR
-will isolate the module, and wait until the module is no longer used\.
Nothing new will be able to use the module, but it\*(Aqs up to you to make sure
the current users eventually finish with it\. See
-\fBlsmod\fR(8)) for information on usage counts\.
-.RE
-.PP
\fB\-s\fR, \fB\-\-syslog\fR
.RS 4
Send errors to syslog instead of standard error\.
diff --git a/man/rmmod.xml b/man/rmmod.xml
index 3605068..5023fb0 100644
--- a/man/rmmod.xml
+++ b/man/rmmod.xml
@@ -39,7 +39,6 @@
cmdsynopsis
commandrmmod/command
argoption-f/option/arg
- argoption-w/option/arg
argoption-s/option/arg
argoption-v/option/arg
argreplaceablemodulename/replaceable/arg
@@ -94,22 +93,6 @@
/listitem
/varlistentry
varlistentry
-termoption-w/option option--wait/option
-/term
-listitem
- para
-Normally, commandrmmod/command will refuse to unload modules
-which are in use. With this option, commandrmmod/command will
-isolate the module, and wait until the module is no longer used.
-Nothing new will be able to use the module, but
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2014-01-13 16:53:03 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is kmod Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2013-09-26 19:34:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-01-13 16:53:04.0 +0100 @@ -1,0 +2,9 @@ +Tue Jan 7 11:59:38 UTC 2014 - jeng...@inai.de + +- Update to new upstream release 16 +* The option to wait on module removal has been removed from the + kernel, and now from rmmod. The constant KMOD_REMOVE_NOWAIT in + libkmod is still there for backwards compatibility but it is + always enforced, passing O_NONBLOCK to delete_module(2). + +--- Old: kmod-15.tar.sign kmod-15.tar.xz New: kmod-16.tar.sign kmod-16.tar.xz Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.wWBqXI/_old 2014-01-13 16:53:05.0 +0100 +++ /var/tmp/diff_new_pack.wWBqXI/_new 2014-01-13 16:53:05.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +21,10 @@ Summary:Utilities to load modules into the kernel License:LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version:15 +Version:16 Release:0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ -#Announce: https://lwn.net/Articles/502622/ +#Announce: https://lwn.net/Articles/577962/ #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod @@ -150,7 +150,7 @@ ln -s %_bindir/kmod $b/bin/; %if %_libdir != /%_lib ln -s %_libdir/libkmod.so.2 $b/%_lib/; -ln -s %_libdir/libkmod.so.2.2.5 $b/%_lib/; +ln -s %_libdir/libkmod.so.2.2.6 $b/%_lib/; %endif %check ++ kmod-15.tar.xz - kmod-16.tar.xz ++ 5900 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2013-09-26 19:34:31
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2013-07-16
15:33:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2013-09-26
19:34:32.0 +0200
@@ -1,0 +2,10 @@
+Mon Sep 2 21:36:22 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 15
+* kmod static-nodes no longer fails if modules.devname does not exist
+* Fix getting boolean parameter from kernel cmdline in case the
+ value is omitted
+* kmod static-nodes creates parent directories if given a -o option
+- Add kmod-no-static.diff
+
+---
Old:
kmod-14.tar.sign
kmod-14.tar.xz
New:
kmod-15.tar.sign
kmod-15.tar.xz
kmod-no-static.diff
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.uMWZfU/_old 2013-09-26 19:34:33.0 +0200
+++ /var/tmp/diff_new_pack.uMWZfU/_new 2013-09-26 19:34:33.0 +0200
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:14
+Version:15
Release:0
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/502622/
@@ -30,7 +30,11 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
+Patch1: kmod-no-static.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
%if 0%{?suse_version} = 1220
BuildRequires: libxslt-tools
%else
@@ -96,8 +100,10 @@
%prep
%{?gpg_verify: xz -dk %{S:0}; %gpg_verify %{S:2}}
%setup -q
+%patch -P 1 -p1
%build
+autoreconf -fi
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
@@ -144,7 +150,7 @@
ln -s %_bindir/kmod $b/bin/;
%if %_libdir != /%_lib
ln -s %_libdir/libkmod.so.2 $b/%_lib/;
-ln -s %_libdir/libkmod.so.2.2.4 $b/%_lib/;
+ln -s %_libdir/libkmod.so.2.2.5 $b/%_lib/;
%endif
%check
@@ -159,6 +165,7 @@
%_bindir/kmod
%_libexecdir/%name
/bin/kmod
+%_datadir/bash-completion/
%files -n %lname
%defattr(-,root,root)
++ kmod-14.tar.xz - kmod-15.tar.xz ++
5755 lines of diff (skipped)
++ kmod-no-static.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2013-09-02 23:35:26.194874106 +0200
Well, we are not interested in just kmod (cf. NEWS),
so undo static linkage.
---
Makefile.am |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kmod/Makefile.am
===
--- kmod.orig/Makefile.am
+++ kmod/Makefile.am
@@ -117,7 +117,7 @@ tools_kmod_SOURCES = tools/kmod.c tools/
tools/depmod.c tools/log.h tools/log.c \
tools/static-nodes.c
tools_kmod_LDADD = libkmod/libkmod-util.la \
- libkmod/libkmod-internal.la
+ libkmod/libkmod.la
${noinst_SCRIPTS}: tools/kmod
$(AM_V_GEN) ($(RM) $@; \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2013-04-17 17:57:50 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is kmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-12-10 12:19:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2013-04-17 17:57:53.0 +0200 @@ -1,0 +2,12 @@ +Mon Apr 15 22:27:55 UTC 2013 - crrodrig...@opensuse.org + +- Update to new upstream release 13 +* depmod: --symbol-prefix actually requires an argument +* depmod: fix builtin symbols resolution when the prefix symbol is set +* libkmod: Use secure_getenv if available +* rmmod: Teach rmmod about builtin modules +* libkmod: add finit_module logic +* modprobe: Fix assertion on --show-depends with bogus config file +* Many other bugfixes see https://lwn.net/Articles/546711 + +--- Old: kmod-12.tar.sign kmod-12.tar.xz New: kmod-13.tar.sign kmod-13.tar.xz Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.HnHQ0Q/_old 2013-04-17 17:57:54.0 +0200 +++ /var/tmp/diff_new_pack.HnHQ0Q/_new 2013-04-17 17:57:54.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Summary:Utilities to load modules into the kernel License:LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version:12 +Version:13 Release:0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ #Announce: https://lwn.net/Articles/502622/ @@ -143,7 +143,7 @@ ln -s %_bindir/kmod $b/bin/; %if %_libdir != /%_lib ln -s %_libdir/libkmod.so.2 $b/%_lib/; -ln -s %_libdir/libkmod.so.2.2.2 $b/%_lib/; +ln -s %_libdir/libkmod.so.2.2.3 $b/%_lib/; %endif %check ++ kmod-12.tar.xz - kmod-13.tar.xz ++ 4414 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-12-03 09:46:26
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-11-15
10:57:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-12-03
09:46:29.0 +0100
@@ -1,0 +2,6 @@
+Fri Nov 23 17:18:03 UTC 2012 - jeng...@inai.de
+
+- Require suse-module-tools now that it is present in Base:System
+- kmod-compat depends on kmod, add that missing Requires.
+
+---
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.TJp4E2/_old 2012-12-03 09:46:30.0 +0100
+++ /var/tmp/diff_new_pack.TJp4E2/_new 2012-12-03 09:46:30.0 +0100
@@ -30,13 +30,13 @@
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
-
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libxslt-tools
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
BuildRequires: pkgconfig(liblzma) = 4.99
BuildRequires: pkgconfig(zlib)
+Requires: suse-module-tools
%description
kmod is a set of tools to handle common tasks with Linux kernel
@@ -51,6 +51,7 @@
Summary:Compat symlinks for kernel module utilities
License:GPL-2.0+
Group: System/Kernel
+Requires: kmod
Provides: modutils
Conflicts: module-init-tools
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-11-15 10:57:46
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-09-26
16:20:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-11-15
10:57:49.0 +0100
@@ -1,0 +2,24 @@
+Sat Nov 10 15:07:54 UTC 2012 - hrvoje.sen...@gmail.com
+
+- Update to kmod-11
+* Fix testsuite defining symbols twice on 32 bit systems
+* Allow to check generated files against correct ones
+* libkmod now keeps a file opened after the first call to
+* kmod_module_get_{info,versions,symbols,dependency_symbols}. This
+ reduces signficantly the amount of time depmod tool takes to
+ execute. Particularly if compressed modules are used.
+* Remove --with-rootprefix from build system. It was not a great
+ idea after all and should not be use since it causes more harm
+ than benefits.
+* Hide --wait option on rmmod. This feature is being targeted for
+ removal from kernel. rmmod still accepts this option, but it is
+ hidden now: man page and usage() says nothing about it and if
+ it is used, user will get a 10s sleep. This way we can check and
+ help if anyone is using this feature.
+* Refactor message logging on all tools, giving proper prefix,
+ routing everything to syslog when asked for, etc.
+* Fix parsing of modules.order when using compressed modules
+* Usage messages go to stdout instead of stderr
+* Fix memory leak in hash implementation
+
+---
Old:
kmod-10.tar.sign
kmod-10.tar.xz
New:
kmod-11.tar.sign
kmod-11.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.1XFQvL/_old 2012-11-15 10:57:50.0 +0100
+++ /var/tmp/diff_new_pack.1XFQvL/_new 2012-11-15 10:57:50.0 +0100
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:10
+Version:11
Release:0
Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/502622/
@@ -32,6 +32,7 @@
Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libxslt-tools
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
BuildRequires: pkgconfig(liblzma) = 4.99
@@ -129,7 +130,7 @@
ln -s %_bindir/kmod $b/bin/;
%if %_libdir != /%_lib
ln -s %_libdir/libkmod.so.2 $b/%_lib/;
-ln -s %_libdir/libkmod.so.2.2.0 $b/%_lib/;
+ln -s %_libdir/libkmod.so.2.2.1 $b/%_lib/;
%endif
%check
@@ -146,7 +147,6 @@
%_bindir/kmod
%_libexecdir/%name
/bin/kmod
-%_mandir/man5/modules.dep.bin.5*
%files -n %lname
%defattr(-,root,root)
@@ -180,6 +180,7 @@
%_mandir/man5/depmod.d.5*
%_mandir/man5/modprobe.d.5*
%_mandir/man5/modules.dep.5*
+%_mandir/man5/modules.dep.bin.5*
%_mandir/man8/depmod.8*
%_mandir/man8/insmod.8*
%_mandir/man8/lsmod.8*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-09-26 16:20:56
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-06-25
14:16:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-09-26
16:20:58.0 +0200
@@ -1,0 +2,10 @@
+Thu Sep 13 23:19:10 UTC 2012 - jeng...@inai.de
+
+- Provide the modutils virtual symbol
+- Update to new upstream release 10
+* Read coresize from /sys if supported
+* Add flag to kmod_module_probe_insert() to apply blacklisting
+ during probe only if mod is an alias. Now modprobe uses this
+ flag by default.
+
+---
Old:
fix-32bits.diff
kmod-9.tar.sign
kmod-9.tar.xz
kmod-so-version.diff
New:
kmod-10.tar.sign
kmod-10.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.XCuxL9/_old 2012-09-26 16:20:59.0 +0200
+++ /var/tmp/diff_new_pack.XCuxL9/_new 2012-09-26 16:20:59.0 +0200
@@ -21,21 +21,17 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:9
+Version:10
Release:0
-Url:http://www.politreco.com/2011/12/announce-kmod-2/
+Url:
http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
+#Announce: https://lwn.net/Articles/502622/
#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
-Source: %name-%version.tar.xz
-Source2:%name-%version.tar.sign
-Patch1: kmod-so-version.diff
-Patch2: fix-32bits.diff
+Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
+Source2:
ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: pkgconfig = 0.21
BuildRequires: xz
BuildRequires: pkgconfig(liblzma) = 4.99
@@ -54,6 +50,7 @@
Summary:Compat symlinks for kernel module utilities
License:GPL-2.0+
Group: System/Kernel
+Provides: modutils
Conflicts: module-init-tools
%description compat
@@ -87,46 +84,56 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
%build
-autoreconf -fi
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
--with-xz \
--with-zlib \
- --includedir=%_includedir/%{name}-%{version} \
- --with-rootlibdir=%{_libdir} \
- --bindir=%{_bindir}
+ --includedir=%_includedir/%name-%version \
+ --with-rootlibdir=%_libdir \
+ --bindir=%_bindir
make %{?_smp_mflags}
%install
-%make_install
-rm -f %buildroot/%_libdir/*.la
+b=%buildroot;
+make install DESTDIR=$b;
+rm -f $b/%_libdir/*.la
-# kmod-compat
-#UsrMerge
-mkdir -p %buildroot/bin
-mkdir -p %buildroot/sbin
-mkdir -p %buildroot/%_lib
-ln -s %{_bindir}/kmod %buildroot/bin
-ln -s %{_bindir}/kmod %buildroot/bin/lsmod
+mkdir -p $b/%_libexecdir/%name $b/%_sbindir $b/sbin;
for i in depmod insmod lsmod modinfo modprobe rmmod; do
- ln -s %{_bindir}/kmod %buildroot/sbin/$i
+ #
+ # kmod-compat and kmod-compat(usrmerge)
+ #
+ ln -s %_bindir/kmod $b/%_sbindir/$i;
+ ln -s %_bindir/kmod $b/sbin/$i;
+
+ #
+ # Make symlinks also available in normal fashion,
+ # so one can actually run it.
+ #
+ ln -s %_bindir/kmod $b/%_libexecdir/%name/$i;
done;
-ln -s %_libdir/libkmod.so.2 %buildroot/%_lib
-ln -s %_libdir/libkmod.so.2.1.0 %buildroot/%_lib
-#EndUsrMerge
-mkdir -p %buildroot/%{_sbindir}
-ln -s %{_bindir}/kmod %buildroot/%{_bindir}/lsmod
-for i in depmod insmod lsmod modinfo modprobe rmmod; do
- ln -s %{_bindir}/kmod %buildroot/%{_sbindir}/$i
+mkdir -p $b/%_bindir $b/bin;
+for i in lsmod; do
+ ln -s %_bindir/kmod $b/%_bindir/$i;
+ ln -s %_bindir/kmod $b/bin/$i;
done;
+#
+# make mkinitrd happy
+# (last time checked it does not look into /usr)
+#
+mkdir -p $b/{bin,sbin,%_lib};
+ln -s %_bindir/kmod $b/bin/;
+%if %_libdir != /%_lib
+ln -s %_libdir/libkmod.so.2 $b/%_lib/;
+ln -s %_libdir/libkmod.so.2.2.0 $b/%_lib/;
+%endif
+
%check
-make check
+make check V=1 || :;
%post -n %lname -p /sbin/ldconfig
@@ -136,18 +143,15 @@
%files
%defattr(-,root,root)
-%{_bindir}/kmod
-#UsrMerge
+%_bindir/kmod
+%_libexecdir/%name
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-06-25 14:00:27
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-04-23
09:15:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-06-25
14:16:18.0 +0200
@@ -1,0 +2,15 @@
+Wed Jun 20 08:41:03 UTC 2012 - rmila...@suse.com
+
+- Update to new upstream release 9
+* build-sys: allow compressed modules in testsuite
+* build-sys: Make dirs writable on rootfs creation
+* depmod: use ferror and fclose to check for error
+* depmod: return error when index is truncated due to ENOSPC
+* depmod: fix coding-style issue in array declaration
+* depmod: fail if any index could not be created
+* depmod: don't return error if modules.builtin don't exist
+* libkmod-util: split function for usec conversion
+* libkmod-util: add missing stdbool.h include
+- Fix broken testsuites on 32bit systems.
+ add: fix-32bits.diff
+---
Old:
kmod-8.tar.sign
kmod-8.tar.xz
New:
fix-32bits.diff
kmod-9.tar.sign
kmod-9.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.Q6Gnt2/_old 2012-06-25 14:16:20.0 +0200
+++ /var/tmp/diff_new_pack.Q6Gnt2/_new 2012-06-25 14:16:20.0 +0200
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:8
+Version:9
Release:0
Url:http://www.politreco.com/2011/12/announce-kmod-2/
@@ -30,6 +30,7 @@
Source: %name-%version.tar.xz
Source2:%name-%version.tar.sign
Patch1: kmod-so-version.diff
+Patch2: fix-32bits.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@@ -86,7 +87,8 @@
%prep
%setup -q
-%patch -P 1 -p1
+%patch1 -p1
+%patch2 -p1
%build
autoreconf -fi
@@ -130,6 +132,8 @@
%postun -n %lname -p /sbin/ldconfig
+%clean
+
%files
%defattr(-,root,root)
%{_bindir}/kmod
++ fix-32bits.diff ++
diff --git a/testsuite/init_module.c b/testsuite/init_module.c
index 814998a..ed8b9fc 100644
--- a/testsuite/init_module.c
+++ b/testsuite/init_module.c
@@ -16,6 +16,7 @@
*/
#include assert.h
+#include elf.h
#include errno.h
#include dirent.h
#include fcntl.h
@@ -206,6 +207,12 @@ static inline bool module_is_inkernel(const char *modname)
return ret;
}
+static uint8_t elf_identify(void *mem)
+{
+ uint8_t *p = mem;
+ return p[EI_CLASS];
+}
+
TS_EXPORT long init_module(void *mem, unsigned long len, const char *args);
/*
@@ -225,6 +232,8 @@ long init_module(void *mem, unsigned long len, const char
*args)
const void *buf;
uint64_t bufsize;
int err;
+ uint8_t class;
+ off_t offset;
init_retcodes();
@@ -237,13 +246,20 @@ long init_module(void *mem, unsigned long len, const char
*args)
kmod_elf_unref(elf);
/*
-* We couldn't find the module's name inside the ELF file. Just exit
-* as if it was successful
+* We couldn't find the parse the ELF file. Just exit as if it was
+* successful
*/
if (err 0)
return 0;
- modname = (char *)buf + offsetof(struct module, name);
+ /* We need to open both 32 and 64 bits module - hack! */
+ class = elf_identify(mem);
+ if (class == ELFCLASS64)
+ offset = MODULE_NAME_OFFSET_64;
+ else
+ offset = MODULE_NAME_OFFSET_32;
+
+ modname = (char *)buf + offset;
mod = find_module(modules, modname);
if (mod != NULL) {
errno = mod-errcode;
diff --git a/testsuite/stripped-module.h b/testsuite/stripped-module.h
index 9f97dae..19862f3 100644
--- a/testsuite/stripped-module.h
+++ b/testsuite/stripped-module.h
@@ -13,6 +13,7 @@ struct list_head {
};
#define MODULE_NAME_LEN (64 - sizeof(unsigned long))
+
struct module
{
enum module_state state;
@@ -24,4 +25,8 @@ struct module
char name[MODULE_NAME_LEN];
};
+/*padding */
+#define MODULE_NAME_OFFSET_64 4 + 4 + 2 * 8
+#define MODULE_NAME_OFFSET_32 4 + 2 * 4
+
#endif
++ kmod-so-version.diff ++
--- /var/tmp/diff_new_pack.Q6Gnt2/_old 2012-06-25 14:16:20.0 +0200
+++ /var/tmp/diff_new_pack.Q6Gnt2/_new 2012-06-25 14:16:20.0 +0200
@@ -1,28 +1,13 @@
-From: Jan Engelhardt jeng...@medozas.de
-Upstream: this patch is too complex for upstream to
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2012-04-23 09:15:11 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is kmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-04-20 15:17:50.0 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-04-23 09:15:20.0 +0200 @@ -1,0 +2,6 @@ +Sat Apr 21 01:55:30 UTC 2012 - jeng...@medozas.de + +- Restore patch descriptions + (and use `quilt setup` for rediff in future) + +--- Other differences: -- ++ kmod-so-version.diff ++ --- /var/tmp/diff_new_pack.KQA8J3/_old 2012-04-23 09:15:21.0 +0200 +++ /var/tmp/diff_new_pack.KQA8J3/_new 2012-04-23 09:15:21.0 +0200 @@ -1,7 +1,23 @@ -diff -ur kmod-7.orig/Makefile.am kmod-7/Makefile.am kmod-7.orig/Makefile.am2012-04-18 12:54:59.140122820 +0200 -+++ kmod-7/Makefile.am 2012-04-18 12:56:06.086310478 +0200 -@@ -33,10 +33,6 @@ +From: Jan Engelhardt jeng...@medozas.de +Upstream: this patch is too complex for upstream to handle + +Change the kmod Makefile from using -version-info to -version-number +to make it clear that the kmod project is not trying to subvert the +libtool interface number concept, but in fact does not do +libtool-style counting. + +References: alpine.lnx.2.01.1202070049200.12...@frira.zrqbmnf.qr +References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html + +--- + Makefile.am |6 +- + 1 file changed, 1 insertion(+), 5 deletions(-) + +Index: kmod-8/Makefile.am +=== +--- kmod-8.orig/Makefile.am kmod-8/Makefile.am +@@ -33,10 +33,6 @@ SED_PROCESS = \ %.pc: %.pc.in Makefile $(SED_PROCESS) @@ -12,7 +28,7 @@ noinst_LTLIBRARIES = libkmod/libkmod-util.la libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \ libkmod/libkmod-hash.h \ -@@ -65,7 +61,7 @@ +@@ -65,7 +61,7 @@ EXTRA_DIST += libkmod/libkmod.sym EXTRA_DIST += libkmod/COPYING libkmod/README libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2012-04-20 15:17:48 Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) Package is kmod, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-04-19 08:49:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-04-20 15:17:50.0 +0200 @@ -1,0 +2,9 @@ +Thu Apr 19 14:56:55 UTC 2012 - rmila...@suse.com + +- Update to new upstream release 8 +* doc: remove links to NULL going nowhere. +* modprobe: handle -ENOENT return from init_module. +* doc: silent man page generation and fix gtk-doc warnings. +* modprobe: fix typo in config dump: option-options. + +--- Old: kmod-7.tar.sign kmod-7.tar.xz New: kmod-8.tar.sign kmod-8.tar.xz Other differences: -- ++ kmod.spec ++ --- /var/tmp/diff_new_pack.xKiAdX/_old 2012-04-20 15:17:51.0 +0200 +++ /var/tmp/diff_new_pack.xKiAdX/_new 2012-04-20 15:17:51.0 +0200 @@ -21,7 +21,7 @@ Summary:Utilities to load modules into the kernel License:LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version:7 +Version:8 Release:0 Url:http://www.politreco.com/2011/12/announce-kmod-2/ ++ kmod-so-version.diff ++ --- /var/tmp/diff_new_pack.xKiAdX/_old 2012-04-20 15:17:51.0 +0200 +++ /var/tmp/diff_new_pack.xKiAdX/_new 2012-04-20 15:17:51.0 +0200 @@ -6,7 +6,7 @@ $(SED_PROCESS) -LIBKMOD_CURRENT=3 --LIBKMOD_REVISION=1 +-LIBKMOD_REVISION=2 -LIBKMOD_AGE=1 - noinst_LTLIBRARIES = libkmod/libkmod-util.la -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-04-19 08:49:48
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-03-13
09:34:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-04-19
08:49:57.0 +0200
@@ -1,0 +2,14 @@
+Wed Apr 18 10:58:03 UTC 2012 - rmila...@suse.com
+
+- Update to new upstream release 7
+* build-sys: don't set CFLAGS and LDFLAGS.
+* build-sys: re-organize configure.ac.
+* configure.ac: Move link only flags out of CFLAGS and into LDFLAGS.
+* Add CC_CHECK_LDFLAGS_APPEND m4 macro.
+* config: use order /etc, /run, /lib.
+* modprobe: set log prio to 0 if user passed -q arg.
+* modprobe: always try to remove all modules in command line.
+* modprobe: don't check if module builtin to decide if it's builtin.
+* modprobe: fix error path in removing modules.
+
+---
Old:
kmod-6.tar.sign
kmod-6.tar.xz
New:
kmod-7.tar.sign
kmod-7.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.jx64op/_old 2012-04-19 08:50:01.0 +0200
+++ /var/tmp/diff_new_pack.jx64op/_new 2012-04-19 08:50:01.0 +0200
@@ -21,7 +21,7 @@
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:6
+Version:7
Release:0
Url:http://www.politreco.com/2011/12/announce-kmod-2/
@@ -75,7 +75,7 @@
Summary:Development files for libkmod
License:LGPL-2.1+
Group: Development/Libraries/C and C++
-Requires: %lname = %version
+Requires: %lname = %{version}
%description -n libkmod-devel
libkmod was created to allow programs to easily insert, remove and
@@ -89,11 +89,15 @@
%patch -P 1 -p1
%build
-autoreconf -fi;
+autoreconf -fi
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
-%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
- --with-rootlibdir=%{_libdir} --bindir=%{_bindir}
+%configure \
+ --with-xz \
+ --with-zlib \
+ --includedir=%_includedir/%{name}-%{version} \
+ --with-rootlibdir=%{_libdir} \
+--bindir=%{_bindir}
make %{?_smp_mflags}
%install
++ kmod-so-version.diff ++
--- /var/tmp/diff_new_pack.jx64op/_old 2012-04-19 08:50:01.0 +0200
+++ /var/tmp/diff_new_pack.jx64op/_new 2012-04-19 08:50:01.0 +0200
@@ -1,33 +1,18 @@
-Upstream: this patch is too complex for upstream to handle
-
-Change the kmod Makefile from using -version-info to -version-number
-to make it clear that the kmod project is not trying to subvert the
-libtool interface number concept, but in fact does not do
-libtool-style counting.
-
-References: alpine.lnx.2.01.1202070049200.12...@frira.zrqbmnf.qr
-References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
-
- Makefile.am |6 +-
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-Index: kmod-6/Makefile.am
-===
kmod-6.orig/Makefile.am
-+++ kmod-6/Makefile.am
-@@ -39,10 +39,6 @@ SED_PROCESS = \
+diff -ur kmod-7.orig/Makefile.am kmod-7/Makefile.am
+--- kmod-7.orig/Makefile.am2012-04-18 12:54:59.140122820 +0200
kmod-7/Makefile.am 2012-04-18 12:56:06.086310478 +0200
+@@ -33,10 +33,6 @@
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-LIBKMOD_CURRENT=3
--LIBKMOD_REVISION=0
+-LIBKMOD_REVISION=1
-LIBKMOD_AGE=1
-
noinst_LTLIBRARIES = libkmod/libkmod-util.la
libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \
libkmod/libkmod-hash.h \
-@@ -71,7 +67,7 @@ EXTRA_DIST += libkmod/libkmod.sym
+@@ -65,7 +61,7 @@
EXTRA_DIST += libkmod/COPYING libkmod/README
libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-03-13 09:34:13
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-03-07
20:09:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-03-13
09:34:19.0 +0100
@@ -1,0 +2,5 @@
+Sat Mar 10 17:44:05 UTC 2012 - rschweik...@suse.com
+
+- place binary in /usr tree (UsrMerge project)
+
+---
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.TWx0df/_old 2012-03-13 09:34:20.0 +0100
+++ /var/tmp/diff_new_pack.TWx0df/_new 2012-03-13 09:34:20.0 +0100
@@ -14,6 +14,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+
Name: kmod
%define lname libkmod2
Summary:Utilities to load modules into the kernel
@@ -91,20 +93,30 @@
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
- --with-rootlibdir=/%_lib --bindir=/bin
+ --with-rootlibdir=%{_libdir} --bindir=%{_bindir}
make %{?_smp_mflags}
%install
-b=%buildroot;
%make_install
-rm -f $b/bin/kmod-*;
-rm -f $b/%_libdir/*.la;
+rm -f %buildroot/%_libdir/*.la
# kmod-compat
-mkdir -p $b/bin $b/sbin;
-ln -s kmod $b/bin/lsmod;
+#UsrMerge
+mkdir -p %buildroot/bin
+mkdir -p %buildroot/sbin
+mkdir -p %buildroot/%_lib
+ln -s %{_bindir}/kmod %buildroot/bin
+ln -s %{_bindir}/kmod %buildroot/bin/lsmod
+for i in depmod insmod lsmod modinfo modprobe rmmod; do
+ ln -s %{_bindir}/kmod %buildroot/sbin/$i
+done;
+ln -s %_libdir/libkmod.so.2 %buildroot/%_lib
+ln -s %_libdir/libkmod.so.2.1.0 %buildroot/%_lib
+#EndUsrMerge
+mkdir -p %buildroot/%{_sbindir}
+ln -s %{_bindir}/kmod %buildroot/%{_bindir}/lsmod
for i in depmod insmod lsmod modinfo modprobe rmmod; do
- ln -s /bin/kmod $b/sbin/$i;
+ ln -s %{_bindir}/kmod %buildroot/%{_sbindir}/$i
done;
%check
@@ -116,12 +128,18 @@
%files
%defattr(-,root,root)
+%{_bindir}/kmod
+#UsrMerge
/bin/kmod
+#EndUsrMerge
%_mandir/man5/modules.dep.bin.5*
%files -n %lname
%defattr(-,root,root)
+%_libdir/libkmod.so.2*
+#UsrMerge
/%_lib/libkmod.so.2*
+#EndUsrMerge
%files -n libkmod-devel
%defattr(-,root,root)
@@ -131,6 +149,7 @@
%files compat
%defattr(-,root,root)
+#UsrMerge
/bin/lsmod
/sbin/depmod
/sbin/insmod
@@ -138,6 +157,14 @@
/sbin/modinfo
/sbin/modprobe
/sbin/rmmod
+#EndUsrMerge
+%_bindir/lsmod
+%_sbindir/depmod
+%_sbindir/insmod
+%_sbindir/lsmod
+%_sbindir/modinfo
+%_sbindir/modprobe
+%_sbindir/rmmod
%_mandir/man5/depmod.d.5*
%_mandir/man5/modprobe.d.5*
%_mandir/man5/modules.dep.5*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-03-07 20:09:24
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-02-08
15:38:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-03-07
20:09:26.0 +0100
@@ -1,0 +2,11 @@
+Sat Mar 3 20:50:43 UTC 2012 - jeng...@medozas.de
+
+- Update to new upstream release 6
+* New API: kmod_module_apply_filter, a function to apply filters
+ in a list of modules
+* Lookup modules.builtin.bin to decide if a module is built into
+ the kernel
+* Resolve infinite loops with softdeps and user configs with
+ install commands
+
+---
Old:
kmod-5.tar.sign
kmod-5.tar.xz
New:
kmod-6.tar.sign
kmod-6.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.2yk559/_old 2012-03-07 20:09:27.0 +0100
+++ /var/tmp/diff_new_pack.2yk559/_new 2012-03-07 20:09:27.0 +0100
@@ -14,18 +14,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
Name: kmod
%define lname libkmod2
Summary:Utilities to load modules into the kernel
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version:5
+Version:6
Release:0
Url:http://www.politreco.com/2011/12/announce-kmod-2/
-#Git-Clone:git://git.profusion.mobi/kmod
+#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
+#Git-Clone:git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
Source: %name-%version.tar.xz
Source2:%name-%version.tar.sign
Patch1: kmod-so-version.diff
@@ -34,7 +33,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: pkgconfig = 0.23
+BuildRequires: pkgconfig = 0.21
BuildRequires: xz
BuildRequires: pkgconfig(liblzma) = 4.99
BuildRequires: pkgconfig(zlib)
@@ -98,7 +97,6 @@
%install
b=%buildroot;
%make_install
-# Remove standalone tools
rm -f $b/bin/kmod-*;
rm -f $b/%_libdir/*.la;
++ kmod-so-version.diff ++
--- /var/tmp/diff_new_pack.2yk559/_old 2012-03-07 20:09:27.0 +0100
+++ /var/tmp/diff_new_pack.2yk559/_new 2012-03-07 20:09:27.0 +0100
@@ -1,3 +1,4 @@
+Upstream: this patch is too complex for upstream to handle
Change the kmod Makefile from using -version-info to -version-number
to make it clear that the kmod project is not trying to subvert the
@@ -8,31 +9,30 @@
References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
---
- Makefile.am |9 -
- 1 file changed, 4 insertions(+), 5 deletions(-)
+ Makefile.am |6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
-Index: kmod-5/Makefile.am
+Index: kmod-6/Makefile.am
===
kmod-5.orig/Makefile.am
-+++ kmod-5/Makefile.am
-@@ -39,9 +39,8 @@ SED_PROCESS = \
+--- kmod-6.orig/Makefile.am
kmod-6/Makefile.am
+@@ -39,10 +39,6 @@ SED_PROCESS = \
%.pc: %.pc.in Makefile
$(SED_PROCESS)
--LIBKMOD_CURRENT=2
+-LIBKMOD_CURRENT=3
-LIBKMOD_REVISION=0
--LIBKMOD_AGE=0
-+LIBKMOD_SO_MAJOR=2
-+LIBKMOD_SO_MINOR=0
-
+-LIBKMOD_AGE=1
+-
noinst_LTLIBRARIES = libkmod/libkmod-util.la
libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \
-@@ -71,7 +70,7 @@ EXTRA_DIST += libkmod/libkmod.sym
+ libkmod/libkmod-hash.h \
+@@ -71,7 +67,7 @@ EXTRA_DIST += libkmod/libkmod.sym
EXTRA_DIST += libkmod/COPYING libkmod/README
libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
-+ -version-number ${LIBKMOD_SO_MAJOR}:${LIBKMOD_SO_MINOR} \
++ -version-number 2:1 \
-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
libkmod_libkmod_la_DEPENDENCIES = libkmod/libkmod-util.la \
${top_srcdir}/libkmod/libkmod.sym
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-02-08 15:38:38
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-01-09
12:04:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-02-08
15:38:43.0 +0100
@@ -1,0 +2,15 @@
+Tue Feb 7 00:56:51 UTC 2012 - jeng...@medozas.de
+
+- Update to new upstream release 5
+* modprobe no longer works with paths: it only accepts module names
+ and/or aliases now. More code is now shared by libkmod and
+ modprobe.
+
+---
+Fri Jan 20 18:13:50 UTC 2012 - jeng...@medozas.de
+
+- Update to new upstream release 4
+* new APIs in libkmod: blacklists, install/remove commands,
+ aliases, options, softdeps and dumping indexes
+
+---
Old:
kmod-3.tar.xz
New:
kmod-5.tar.sign
kmod-5.tar.xz
kmod-so-version.diff
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.xgtIYe/_old 2012-02-08 15:38:49.0 +0100
+++ /var/tmp/diff_new_pack.xgtIYe/_new 2012-02-08 15:38:49.0 +0100
@@ -16,25 +16,28 @@
#
-
Name: kmod
-%define lname libkmod1
+%define lname libkmod2
Summary:Utilities to load modules into the kernel
-Version:3
-Release:0
-%define git_snapshot 0
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
+Version:5
+Release:0
Url:http://www.politreco.com/2011/12/announce-kmod-2/
#Git-Clone:git://git.profusion.mobi/kmod
Source: %name-%version.tar.xz
+Source2:%name-%version.tar.sign
+Patch1: kmod-so-version.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?git_snapshot}
-BuildRequires: autoconf automake libtool
-%endif
-BuildRequires: pkgconfig = 0.23 pkgconfig(liblzma) pkgconfig(zlib) xz
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: pkgconfig = 0.23
+BuildRequires: xz
+BuildRequires: pkgconfig(liblzma) = 4.99
+BuildRequires: pkgconfig(zlib)
%description
kmod is a set of tools to handle common tasks with Linux kernel
@@ -69,23 +72,23 @@
%package -n libkmod-devel
Summary:Development files for libkmod
-Group: Development/Libraries/C and C++
License:LGPL-2.1+
+Group: Development/Libraries/C and C++
Requires: %lname = %version
%description -n libkmod-devel
libkmod was created to allow programs to easily insert, remove and
list modules, also checking its properties, dependencies and aliases.
+This package contains the development headers for the library found
+in %lname.
+
%prep
%setup -q
+%patch -P 1 -p1
%build
-%if 0%{?git_snapshot}
-if [ ! -e configure ]; then
- autoreconf -fi;
-fi;
-%endif
+autoreconf -fi;
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
@@ -116,20 +119,35 @@
%files
%defattr(-,root,root)
/bin/kmod
+%_mandir/man5/modules.dep.bin.5*
%files -n %lname
%defattr(-,root,root)
-/%_lib/libkmod.so.1*
+/%_lib/libkmod.so.2*
%files -n libkmod-devel
%defattr(-,root,root)
%_includedir/*
-%_libdir/pkgconfig/*.pc
+%_libdir/pkgconfig/libkmod.pc
%_libdir/libkmod.so
%files compat
%defattr(-,root,root)
/bin/lsmod
-/sbin/*
+/sbin/depmod
+/sbin/insmod
+/sbin/lsmod
+/sbin/modinfo
+/sbin/modprobe
+/sbin/rmmod
+%_mandir/man5/depmod.d.5*
+%_mandir/man5/modprobe.d.5*
+%_mandir/man5/modules.dep.5*
+%_mandir/man8/depmod.8*
+%_mandir/man8/insmod.8*
+%_mandir/man8/lsmod.8*
+%_mandir/man8/modinfo.8*
+%_mandir/man8/modprobe.8*
+%_mandir/man8/rmmod.8*
%changelog
++ kmod-so-version.diff ++
Change the kmod Makefile from using -version-info to -version-number
to make it clear that the kmod project is not trying to subvert the
libtool interface number concept, but in fact does not do
libtool-style counting.
References: alpine.lnx.2.01.1202070049200.12...@frira.zrqbmnf.qr
References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
---
Makefile.am |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
Index: kmod-5/Makefile.am
===
--- kmod-5.orig/Makefile.am
+++ kmod-5/Makefile.am
@@ -39,9 +39,8 @@ SED_PROCESS = \
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-LIBKMOD_CURRENT=2
-LIBKMOD_REVISION=0
-LIBKMOD_AGE=0
commit kmod for openSUSE:Factory
Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2012-01-09 12:04:43
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
Package is kmod, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes2012-01-04
07:24:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-01-09
12:04:47.0 +0100
@@ -1,0 +2,15 @@
+Fri Jan 6 00:48:41 UTC 2012 - jeng...@medozas.de
+
+- Update to new upstream release 3
+* new APIs in libkmod: get symbols from module, parsing the ELF
+ section, dependency symbols, insert module like modprobe
+* support for Xz-compressed modules
+* the depmod tool
+
+---
+Sat Dec 24 17:23:09 UTC 2011 - crrodrig...@opensuse.org
+
+- Use --enable-zlib and buildRequire zlib
+- run make check
+
+---
Old:
kmod-2.tar.xz
New:
kmod-3.tar.xz
Other differences:
--
++ kmod.spec ++
--- /var/tmp/diff_new_pack.wnPVh7/_old 2012-01-09 12:04:49.0 +0100
+++ /var/tmp/diff_new_pack.wnPVh7/_new 2012-01-09 12:04:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kmod
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+
Name: kmod
%define lname libkmod1
Summary:Utilities to load modules into the kernel
-Version:2
+Version:3
Release:0
+%define git_snapshot 0
License:LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-URL: http://www.politreco.com/2011/12/announce-kmod-2/
+Url:http://www.politreco.com/2011/12/announce-kmod-2/
#Git-Clone:git://git.profusion.mobi/kmod
Source: %name-%version.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: pkgconfig, xz
+%if 0%{?git_snapshot}
+BuildRequires: autoconf automake libtool
+%endif
+BuildRequires: pkgconfig = 0.23 pkgconfig(liblzma) pkgconfig(zlib) xz
%description
kmod is a set of tools to handle common tasks with Linux kernel
@@ -39,6 +45,19 @@
with kmod. The aim is to be compatible with tools, configurations and
indexes from module-init-tools project.
+%package compat
+Summary:Compat symlinks for kernel module utilities
+License:GPL-2.0+
+Group: System/Kernel
+Conflicts: module-init-tools
+
+%description compat
+kmod is a set of tools to handle common tasks with Linux kernel
+modules like insert, remove, list, check properties, resolve
+dependencies and aliases.
+
+This package contains traditional name symlinks (lsmod, etc.)
+
%package -n %lname
Summary:Library to interact with Linux kernel modules
License: LGPL-2.1+
@@ -62,14 +81,33 @@
%setup -q
%build
+%if 0%{?git_snapshot}
+if [ ! -e configure ]; then
+ autoreconf -fi;
+fi;
+%endif
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
-%configure --includedir=%_includedir/%name-%version
+%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
+ --with-rootlibdir=/%_lib --bindir=/bin
make %{?_smp_mflags}
%install
+b=%buildroot;
%make_install
-rm -f %buildroot/%_libdir/*.la
+# Remove standalone tools
+rm -f $b/bin/kmod-*;
+rm -f $b/%_libdir/*.la;
+
+# kmod-compat
+mkdir -p $b/bin $b/sbin;
+ln -s kmod $b/bin/lsmod;
+for i in depmod insmod lsmod modinfo modprobe rmmod; do
+ ln -s /bin/kmod $b/sbin/$i;
+done;
+
+%check
+make check
%post -n %lname -p /sbin/ldconfig
@@ -77,11 +115,11 @@
%files
%defattr(-,root,root)
-%_bindir/kmod-*
+/bin/kmod
%files -n %lname
%defattr(-,root,root)
-%_libdir/libkmod.so.1*
+/%_lib/libkmod.so.1*
%files -n libkmod-devel
%defattr(-,root,root)
@@ -89,4 +127,9 @@
%_libdir/pkgconfig/*.pc
%_libdir/libkmod.so
+%files compat
+%defattr(-,root,root)
+/bin/lsmod
+/sbin/*
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
