[arch-commits] CVS update of core/base/module-init-tools (2 files)

[Tobias Powalowski]

    Date: Wednesday, March 12, 2008 @ 05:11:18
  Author: tpowa
    Path: /home/cvs-core/core/base/module-init-tools

   Added: fix-modprobe-ignore-path.patch (1.1)
Modified: PKGBUILD (1.19 -> 1.20)

'upgpkg: fixed ignoring of modprobe.d if modprobe.conf exists'


--------------------------------+
 PKGBUILD                       |    9 ++++-----
 fix-modprobe-ignore-path.patch |   14 ++++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)


Index: core/base/module-init-tools/PKGBUILD
diff -u core/base/module-init-tools/PKGBUILD:1.19 core/base/module-init-tools/PKGBUILD:1.20
--- core/base/module-init-tools/PKGBUILD:1.19	Thu Nov 15 19:02:35 2007
+++ core/base/module-init-tools/PKGBUILD	Wed Mar 12 05:11:18 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.19 2007/11/16 00:02:35 daniel Exp $
+# $Id: PKGBUILD,v 1.20 2008/03/12 09:11:18 tpowa Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=module-init-tools
 pkgver=3.2.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Utilities for inserting and removing modules from the Linux kernel"
 arch=(i686 x86_64)
 url="http://www.kernel.org"
@@ -13,13 +13,12 @@
 replaces=('modutils')
 backup=('etc/modprobe.conf' 'etc/modules.conf' 'etc/modprobe.devfs')
 source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 \
-	makefile.patch modprobe.conf)
-md5sums=('a1ad0a09d3231673f70d631f3f5040e9' '47e14fda7a46668290d11d0444d81826'\
-         '6db59d41e04941a790f80c1a4432faef')
+	makefile.patch modprobe.conf fix-modprobe-ignore-path.patch)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   patch -Np1 -i ../makefile.patch || return 1
+  patch -Np0 -i ../fix-modprobe-ignore-path.patch || return 1
   sed -i 's|/usr/bin/install|/bin/install|g' install-with-care
   ./configure --prefix=/usr --exec-prefix=/
   make || return 1
Index: core/base/module-init-tools/fix-modprobe-ignore-path.patch
diff -u /dev/null core/base/module-init-tools/fix-modprobe-ignore-path.patch:1.1
--- /dev/null	Wed Mar 12 05:11:18 2008
+++ core/base/module-init-tools/fix-modprobe-ignore-path.patch	Wed Mar 12 05:11:18 2008
@@ -0,0 +1,14 @@
+--- modprobe.c~	2005-12-02 00:42:09.000000000 +0100
++++ modprobe.c	2008-03-12 09:39:14.000000000 +0100
+@@ -1236,9 +1236,8 @@
+ 
+ 	/* Try defaults. */
+ 	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
+-		if (read_config(default_configs[i], name, dump_only, removing,
+-				options, commands, aliases, blacklist))
+-			return;
++		read_config(default_configs[i], name, dump_only, removing,
++				options, commands, aliases, blacklist);
+ 	}
+ }
+