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.changes 2016-07-10 18:46:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2016-07-28 23:44:18.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 21 09:56:02 UTC 2016 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.IK873y/_new 2016-07-28 23:44:19.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.IK873y/_new 2016-07-28 23:44:19.000000000 +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; + 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) +# 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/"; +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.3.0" "$b/%_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 @@ -165,7 +162,6 @@ %{?regenerate_initrd_posttrans} %post -n %lname -p /sbin/ldconfig - %postun -n %lname -p /sbin/ldconfig %files ++++++ kmod-22.tar.xz -> kmod-23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/Makefile.am new/kmod-23/Makefile.am --- old/kmod-22/Makefile.am 2015-11-18 00:55:20.000000000 +0100 +++ new/kmod-23/Makefile.am 2016-07-20 06:33:26.000000000 +0200 @@ -41,7 +41,7 @@ $(SED_PROCESS) LIBKMOD_CURRENT=5 -LIBKMOD_REVISION=0 +LIBKMOD_REVISION=1 LIBKMOD_AGE=3 noinst_LTLIBRARIES = shared/libshared.la @@ -107,7 +107,7 @@ if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libkmod.so) && \ - so_img_rel_target_prefix=$$(echo $(libdir) | sed -E 's,(^/|)[^/][^/]*,..,g') && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \ mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \ fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/Makefile.in new/kmod-23/Makefile.in --- old/kmod-22/Makefile.in 2015-11-18 01:08:38.000000000 +0100 +++ new/kmod-23/Makefile.in 2016-07-20 06:36:32.000000000 +0200 @@ -936,7 +936,7 @@ < $< > $@ || rm $@ LIBKMOD_CURRENT = 5 -LIBKMOD_REVISION = 0 +LIBKMOD_REVISION = 1 LIBKMOD_AGE = 3 noinst_LTLIBRARIES = shared/libshared.la libkmod/libkmod-internal.la shared_libshared_la_SOURCES = \ @@ -2816,7 +2816,7 @@ if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libkmod.so) && \ - so_img_rel_target_prefix=$$(echo $(libdir) | sed -E 's,(^/|)[^/][^/]*,..,g') && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \ mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \ fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/NEWS new/kmod-23/NEWS --- old/kmod-22/NEWS 2015-11-18 01:08:07.000000000 +0100 +++ new/kmod-23/NEWS 2016-06-28 20:28:39.000000000 +0200 @@ -1,3 +1,32 @@ +kmod 23 +======= + +- Improvements: + - Don't add comment to modules.devname if it would otherwise be empty + to play nice with tools detecting empty files + + - Allow building with BSD sed, that doesn't have -E flag + + - Ignore .TOC. symbols in depmod parsing as it's for PPC64 the + equivalent of _GLOBAL_OFFSET_TABLE_ + + - Teach modinfo about PKCS#7 module signatures: it doesn't add any + other info besides telling the user the module is signed since + kernel doesn't add other info on the module section + +- Bug fixes + + - Fix -s and -p compat options to insmod triggering force flag + + - Fix long lines from /proc/modules not being handled correctly by + kmod_module_new_from_loaded() and kmod_module_get_size() and several + other library functions that use them + + - Fix crash on modinfo while checking for available signature of + unknown type + + - Fix documentation generation with gtk-doc + kmod 22 ======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/README new/kmod-23/README --- old/kmod-22/README 2015-09-30 20:16:57.000000000 +0200 +++ new/kmod-23/README 2016-05-24 16:45:15.000000000 +0200 @@ -9,6 +9,9 @@ Mailing list: [email protected] (no subscription needed) +Patchwork: + https://patchwork.kernel.org/project/linux-modules/ + Signed packages: http://www.kernel.org/pub/linux/utils/kernel/kmod/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/build-aux/config.guess new/kmod-23/build-aux/config.guess --- old/kmod-22/build-aux/config.guess 2015-01-25 09:34:06.000000000 +0100 +++ new/kmod-23/build-aux/config.guess 2016-02-03 18:37:24.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-11-04' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/build-aux/config.sub new/kmod-23/build-aux/config.sub --- old/kmod-22/build-aux/config.sub 2015-01-25 09:34:06.000000000 +0100 +++ new/kmod-23/build-aux/config.sub 2016-02-03 18:37:24.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-12-03' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -260,7 +260,7 @@ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ - | fido | fr30 | frv \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -1025,7 +1025,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/configure new/kmod-23/configure --- old/kmod-22/configure 2015-11-18 01:08:38.000000000 +0100 +++ new/kmod-23/configure 2016-07-20 06:36:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for kmod 22. +# Generated by GNU Autoconf 2.69 for kmod 23. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='kmod' PACKAGE_TARNAME='kmod' -PACKAGE_VERSION='22' -PACKAGE_STRING='kmod 22' +PACKAGE_VERSION='23' +PACKAGE_STRING='kmod 23' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git' @@ -1409,7 +1409,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures kmod 22 to adapt to many kinds of systems. +\`configure' configures kmod 23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1479,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of kmod 22:";; + short | recursive ) echo "Configuration of kmod 23:";; esac cat <<\_ACEOF @@ -1634,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -kmod configure 22 +kmod configure 23 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2106,7 +2106,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by kmod $as_me 22, which was +It was created by kmod $as_me 23, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4574,7 +4574,7 @@ # Define the identity of the package. PACKAGE='kmod' - VERSION='22' + VERSION='23' cat >>confdefs.h <<_ACEOF @@ -11561,6 +11561,9 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -11569,7 +11572,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15680,7 +15683,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by kmod $as_me 22, which was +This file was extended by kmod $as_me 23, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15747,7 +15750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -kmod config.status 22 +kmod config.status 23 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/configure.ac new/kmod-23/configure.ac --- old/kmod-22/configure.ac 2015-11-18 00:56:45.000000000 +0100 +++ new/kmod-23/configure.ac 2016-07-20 06:32:42.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.64) AC_INIT([kmod], - [22], + [23], [[email protected]], [kmod], [http://git.kernel.org/?p=utils/kernel/kmod/kmod.git]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/docs/Makefile.am new/kmod-23/libkmod/docs/Makefile.am --- old/kmod-22/libkmod/docs/Makefile.am 2014-10-28 04:24:50.000000000 +0100 +++ new/kmod-23/libkmod/docs/Makefile.am 2016-06-28 17:15:36.000000000 +0200 @@ -25,8 +25,10 @@ content_files = version.xml +EXTRA_DIST = + if ENABLE_GTK_DOC include $(top_srcdir)/libkmod/docs/gtk-doc.make else -EXTRA_DIST = libkmod-docs.xml libkmod-sections.txt +EXTRA_DIST += libkmod-docs.xml libkmod-sections.txt endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/docs/Makefile.in new/kmod-23/libkmod/docs/Makefile.in --- old/kmod-22/libkmod/docs/Makefile.in 2015-11-18 01:08:38.000000000 +0100 +++ new/kmod-23/libkmod/docs/Makefile.in 2016-07-20 06:36:32.000000000 +0200 @@ -93,6 +93,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_GTK_DOC_TRUE@am__append_1 = \ +@ENABLE_GTK_DOC_TRUE@ $(HTML_IMAGES) \ +@ENABLE_GTK_DOC_TRUE@ $(SETUP_FILES) + +@ENABLE_GTK_DOC_FALSE@am__append_2 = libkmod-docs.xml libkmod-sections.txt subdir = libkmod/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ @@ -298,6 +303,7 @@ libkmod-index.h content_files = version.xml +EXTRA_DIST = $(am__append_1) $(am__append_2) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @@ -319,11 +325,6 @@ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_FALSE@EXTRA_DIST = libkmod-docs.xml libkmod-sections.txt -@ENABLE_GTK_DOC_TRUE@EXTRA_DIST = \ -@ENABLE_GTK_DOC_TRUE@ $(HTML_IMAGES) \ -@ENABLE_GTK_DOC_TRUE@ $(SETUP_FILES) - @ENABLE_GTK_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ @ENABLE_GTK_DOC_TRUE@ html-build.stamp pdf-build.stamp \ @ENABLE_GTK_DOC_TRUE@ sgml.stamp html.stamp pdf.stamp @@ -495,10 +496,10 @@ @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." @ENABLE_GTK_DOC_FALSE@clean-local: -@ENABLE_GTK_DOC_FALSE@distclean-local: -@ENABLE_GTK_DOC_FALSE@uninstall-local: @ENABLE_GTK_DOC_FALSE@install-data-local: @ENABLE_GTK_DOC_FALSE@maintainer-clean-local: +@ENABLE_GTK_DOC_FALSE@distclean-local: +@ENABLE_GTK_DOC_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -639,7 +640,7 @@ @ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @ENABLE_GTK_DOC_TRUE@ @true -@[email protected]: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +@[email protected]: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XML)_source_dir='' ; \ @ENABLE_GTK_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @ENABLE_GTK_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -650,6 +651,17 @@ @[email protected]: sgml-build.stamp @ENABLE_GTK_DOC_TRUE@ @true +@ENABLE_GTK_DOC_TRUE@xml/gtkdocentities.ent: Makefile +@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package \"$(PACKAGE)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \ +@ENABLE_GTK_DOC_TRUE@ echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \ +@ENABLE_GTK_DOC_TRUE@ ) > $@ + @[email protected]: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ @ENABLE_GTK_DOC_TRUE@ mkhtml_options=""; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/docs/gtk-doc.make new/kmod-23/libkmod/docs/gtk-doc.make --- old/kmod-22/libkmod/docs/gtk-doc.make 2015-05-29 22:00:12.000000000 +0200 +++ new/kmod-23/libkmod/docs/gtk-doc.make 2016-02-10 22:21:36.000000000 +0100 @@ -30,7 +30,7 @@ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -EXTRA_DIST = \ +EXTRA_DIST += \ $(HTML_IMAGES) \ $(SETUP_FILES) @@ -142,7 +142,7 @@ GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -153,6 +153,17 @@ sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo "<!ENTITY package \"$(PACKAGE)\">"; \ + echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \ + echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \ + echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \ + echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \ + echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \ + echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \ + ) > $@ + #### html #### GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/libkmod-module.c new/kmod-23/libkmod/libkmod-module.c --- old/kmod-22/libkmod/libkmod-module.c 2015-06-18 06:32:27.000000000 +0200 +++ new/kmod-23/libkmod/libkmod-module.c 2016-06-27 13:17:55.000000000 +0200 @@ -1660,13 +1660,14 @@ struct kmod_module *m; struct kmod_list *node; int err; + size_t len = strlen(line); char *saveptr, *name = strtok_r(line, " \t", &saveptr); err = kmod_module_new_from_name(ctx, name, &m); 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 @@ ERR(ctx, "out of memory\n"); kmod_module_unref(m); } +eat_line: + while (line[len - 1] != '\n' && fgets(line, sizeof(line), fp)) + len = strlen(line); } fclose(fp); @@ -1825,12 +1829,13 @@ } while (fgets(line, sizeof(line), fp)) { + size_t len = strlen(line); char *saveptr, *endptr, *tok = strtok_r(line, " \t", &saveptr); long value; lineno++; if (tok == NULL || !streq(tok, mod->name)) - continue; + goto eat_line; tok = strtok_r(NULL, " \t", &saveptr); if (tok == NULL) { @@ -1848,6 +1853,9 @@ size = value; break; +eat_line: + while (line[len - 1] != '\n' && fgets(line, sizeof(line), fp)) + len = strlen(line); } fclose(fp); @@ -1863,7 +1871,7 @@ * Get the ref count of this @mod, as returned by Linux Kernel, by reading * /sys filesystem. * - * Returns: 0 on success or < 0 on failure. + * Returns: the reference count on success or < 0 on failure. */ KMOD_EXPORT int kmod_module_get_refcnt(const struct kmod_module *mod) { @@ -2247,29 +2255,43 @@ struct kmod_list *n; char *key_hex; - n = kmod_module_info_append(list, "signer", strlen("signer"), - sig_info.signer, sig_info.signer_len); + n = kmod_module_info_append(list, "signature", strlen("sig_id"), + sig_info.id_type, strlen(sig_info.id_type)); if (n == NULL) goto list_error; count++; - /* Display the key id as 01:12:DE:AD:BE:EF:... */ - key_hex = malloc(sig_info.key_id_len * 3); - if (key_hex == NULL) - goto list_error; - for (i = 0; i < (int)sig_info.key_id_len; i++) { - sprintf(key_hex + i * 3, "%02X", - (unsigned char)sig_info.key_id[i]); - if (i < (int)sig_info.key_id_len - 1) - key_hex[i * 3 + 2] = ':'; - } - n = kmod_module_info_append(list, "sig_key", strlen("sig_key"), - key_hex, sig_info.key_id_len * 3 - 1); - free(key_hex); + n = kmod_module_info_append(list, "signer", strlen("signer"), + sig_info.signer, sig_info.signer_len); if (n == NULL) goto list_error; count++; + if (sig_info.key_id_len) { + /* Display the key id as 01:12:DE:AD:BE:EF:... */ + key_hex = malloc(sig_info.key_id_len * 3); + if (key_hex == NULL) + goto list_error; + for (i = 0; i < (int)sig_info.key_id_len; i++) { + sprintf(key_hex + i * 3, "%02X", + (unsigned char)sig_info.key_id[i]); + if (i < (int)sig_info.key_id_len - 1) + key_hex[i * 3 + 2] = ':'; + } + n = kmod_module_info_append(list, "sig_key", strlen("sig_key"), + key_hex, sig_info.key_id_len * 3 - 1); + free(key_hex); + if (n == NULL) + goto list_error; + count++; + } else { + n = kmod_module_info_append(list, "sig_key", strlen("sig_key"), + NULL, 0); + if (n == NULL) + goto list_error; + count++; + } + n = kmod_module_info_append(list, "sig_hashalgo", strlen("sig_hashalgo"), sig_info.hash_algo, strlen(sig_info.hash_algo)); @@ -2278,7 +2300,7 @@ count++; /* - * Omit sig_info.id_type and sig_info.algo for now, as these + * Omit sig_info.algo for now, as these * are currently constant. */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/libkmod-signature.c new/kmod-23/libkmod/libkmod-signature.c --- old/kmod-22/libkmod/libkmod-signature.c 2015-02-18 19:48:54.000000000 +0100 +++ new/kmod-23/libkmod/libkmod-signature.c 2016-06-27 13:17:55.000000000 +0200 @@ -69,12 +69,14 @@ enum pkey_id_type { PKEY_ID_PGP, /* OpenPGP generated key ID */ PKEY_ID_X509, /* X.509 arbitrary subjectKeyIdentifier */ + PKEY_ID_PKCS7, /* Signature in PKCS#7 message */ PKEY_ID_TYPE__LAST }; const char *const pkey_id_type[PKEY_ID_TYPE__LAST] = { [PKEY_ID_PGP] = "PGP", [PKEY_ID_X509] = "X509", + [PKEY_ID_PKCS7] = "PKCS#7", }; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/libkmod/python/kmod/version.py new/kmod-23/libkmod/python/kmod/version.py --- old/kmod-22/libkmod/python/kmod/version.py 2015-11-18 01:12:27.000000000 +0100 +++ new/kmod-23/libkmod/python/kmod/version.py 2016-07-20 06:37:52.000000000 +0200 @@ -14,4 +14,4 @@ # You should have received a copy of the GNU Lesser General Public License # along with python-kmod. If not, see <http://www.gnu.org/licenses/>. -__version__ = '22' +__version__ = '23' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/m4/libtool.m4 new/kmod-23/m4/libtool.m4 --- old/kmod-22/m4/libtool.m4 2015-07-19 14:34:46.000000000 +0200 +++ new/kmod-23/m4/libtool.m4 2016-04-29 10:53:19.000000000 +0200 @@ -2867,6 +2867,9 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2875,7 +2878,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/depmod.8 new/kmod-23/man/depmod.8 --- old/kmod-22/man/depmod.8 2015-11-18 01:12:31.000000000 +0100 +++ new/kmod-23/man/depmod.8 2016-07-20 06:37:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: depmod .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: depmod .\" Source: kmod .\" Language: English .\" -.TH "DEPMOD" "8" "11/17/2015" "kmod" "depmod" +.TH "DEPMOD" "8" "07/20/2016" "kmod" "depmod" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/depmod.d.5 new/kmod-23/man/depmod.d.5 --- old/kmod-22/man/depmod.d.5 2015-11-18 01:12:30.000000000 +0100 +++ new/kmod-23/man/depmod.d.5 2016-07-20 06:37:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: depmod.d .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: depmod.d .\" Source: kmod .\" Language: English .\" -.TH "DEPMOD\&.D" "5" "11/17/2015" "kmod" "depmod.d" +.TH "DEPMOD\&.D" "5" "07/20/2016" "kmod" "depmod.d" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/insmod.8 new/kmod-23/man/insmod.8 --- old/kmod-22/man/insmod.8 2015-11-18 01:12:31.000000000 +0100 +++ new/kmod-23/man/insmod.8 2016-07-20 06:37:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: insmod .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: insmod .\" Source: kmod .\" Language: English .\" -.TH "INSMOD" "8" "11/17/2015" "kmod" "insmod" +.TH "INSMOD" "8" "07/20/2016" "kmod" "insmod" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/kmod.8 new/kmod-23/man/kmod.8 --- old/kmod-22/man/kmod.8 2015-11-18 01:12:30.000000000 +0100 +++ new/kmod-23/man/kmod.8 2016-07-20 06:37:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: kmod .\" Author: Lucas De Marchi <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: kmod .\" Source: kmod .\" Language: English .\" -.TH "KMOD" "8" "11/17/2015" "kmod" "kmod" +.TH "KMOD" "8" "07/20/2016" "kmod" "kmod" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/lsmod.8 new/kmod-23/man/lsmod.8 --- old/kmod-22/man/lsmod.8 2015-11-18 01:12:31.000000000 +0100 +++ new/kmod-23/man/lsmod.8 2016-07-20 06:37:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: lsmod .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: lsmod .\" Source: kmod .\" Language: English .\" -.TH "LSMOD" "8" "11/17/2015" "kmod" "lsmod" +.TH "LSMOD" "8" "07/20/2016" "kmod" "lsmod" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/modinfo.8 new/kmod-23/man/modinfo.8 --- old/kmod-22/man/modinfo.8 2015-11-18 01:12:32.000000000 +0100 +++ new/kmod-23/man/modinfo.8 2016-07-20 06:37:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: modinfo .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: modinfo .\" Source: kmod .\" Language: English .\" -.TH "MODINFO" "8" "11/17/2015" "kmod" "modinfo" +.TH "MODINFO" "8" "07/20/2016" "kmod" "modinfo" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/modprobe.8 new/kmod-23/man/modprobe.8 --- old/kmod-22/man/modprobe.8 2015-11-18 01:12:31.000000000 +0100 +++ new/kmod-23/man/modprobe.8 2016-07-20 06:37:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: modprobe .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: modprobe .\" Source: kmod .\" Language: English .\" -.TH "MODPROBE" "8" "11/17/2015" "kmod" "modprobe" +.TH "MODPROBE" "8" "07/20/2016" "kmod" "modprobe" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/modprobe.d.5 new/kmod-23/man/modprobe.d.5 --- old/kmod-22/man/modprobe.d.5 2015-11-18 01:12:30.000000000 +0100 +++ new/kmod-23/man/modprobe.d.5 2016-07-20 06:37:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: modprobe.d .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: modprobe.d .\" Source: kmod .\" Language: English .\" -.TH "MODPROBE\&.D" "5" "11/17/2015" "kmod" "modprobe.d" +.TH "MODPROBE\&.D" "5" "07/20/2016" "kmod" "modprobe.d" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/modules.dep.5 new/kmod-23/man/modules.dep.5 --- old/kmod-22/man/modules.dep.5 2015-11-18 01:12:30.000000000 +0100 +++ new/kmod-23/man/modules.dep.5 2016-07-20 06:37:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: modules.dep .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: modules.dep .\" Source: kmod .\" Language: English .\" -.TH "MODULES\&.DEP" "5" "11/17/2015" "kmod" "modules.dep" +.TH "MODULES\&.DEP" "5" "07/20/2016" "kmod" "modules.dep" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/modules.dep.bin.5 new/kmod-23/man/modules.dep.bin.5 --- old/kmod-22/man/modules.dep.bin.5 2015-11-18 01:12:30.000000000 +0100 +++ new/kmod-23/man/modules.dep.bin.5 2016-07-20 06:37:53.000000000 +0200 @@ -1 +1 @@ -.so modules.dep.5 +.so man5/modules.dep.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/man/rmmod.8 new/kmod-23/man/rmmod.8 --- old/kmod-22/man/rmmod.8 2015-11-18 01:12:31.000000000 +0100 +++ new/kmod-23/man/rmmod.8 2016-07-20 06:37:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: rmmod .\" Author: Jon Masters <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/17/2015 +.\" Date: 07/20/2016 .\" Manual: rmmod .\" Source: kmod .\" Language: English .\" -.TH "RMMOD" "8" "11/17/2015" "kmod" "rmmod" +.TH "RMMOD" "8" "07/20/2016" "kmod" "rmmod" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/tools/depmod.c new/kmod-23/tools/depmod.c --- old/kmod-22/tools/depmod.c 2015-09-30 20:17:05.000000000 +0200 +++ new/kmod-23/tools/depmod.c 2016-06-11 05:27:39.000000000 +0200 @@ -1999,8 +1999,7 @@ static int output_devname(struct depmod *depmod, FILE *out) { size_t i; - - fputs("# Device nodes to trigger on-demand module loading.\n", out); + bool empty = true; for (i = 0; i < depmod->modules.count; i++) { const struct mod *mod = depmod->modules.array[i]; @@ -2036,10 +2035,15 @@ } if (devname != NULL) { - if (type != '\0') + if (type != '\0') { + if (empty) { + fputs("# Device nodes to trigger on-demand module loading.\n", + out); + empty = false; + } fprintf(out, "%s %s %c%u:%u\n", mod->modname, devname, type, major, minor); - else + } else ERR("Module '%s' has devname (%s) but " "lacks major and minor information. " "Ignoring.\n", mod->modname, devname); @@ -2149,6 +2153,8 @@ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmod-22/tools/insmod.c new/kmod-23/tools/insmod.c --- old/kmod-22/tools/insmod.c 2015-10-25 16:57:17.000000000 +0100 +++ new/kmod-23/tools/insmod.c 2016-03-11 00:08:24.000000000 +0100 @@ -81,6 +81,8 @@ switch (c) { case 'p': case 's': + /* ignored, for compatibility only */ + break; case 'f': flags |= KMOD_PROBE_FORCE_MODVERSION; flags |= KMOD_PROBE_FORCE_VERMAGIC;
