Accepting request 107901 from Base:System

- 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

OBS-URL: https://build.opensuse.org/request/show/107901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=4

kmod-5.tar.sign

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iQIcBAABAgAGBQJPMFn6AAoJEJuipaYwy+pTs1MP/1itv8M+ucm4k/dmgWDiA5D5
-LS1m3A63kuC4v4Bf38AVh6dkj/b9A2wqcOkmaHGffxf+tFSYPrzN/aXLT3kuzOWd
-aDICCr41Sd38HmbphRURCuaJQAJqWKQwT4Ap8hHr7COewr0jAaWDHreQgSJtEn0x
-a8con4ps2IghNQYkKtJIuAn8cAkRlAcE5LUn+/n5dMPUipirFNCUcj2CAUzbUNnm
-7NCPxA3wXpebtmXo8Fu6NEvPmZd4JQNz7AHAUiFoMXjoxmSVhCA1rs9f05GuiHF5
-koLziYSB1Mf76RPZr3YT2r7032qlBMzpyGOxqgXNpDPCbIvJj4wBMJltYa0sf5M5
-94a6J9wkBfGqLx5qCjWVNUWQuttmLReqdvWxn8mAebVatj+/Y7AvbkOLEF580Ojd
-sgR2B0MB41GU4kUlToI/M045kre83e/o+ylOomgsAgRCtBr0yHS2tGvow9h5CxiB
-cibzwK5T7jF3PJ9HM7xh4eq9R9jazJKaZJ2Ebofg3KfcRWNfZTIdbbHycGFgioP+
-08pewY04s4Y/R21cCNLc+pxLQOt6ZkRbXMtrx5hfhJm0yxaG9ozrkB8A2BJTnpHX
-8EJ4iFzjNmtlM79o4fpBEuCrleHtFvFso+KZoDGREFP1H5TcxQ6HcAK2t5AF39O1
-2VKNW0UU7WfqCZNkztIz
-=dWRa
------END PGP SIGNATURE-----

kmod-5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cb014f9f95575f1bc4b1f9babb6199a9b8c37fb1b38dc4340a2bcf230e66086
-size 875556

kmod-6.tar.sign

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPUXWSAAoJEJuipaYwy+pTos4P/3CKQ0SL5Srbcz08MhUOyFYc
+R66fuNabGaewCF/Y+bF0EoPfmxlD3mxuzyz7zuK/whGzXY0Hzyw8dKMRAXum/cfT
+c0ydn0g5yGa/haneLQAn7r01Uek3CKPhe7CM+GP+7pX8LeL30I83lH2KO7ah8qIn
+/nxQ4TRxrqxep/reaBB/mJRByApHEXEV8ZcM1dx8EQZgF/xzcujg5ftlXTe75l6d
+dn8gRHOwvNyE2Aq6tfG0K6O/0uDXVcUYMiImPFc8wtxRYMvTu9hC7+Ch9rsdWu4/
+i9HdOP/CD6C9qq7sXb75PNcwEdl6F//1YqPD3HXNfvxfbDZKigz/FqEryxjGWjff
+FG669vjNueu1G1N1I/+kitQEIVjJR6K+jbqShUlS/UcxlAZ68FwvRZ6+7K3H2fPf
+0HlaxdnnkCxrAiXsw9Pu1i1wNK1tqOvi1alURBOHqfcvHiqD8a1tM3zzoOlzOC/1
+qq2truxkntKeYa9rARwRIZkf3PrRzB38nSYQvfKBRjBmDQSJlIrxn7GIOOS5l8wq
+XIAU8jlj3iIpUkZC9ZZc0LIxgrZVYOwYAUbDvaD92VOIlYDfcpSaTmt2CDS8Iy4a
+JH4FCbXGVlpm4/cyqokcpek+R7FVQ+omqd1KL9gjmPscU6OLimGucbtwuH5PsYCo
+l04ZnsdH/0CwcCGXMj8n
+=E+w9
+-----END PGP SIGNATURE-----

kmod-6.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f1142519916d2dbe780693045a1b2d52d0b2212ec1bd23dd5a03134c3ba62b7
+size 999660

kmod-so-version.diff

@@ -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: <alpine.LNX.2.01.1202070049200.12889@frira.zrqbmnf.qr>
 References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
 
 ---
- Makefile.am |    9 ++++-----
+ Makefile.am |    6 +-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
-Index: kmod-5/Makefile.am
+Index: kmod-6/Makefile.am
 ===================================================================
---- kmod-5.orig/Makefile.am
+--- kmod-6.orig/Makefile.am
-+++ kmod-5/Makefile.am
++++ kmod-6/Makefile.am
-@@ -39,9 +39,8 @@ SED_PROCESS = \
+@@ -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_AGE=1
-+LIBKMOD_SO_MAJOR=2
+-
-+LIBKMOD_SO_MINOR=0
- 
  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

kmod.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Mar  3 20:50:43 UTC 2012 - jengelh@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
+
 -------------------------------------------------------------------
 Tue Feb  7 00:56:51 UTC 2012 - jengelh@medozas.de
 

kmod.spec

@@ -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 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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 @@ make %{?_smp_mflags}
 %install
 b="%buildroot";
 %make_install
-# Remove standalone tools
 rm -f "$b/bin"/kmod-*;
 rm -f "$b/%_libdir"/*.la;