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.000000000 +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.changes        2016-11-24 
21:18:52.000000000 +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
 BuildRequires:  pkgconfig(liblzma) >= 4.99
 BuildRequires:  pkgconfig(zlib)
-%endif
 Requires:       suse-module-tools
 %define kdir /usr/src/linux-obj/%_target_cpu/default
 
@@ -63,7 +55,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 -p1
 
 %build
 autoreconf -fi
@@ -71,9 +63,6 @@
 # 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" \

++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.bNd0qz/_old  2017-07-12 19:30:29.391062377 +0200
+++ /var/tmp/diff_new_pack.bNd0qz/_new  2017-07-12 19:30:29.391062377 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kmod
 #
-# 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
 %define lname  libkmod2
-Version:        23
+Version:        24
 Release:        0
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1+ and GPL-2.0+
@@ -27,16 +27,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
@@ -44,13 +41,8 @@
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  suse-module-tools
 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
@@ -62,6 +54,15 @@
 with kmod. The aim is to be compatible with tools, configurations and
 indexes from module-init-tools project.
 
+%package bash-completion
+Summary:        Bash completion routines for the kmod utilities
+License:        LGPL-2.1+ and GPL-2.0+
+Group:          System/Shells
+BuildArch:      noarch
+
+%description bash-completion
+Contains bash completion support for kmod utilities.
+
 %package compat
 Summary:        Compat symlinks for kernel module utilities
 License:        GPL-2.0+
@@ -102,7 +103,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 -p1
 
 %build
 autoreconf -fi
@@ -110,9 +111,6 @@
 # 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" \
@@ -125,19 +123,10 @@
 %make_install
 rm -f "$b/%_libdir"/*.la
 
-mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin"
+mkdir -p "$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"
-
-       #
-       # 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"
 for i in lsmod; do
@@ -145,18 +134,6 @@
        ln -s "%_bindir/kmod" "$b/bin/$i"
 done
 
-#
-# make (all ancient versions of) mkinitrd happy which did not look in /usr
-#
-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.3.1" "$b/%_lib/"
-ln -s libkmod.so.2.3.1 "$b/%_lib/libkmod.so.2"
-ls -l "$b/%_lib/"
-%endif
-
 %post
 %{?regenerate_initrd_post}
 
@@ -169,15 +146,22 @@
 %files
 %defattr(-,root,root)
 %_bindir/kmod
-%_libexecdir/kmod
-/bin/kmod
+%_bindir/lsmod
+%_sbindir/depmod
+%_sbindir/insmod
+%_sbindir/lsmod
+%_sbindir/modinfo
+%_sbindir/modprobe
+%_sbindir/rmmod
+%_mandir/man[58]/*.[58]*
+
+%files bash-completion
+%defattr(-,root,root)
 %_datadir/bash-completion/
-%_mandir/man8/kmod.8*
 
 %files -n %lname
 %defattr(-,root,root)
 %_libdir/libkmod.so.2*
-/%_lib/libkmod.so.2*
 
 %files -n libkmod-devel
 %defattr(-,root,root)
@@ -187,14 +171,7 @@
 
 %files compat
 %defattr(-,root,root)
-%_bindir/lsmod
-%_sbindir/depmod
-%_sbindir/insmod
-%_sbindir/lsmod
-%_sbindir/modinfo
-%_sbindir/modprobe
-%_sbindir/rmmod
-# UsrMerge
+# The very very old paths (UsrMerge)
 /bin/lsmod
 /sbin/depmod
 /sbin/insmod
@@ -203,15 +180,5 @@
 /sbin/modprobe
 /sbin/rmmod
 # EndUsrMerge
-%_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*
-%_mandir/man8/modinfo.8*
-%_mandir/man8/modprobe.8*
-%_mandir/man8/rmmod.8*
 
 %changelog

++++++ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch ++++++
--- /var/tmp/diff_new_pack.bNd0qz/_old  2017-07-12 19:30:29.419058427 +0200
+++ /var/tmp/diff_new_pack.bNd0qz/_new  2017-07-12 19:30:29.419058427 +0200
@@ -7,16 +7,16 @@
 References: fate#316971
 Patch-mainline: never
 ---
- libkmod/libkmod-config.c   | 12 ++++++++++--
- libkmod/libkmod-internal.h |  1 +
- libkmod/libkmod-module.c   | 31 +++++++++++++++++++++++++++++++
+ libkmod/libkmod-config.c   |   12 ++++++++++--
+ libkmod/libkmod-internal.h |    1 +
+ libkmod/libkmod-module.c   |   31 +++++++++++++++++++++++++++++++
  3 files changed, 42 insertions(+), 2 deletions(-)
 
-diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index 79bfb9b..9f47cfd 100644
---- a/libkmod/libkmod-config.c
-+++ b/libkmod/libkmod-config.c
-@@ -668,8 +668,16 @@ static int kmod_config_parse(struct kmod_config *config, 
int fd,
+Index: kmod-24/libkmod/libkmod-config.c
+===================================================================
+--- kmod-24.orig/libkmod/libkmod-config.c
++++ kmod-24/libkmod/libkmod-config.c
+@@ -651,8 +651,16 @@ static int kmod_config_parse(struct kmod
                        ERR(ctx, "%s: command %s is deprecated and not parsed 
anymore\n",
                                                                filename, cmd);
                } else if (streq(cmd, "allow_unsupported_modules")) {
@@ -35,10 +35,10 @@
                } else {
  syntax_error:
                        ERR(ctx, "%s line %u: ignoring bad line starting with 
'%s'\n",
-diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
-index 93a00c1..3a46b6b 100644
---- a/libkmod/libkmod-internal.h
-+++ b/libkmod/libkmod-internal.h
+Index: kmod-24/libkmod/libkmod-internal.h
+===================================================================
+--- kmod-24.orig/libkmod/libkmod-internal.h
++++ kmod-24/libkmod/libkmod-internal.h
 @@ -119,6 +119,7 @@ struct kmod_config {
        struct kmod_list *softdeps;
  
@@ -47,11 +47,11 @@
  };
  
  int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const 
char * const *config_paths) __attribute__((nonnull(1, 2,3)));
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index e3cc5a7..3a9ce7c 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -782,6 +782,24 @@ KMOD_EXPORT int kmod_module_remove_module(struct 
kmod_module *mod,
+Index: kmod-24/libkmod/libkmod-module.c
+===================================================================
+--- kmod-24.orig/libkmod/libkmod-module.c
++++ kmod-24/libkmod/libkmod-module.c
+@@ -798,6 +798,24 @@ KMOD_EXPORT int kmod_module_remove_modul
  
  extern long init_module(const void *mem, unsigned long len, const char *args);
  
@@ -76,7 +76,7 @@
  /**
   * kmod_module_insert_module:
   * @mod: kmod module
-@@ -807,6 +825,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct 
kmod_module *mod,
+@@ -823,6 +841,7 @@ KMOD_EXPORT int kmod_module_insert_modul
        struct kmod_elf *elf;
        const char *path;
        const char *args = options ? options : "";
@@ -84,8 +84,8 @@
  
        if (mod == NULL)
                return -ENOENT;
-@@ -823,6 +842,18 @@ KMOD_EXPORT int kmod_module_insert_module(struct 
kmod_module *mod,
-               return err;
+@@ -841,6 +860,18 @@ KMOD_EXPORT int kmod_module_insert_modul
+               }
        }
  
 +      if (config->block_unsupported) {
@@ -103,6 +103,3 @@
        if (kmod_file_get_direct(mod->file)) {
                unsigned int kernel_flags = 0;
  
--- 
-1.8.4.5
-

++++++ kmod-23.tar.xz -> kmod-24.tar.xz ++++++
++++ 10588 lines of diff (skipped)


Reply via email to