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

[Thomas Baechler]

    Date: Sunday, March 16, 2008 @ 10:25:08
  Author: thomas
    Path: /home/cvs-core/core/base/klibc-module-init-tools

   Added: fix-modprobe-ignore-path.patch (1.1)
Modified: PKGBUILD (1.2 -> 1.3)

upgpkg: klibc-module-init-tools 3.2.2-3
    add the same patch that has been added for m-i-t


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


Index: core/base/klibc-module-init-tools/PKGBUILD
diff -u core/base/klibc-module-init-tools/PKGBUILD:1.2 core/base/klibc-module-init-tools/PKGBUILD:1.3
--- core/base/klibc-module-init-tools/PKGBUILD:1.2	Wed Feb 27 20:13:57 2008
+++ core/base/klibc-module-init-tools/PKGBUILD	Sun Mar 16 10:25:07 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.2 2008/02/27 19:13:57 thomas Exp $
+# $Id: PKGBUILD,v 1.3 2008/03/16 09:25:07 thomas Exp $
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=klibc-module-init-tools
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Utilities for inserting and removing modules from the Linux kernel"
 arch=(i686 x86_64)
 url="http://www.kernel.org"
@@ -11,13 +11,16 @@
 groups=('base')
 depends=('klibc>=1.5-4')
 source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 \
-	makefile.patch)
+	makefile.patch
+	fix-modprobe-ignore-path.patch)
 md5sums=('a1ad0a09d3231673f70d631f3f5040e9'
-         '47e14fda7a46668290d11d0444d81826')
+         '47e14fda7a46668290d11d0444d81826'
+         '335c3f8317f257ddd70b09271b4360bd')
 
 build() {
   cd $startdir/src/module-init-tools-$pkgver
-  patch -Np1 -i ../makefile.patch || return 1
+  patch -p1 -i ../makefile.patch || return 1
+  patch -p0 -i ../fix-modprobe-ignore-path.patch || return 1
   sed -i 's|/usr/bin/install|/bin/install|g' install-with-care
   CFLAGS="${CFLAGS} -DCONFIG_NO_BACKWARDS_COMPAT" CC=klcc LD=klcc ./configure --prefix=/usr/lib/klibc
   make || return 1
Index: core/base/klibc-module-init-tools/fix-modprobe-ignore-path.patch
diff -u /dev/null core/base/klibc-module-init-tools/fix-modprobe-ignore-path.patch:1.1
--- /dev/null	Sun Mar 16 10:25:08 2008
+++ core/base/klibc-module-init-tools/fix-modprobe-ignore-path.patch	Sun Mar 16 10:25:08 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);
+ 	}
+ }
+