From 297e2a777bf42ebe40dee2440f62a48434c990ac6b9fb30398bab3bfec2fa237 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 16 Nov 2014 20:44:45 +0000 Subject: [PATCH] Accepting request 261932 from home:elvigia:branches:Base:System - Update to kmod 19 * Fix missing CLOEXEC in library * Fix error message while opening kmod's index * Add kmod(8) man page * Clarify tools vs library licenses * 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+. * Improvements to testsuite. OBS-URL: https://build.opensuse.org/request/show/261932 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=80 --- ...-Implement-allow-unsupported-modules.patch | 48 +++++++------------ kmod-18.tar.sign | 17 ------- kmod-18.tar.xz | 3 -- kmod-19.tar.sign | 17 +++++++ kmod-19.tar.xz | 3 ++ kmod.changes | 13 +++++ kmod.spec | 5 +- 7 files changed, 54 insertions(+), 52 deletions(-) delete mode 100644 kmod-18.tar.sign delete mode 100644 kmod-18.tar.xz create mode 100644 kmod-19.tar.sign create mode 100644 kmod-19.tar.xz diff --git a/0010-modprobe-Implement-allow-unsupported-modules.patch b/0010-modprobe-Implement-allow-unsupported-modules.patch index 977a3cf..bb15965 100644 --- a/0010-modprobe-Implement-allow-unsupported-modules.patch +++ b/0010-modprobe-Implement-allow-unsupported-modules.patch @@ -14,12 +14,10 @@ Patch-mainline: never create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h -diff --git a/Makefile.am b/Makefile.am -index 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 @@ index eb63073..1c3eee4 100644 libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \ -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) -diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c -new file mode 100644 -index 0000000..7ef9fc8 --- /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 @@ index 0000000..7ef9fc8 + + config->block_unsupported = 0; +} -diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h -new file mode 100644 -index 0000000..a95b4a2 --- /dev/null -+++ b/libkmod/libkmod-unsupported.h ++++ kmod-19/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ +#pragma once + @@ -58,19 +50,18 @@ index 0000000..a95b4a2 + * library + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); -diff --git a/tools/modprobe.c b/tools/modprobe.c -index 589cc07..7d0949d 100644 ---- a/tools/modprobe.c -+++ b/tools/modprobe.c -@@ -33,6 +33,7 @@ - - #include "libkmod.h" - #include "libkmod-array.h" -+#include "libkmod-unsupported.h" - #include "macro.h" +--- kmod-19.orig/tools/modprobe.c ++++ kmod-19/tools/modprobe.c +@@ -38,6 +38,8 @@ #include "kmod.h" -@@ -755,6 +756,7 @@ static int do_modprobe(int argc, char **orig_argv) + ++#include "libkmod-unsupported.h" ++ + static int log_priority = LOG_CRIT; + static int use_syslog = 0; + #define LOG(...) log_printf(log_priority, __VA_ARGS__) +@@ -756,6 +758,7 @@ static int do_modprobe(int argc, char ** int do_remove = 0; int do_show_config = 0; int do_show_modversions = 0; @@ -78,7 +69,7 @@ index 589cc07..7d0949d 100644 int err; argv = prepend_options_from_env(&argc, orig_argv); -@@ -838,7 +840,7 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -839,7 +842,7 @@ static int do_modprobe(int argc, char ** kversion = optarg; break; case 128: @@ -87,7 +78,7 @@ index 589cc07..7d0949d 100644 break; case 's': env_modprobe_options_append("-s"); -@@ -910,6 +912,9 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -911,6 +914,9 @@ static int do_modprobe(int argc, char ** log_setup_kmod_log(ctx, verbose); @@ -97,6 +88,3 @@ index 589cc07..7d0949d 100644 kmod_load_resources(ctx); if (do_show_config) --- -1.8.4.5 - diff --git a/kmod-18.tar.sign b/kmod-18.tar.sign deleted file mode 100644 index f3c40c7..0000000 --- a/kmod-18.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABAgAGBQJTnG6zAAoJEJuipaYwy+pTyPkP/imTpAH2BC0rFkew2DRV9PsT -UYmS9HxSxdB5UNgew+7mpns1g5qnta24y5IECWNIYqlUq0LWloc55NwQFkiNSz5F -aZE144rejAer2w91GtEAzejIEa67IGjEWClWP69GO0ijhDis1/M8fEOnfCaGLgUK -cCGyhq+yE92Ek9lB1YV3MTrU4iybz2v5EUjQlK2guWkono0ujW+5mOAT16x4mVOR -k7Q7jfiLVuU89oqAjU8FJrYGoCNvZEw2Lw/TpnIz3tdFBCLn+rE9HKp03yKH6Cpb -LWTsrWOElx95nyIsPdwATtdsZnv9FjOFvxdEyTPpuxZPwnvxK44E2W8mQ9U7Kmb9 -swBNbJKYVLufqYnkE7hArpSkcte/cFxVuyaSnIiqzgcFjNWCa8vx98iGzryt1mHB -Ff1GPsIX300O/vzzO/LEXJjs1bV9N9B7JXocRyf5YDnJJftvtgMrD1Lx1WZlrSmW -oiule9hfcxJRZJOHyuIhPjOp8Q8vwgSetMGDTTgzWd6NULStukE7tDj/bwdr8DiZ -x59IeargaCirpO1ePlp30T3Kl26e+oblVdQRAv4mA3pyTFbzi1U0KMf6gqq0Bv6e -T8YRGuWEZOpvd6L9g0t/osiKBeIMZfUp7tP/1+Qydc7ESx/n9eQx2dp11OWIdUTE -HnO4bckdcnlemdNkNr7L -=3wwv ------END PGP SIGNATURE----- diff --git a/kmod-18.tar.xz b/kmod-18.tar.xz deleted file mode 100644 index 206e4a0..0000000 --- a/kmod-18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e -size 1473904 diff --git a/kmod-19.tar.sign b/kmod-19.tar.sign new file mode 100644 index 0000000..6182ab1 --- /dev/null +++ b/kmod-19.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABAgAGBQJUaJgbAAoJEJuipaYwy+pTf8cP/20YgEUIg/jeey7dVJ9kI/Fb +68yuu3lDR8mfi+LWduRoDHxfbFLVUTs3FWv5ub8i3gEan9LnTzArCs4X4j+kFvAr +Ecr2lYXRXJlZC7k9o11ljUlE+geJLSNi+lE2urI+dAYvR8kgjddRijGul+qpMu1V +LTx1PZHGYDyo4XDSwN0zDU2xwI9zehMflJgqzx6ltaDFMX/S7qOxVZVYMlwhugdF +p4maCE9xdJVkbMv4wgxdqwyn1ZtZNsIbbJigpyPafJyCDSi2ocD6c9TsqK4czUdz +7OyHlc27UtyX53PVhdH/I47cej6CnLpLDpTvnm92S72+Cvb2I6UMJ9TGniXKmQjs +cOwsljGHQF5w9eekjuVQOp678B9dTwdjywupGryzyVLdDjoH6yhhEv/vd4wqYAxy +9bBDUX9Kuf4GS4UTlXbVUwJ6oy6JK5ZlhrazMoTdQBaf0pIyKKrtk/LZiuNz3NjX +Myu/2UJVAcIYsgD3sbxVaK399apgqknJxlbMmHJieTU9EA/Oc9yCk2M4X6d067OF +nslyWhlv9xHv5iiJjuIlHPTcMwSMVdA5/2cJKDcA73Dj2t5xWUn+8X9x88LRV0pZ +nVJHZuXM6D8qhfxAK3cgs+c5noc3448rJsC7fQR4DyEbO9c302AU6V2ilOGII6mE +G0Tzn6ahVTfP9sdZFria +=oJOo +-----END PGP SIGNATURE----- diff --git a/kmod-19.tar.xz b/kmod-19.tar.xz new file mode 100644 index 0000000..e6613c9 --- /dev/null +++ b/kmod-19.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 +size 1473916 diff --git a/kmod.changes b/kmod.changes index 1b25958..bbe80a3 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Nov 16 18:22:37 UTC 2014 - crrodriguez@opensuse.org + +- Update to kmod 19 +* Fix missing CLOEXEC in library +* Fix error message while opening kmod's index +* Add kmod(8) man page +* Clarify tools vs library licenses +* 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+. +* Improvements to testsuite. + ------------------------------------------------------------------- Sat Nov 8 00:16:55 UTC 2014 - crrodriguez@opensuse.org diff --git a/kmod.spec b/kmod.spec index f2e6a7b..b299127 100644 --- a/kmod.spec +++ b/kmod.spec @@ -21,7 +21,7 @@ Name: kmod 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/ @@ -150,7 +150,7 @@ 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.8" "$b/%_lib/"; +ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/"; %endif %check @@ -166,6 +166,7 @@ make check %_libexecdir/%name /bin/kmod %_datadir/bash-completion/ +%_mandir/man8/kmod.8* %files -n %lname %defattr(-,root,root)