packages: kmod/kmod.spec, kmod/kmod-git.patch (NEW)=?UTF-8?Q?=20?=- rel 2; fix modprobe -...

[arekm]

Author: arekm                        Date: Wed Feb 15 18:32:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix modprobe --show-depends in some cases

---- Files affected:
packages/kmod:
   kmod.spec (1.13 -> 1.14) , kmod-git.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kmod/kmod.spec
diff -u packages/kmod/kmod.spec:1.13 packages/kmod/kmod.spec:1.14
--- packages/kmod/kmod.spec:1.13	Sun Feb 12 17:55:27 2012
+++ packages/kmod/kmod.spec	Wed Feb 15 19:32:35 2012
@@ -6,13 +6,14 @@
 Summary(pl.UTF-8):	Obsługa modułów jądra Linuksa
 Name:		kmod
 Version:	5
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://packages.profusion.mobi/kmod/%{name}-%{version}.tar.xz
 # Source0-md5:	b271c2ec54aba1c67bda63c8579d8c15
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
+Patch0:		%{name}-git.patch
 URL:		http://git.profusion.mobi/cgit.cgi/kmod.git/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
@@ -82,6 +83,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -168,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/02/15 18:32:35  arekm
+- rel 2; fix modprobe --show-depends in some cases
+
 Revision 1.13  2012/02/12 16:55:27  arekm
 - add TODO
 

================================================================
Index: packages/kmod/kmod-git.patch
diff -u /dev/null packages/kmod/kmod-git.patch:1.1
--- /dev/null	Wed Feb 15 19:32:40 2012
+++ packages/kmod/kmod-git.patch	Wed Feb 15 19:32:35 2012
@@ -0,0 +1,36 @@
+From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi at profusion.mobi>
+Date: Tue, 07 Feb 2012 11:48:59 +0000
+Subject: libkmod-module: probe: Fix ignore-loaded flag not being applied
+
+---
+diff --git a/TODO b/TODO
+index 23d7c76..6ab11f1 100644
+--- a/TODO
++++ b/TODO
+@@ -38,6 +38,9 @@ Features:
+ 
+ * Stop using system() inside the library and use fork + exec instead
+ 
++* Add tests for --show-depends: we need to first trap calls to
++  kmod_module_get_path(), because it's printed to stdout/stderr.
++
+ Known Bugs:
+ ===========
+ 
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 0af3e2e..b5eb7c9 100644
+--- a/libkmod/libkmod-module.c
++++ b/libkmod/libkmod-module.c
+@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
+ 	if (mod == NULL)
+ 		return -ENOENT;
+ 
+-	if (module_is_inkernel(mod)) {
++	if (!(flags & KMOD_PROBE_IGNORE_LOADED)
++					&& module_is_inkernel(mod)) {
+ 		if (flags & KMOD_PROBE_FAIL_ON_LOADED)
+ 			return -EEXIST;
+ 		else
+--
+cgit v0.9.0.2-52-g1de3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kmod/kmod.spec?r1=1.13&r2=1.14&f=u