fix -q and -s; do not output to console if -s was given

18 files changed, 123 insertions, 681 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 3850382d6c74..3002e7122096 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.15 2003/03/09 11:30:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.16 2003/03/10 20:34:06 azarah Exp $
+
+*module-init-tools-0.9.10-r3 (10 March 2003)
+
+  10 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r3 :
+  Fix recursive calls to modprobe not honoring -s, -q, -v and -C.  Use older
+  modprobe that we install as modprobe.conf when calling generate-modprobe.conf,
+  as the newer modprobe (2.4.22 and later) generate /etc/modprobe.conf with
+  invalid modules ...  Fix modprobe to _only_ log to syslog if -s was given.
 
 *module-init-tools-0.9.10-r2 (09 March 2003)
 
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1
deleted file mode 100644
index b1a08c3a2d21..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143
-MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2
deleted file mode 100644
index b1a08c3a2d21..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143
-MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r3
index b1a08c3a2d21..5d5b645cfd81 100644
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r3
@@ -1,2 +1,3 @@
 MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143
+MD5 4c3a76d0917ea3b5309302d8f6c8806c modutils-2.4.21.tar.bz2 217896
 MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7
deleted file mode 100644
index 4cd5fb2838a9..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 77fa0593de0ef45b2a5b7cb1ca4134c0 module-init-tools-0.9.7.tar.bz2 93398
-MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1
deleted file mode 100644
index d215d9165b59..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2342f8c38390eec70d0d7585c870f9d0 module-init-tools-0.9.9-pre.tar.bz2 95603
-MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-more-recursive-bugs.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch
index 5ba40ab019ea..66f46409f8e2 100644
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-more-recursive-bugs.patch
+++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch
@@ -1,6 +1,6 @@
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-09 13:47:46.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-09 13:49:09.000000000 +0200
-@@ -1096,12 +1096,14 @@
+--- module-init-tools-0.9.10/modprobe.c.orig	2003-03-10 19:34:08.000000000 +0200
++++ module-init-tools-0.9.10/modprobe.c	2003-03-10 19:33:29.000000000 +0200
+@@ -1095,12 +1095,14 @@
  	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
  		switch (opt) {
  		case 'v':
@@ -15,7 +15,19 @@
  			config = optarg;
  			break;
  		case 'o':
-@@ -1156,15 +1158,25 @@
+@@ -1129,9 +1131,11 @@
+ 			break;
+ 		case 'q':
+ 			/* FIXME: should do more than this. */
++			setenv("MODPROBE_QUIET", "1", 1);
+ 			fail_if_already = 0;
+ 			break;
+ 		case 's':
++			setenv("MODPROBE_LOG", "1", 1);
+ 			log = 1;
+ 			break;
+ 		case 'i':
+@@ -1152,6 +1156,25 @@
  		}
  	}
  
@@ -28,22 +40,20 @@
 +	if ((getenv("MODPROBE_CONFIG")) && (NULL == config))
 +		config = NOFAIL(strdup(getenv("MODPROBE_CONFIG")));
 +
- 	/* Check MODPROBE_QUIET */
--	if (getenv("MODPROBE_QUIET"))
-+	if ((getenv("MODPROBE_QUIET")) && 
-+		(0 != fail_if_already) && (0 != fail_if_missing))
- 		if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) {
- 			fail_if_already = 0;
- 			fail_if_missing = 0;
- 		}
- 
- 	/* Check MODPROBE_LOG */
--	if (getenv("MODPROBE_LOG"))
++	/* Check MODPROBE_QUIET */
++	if ((getenv("MODPROBE_QUIET")) && (0 != fail_if_already))
++		if (0 == strcmp(getenv("MODPROBE_QUIET"), "1"))
++			fail_if_already = 0;
++
++	/* Check MODPROBE_LOG */
 +	if ((getenv("MODPROBE_LOG")) && (1 != log))
- 		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
- 			log = 1;
- 
-@@ -1206,8 +1218,10 @@
++		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
++			log = 1;
++
+ 	/* If stderr not open, go to syslog */
+ 	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
+ 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
+@@ -1190,8 +1213,10 @@
  	if (config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
  		if (strcmp("/etc/modules.conf", config) == 0)
  			config = NULL;
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch
deleted file mode 100644
index a4e8cb257c18..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-09 11:46:19.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-09 11:50:23.000000000 +0200
-@@ -1135,6 +1135,7 @@
- 			fail_if_missing = 0;
- 			break;
- 		case 's':
-+			setenv("MODPROBE_LOG", "1", 1);
- 			log = 1;
- 			break;
- 		case 'i':
-@@ -1162,6 +1163,11 @@
- 			fail_if_missing = 0;
- 		}
- 
-+	/* Check MODPROBE_LOG */
-+	if (getenv("MODPROBE_LOG"))
-+		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
-+			log = 1;
-+
- 	/* If stderr not open, go to syslog */
- 	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
- 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch
new file mode 100644
index 000000000000..00889672d638
--- /dev/null
+++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch
@@ -0,0 +1,24 @@
+--- module-init-tools-0.9.10/modprobe.c.orig	2003-03-10 20:19:33.000000000 +0200
++++ module-init-tools-0.9.10/modprobe.c	2003-03-10 21:39:57.000000000 +0200
+@@ -1175,11 +1175,18 @@
+ 		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
+ 			log = 1;
+ 
+-	/* If stderr not open, go to syslog */
+-	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
+-		openlog("modprobe", LOG_CONS, LOG_DAEMON);
++	/* If logging was requested, do not output to stdout */
++	if (log) {
++		openlog("modprobe", 0, LOG_DAEMON);
+ 		log = 1;
+ 	}
++	
++	/* If stderr not open and logging was not requested, go to syslog */
++	if (!log)
++		if (fstat(STDERR_FILENO, &statbuf) != 0) {
++			openlog("modprobe", LOG_CONS, LOG_DAEMON);
++			log = 1;
++		}
+ 
+ 	if (argc < optind + 1 && !dump_only && !list_only)
+ 		print_usage(argv[0]);
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-shutup-modprobe.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-shutup-modprobe.patch
deleted file mode 100644
index 3987d05f3f2e..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-shutup-modprobe.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- module-init-tools-0.9.10/generate-modprobe.conf.orig	2003-03-02 20:20:24.000000000 +0200
-+++ module-init-tools-0.9.10/generate-modprobe.conf	2003-03-02 20:20:28.000000000 +0200
-@@ -155,16 +155,16 @@
-     above)
- 	# Pull in these modules after me.
- 	INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
--	eval post_install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\; /bin/true\"
-+	eval post_install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\; /bin/true\"
- 	REMOVE_COMMANDS="$REMOVE_COMMANDS $MODULE"
--	eval pre_remove_$MODNAME=\"`multi "$REST" 'modprobe -r' '; '`\"
-+	eval pre_remove_$MODNAME=\"`multi "$REST" 'modprobe -qr' '; '`\"
- 	;;
-     below)
- 	# Pull in these modules before me.
- 	INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
--	eval pre_install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\"
-+	eval pre_install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\"
- 	REMOVE_COMMANDS="$REMOVE_COMMANDS $MODULE"
--	eval post_remove_$MODNAME=\"`multi "$REST" 'modprobe -r' '; '`\; /bin/true\"
-+	eval post_remove_$MODNAME=\"`multi "$REST" 'modprobe -qr' '; '`\; /bin/true\"
- 	;;
-     probe) 
- 	INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
-@@ -173,7 +173,7 @@
-     probeall)
- 	# Not quite correct.  If they all fail, we should fail.
- 	INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
--	eval install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\; /bin/true\"
-+	eval install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\; /bin/true\"
- 	;;
-     post-install)
- 	INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-02 22:19:25.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-02 22:42:08.000000000 +0200
-@@ -1081,6 +1081,7 @@
- 	int strip_vermagic = 0;
- 	int strip_modversion = 0;
- 	int fail_if_already = 1;
-+	int fail_if_missing = 1;
- 	char *type = NULL;
- 	const char *config = NULL, *command = NULL;
- 	char *dirname, *optstring = NOFAIL(strdup(""));
-@@ -1129,7 +1130,9 @@
- 			break;
- 		case 'q':
- 			/* FIXME: should do more than this. */
-+			setenv("MODPROBE_QUIET", "1", 1);
- 			fail_if_already = 0;
-+			fail_if_missing = 0;
- 			break;
- 		case 's':
- 			log = 1;
-@@ -1152,6 +1155,13 @@
- 		}
- 	}
- 
-+	/* Check MODPROBE_QUIET */
-+	if (getenv("MODPROBE_QUIET"))
-+		if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) {
-+			fail_if_already = 0;
-+			fail_if_missing = 0;
-+		}
-+
- 	/* If stderr not open, go to syslog */
- 	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
- 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
-@@ -1263,7 +1273,10 @@
- 				   remove ? "remove" : "install");
- 			goto out;
- 		}
--		fatal("Module %s not found.\n", modname);
-+		if (fail_if_missing)
-+			fatal("Module %s not found.\n", modname);
-+		else
-+			exit(1);
- 	}
- 
- 	if (remove)
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch
new file mode 100644
index 000000000000..5e3f9f245db9
--- /dev/null
+++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch
@@ -0,0 +1,12 @@
+--- generate-modprobe.conf.orig	2003-03-10 19:59:48.000000000 +0200
++++ generate-modprobe.conf	2003-03-10 20:00:38.000000000 +0200
+@@ -18,6 +18,9 @@
+ 
+ if [ x"$TESTING_MODPROBE_CONF" != x ]; then
+     cp $TESTING_MODPROBE_CONF $MODPROBECONF
++elif [ -x /sbin/modprobe.conf ]; then
++	# In sbin.
++	/sbin/modprobe.conf -c > $MODPROBECONF
+ elif [ -x /sbin/modprobe.old ]; then
+     # In sbin.
+     /sbin/modprobe.old -c > $MODPROBECONF
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch
deleted file mode 100644
index e4314f496a29..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- module-init-tools-0.9.7/generate-modprobe.conf.orig	2002-12-29 11:46:07.000000000 +0200
-+++ module-init-tools-0.9.7/generate-modprobe.conf	2002-12-29 11:46:17.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- # Naive shell script to translate modules.conf + defaults to modprobe.conf
- # Normal caveats apply, as with any machine translation.
--if [ $# -gt 1 -o x"$1" = x--help ]; then
-+if [ $# -gt 2 -o x"$1" = x--help ]; then
-     echo "Usage: $0 [modprobe.conf]"
-     echo "   Converts your current modules setup to modprobe.conf."
-     echo "   Don't trust it too much."
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch
deleted file mode 100644
index 2f25a3ecc369..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- module-init-tools-0.9.7/generate-modprobe.conf.orig	2002-12-29 17:17:52.000000000 +0200
-+++ module-init-tools-0.9.7/generate-modprobe.conf	2002-12-29 17:17:56.000000000 +0200
-@@ -269,8 +269,8 @@
-     eval PREINSTALL=\"\$pre_install_$MODNAME\"
-     eval POSTINSTALL=\"\$post_install_$MODNAME\"
-     eval INSTALL=\"\$\{install_$MODNAME:-/sbin/modprobe --ignore-install $mod}\"
--    if [ -n "$PREINSTALL" ]; then PREINSTALL="{ $PREINSTALL }; "; fi
--    if [ -n "$POSTINSTALL" ]; then POSTINSTALL="&& { $POSTINSTALL }"; fi
-+    if [ -n "$PREINSTALL" ]; then PREINSTALL="{ $PREINSTALL; }; "; fi
-+    if [ -n "$POSTINSTALL" ]; then POSTINSTALL="&& { $POSTINSTALL; }"; fi
-     echo install $mod $PREINSTALL $INSTALL $POSTINSTALL
- done
- 
-@@ -280,7 +280,7 @@
-     eval PREREMOVE=\"\$pre_remove_$MODNAME\"
-     eval POSTREMOVE=\"\$post_remove_$MODNAME\"
-     eval REMOVE=\"\$\{remove_$MODNAME:-/sbin/modprobe -r --ignore-remove $mod}\"
--    if [ -n "$PREREMOVE" ]; then PREREMOVE="{ $PREREMOVE }; "; fi
--    if [ -n "$POSTREMOVE" ]; then POSTREMOVE="&& { $POSTREMOVE }"; fi
-+    if [ -n "$PREREMOVE" ]; then PREREMOVE="{ $PREREMOVE; }; "; fi
-+    if [ -n "$POSTREMOVE" ]; then POSTREMOVE="&& { $POSTREMOVE; }"; fi
-     echo remove $mod $PREREMOVE $REMOVE $POSTREMOVE
- done
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10-r1.ebuild
deleted file mode 100644
index e6290b38cdf5..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10-r1.ebuild,v 1.2 2003/03/06 21:23:09 azarah Exp $
-
-# This includes backwards compatability for stable kernels
-IUSE=""
-
-inherit flag-o-matic
-
-inherit eutils
-
-MYP="${P/_pre1/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.22"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-		http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-apps/devfsd-1.3.25-r1
-	>=sys-kernel/development-sources-2.5.48"
-
-pkg_setup() {
-	get_KV &> /dev/null
-
-	if [ ! -f /lib/modules/${KV}/modules.dep ]
-	then
-		eerror "Please compile and install a kernel first!"
-		die "Please compile and install a kernel first!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-shutup-modprobe.patch
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf}
-	emake || die "emake modultils failed"
-
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4
-	# This code was borrowed from the module-init-tools Makefile
-	for f in lsmod modprobe rmmod depmod insmod; do
-		if [ -L ${D}/sbin/${f} ]; then
-			ln -sf `ls -l ${D}/sbin/${f} | \
-				sed 's/.* -> //'`.old ${D}/sbin/${f};
-		fi;
-		mv ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-#	make prefix=${D} move-old-targets || die "Renaming old bins to *.old failed"
-
-	einstall prefix=${D}
-
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-
-	# Create the new modprobe.conf
-	dodir /etc
-
-# This we should rather do in pkg_postinst(), else we confuse modules-update ...
-#	if [ -f /etc/modules.conf ]; then
-#		einfo "Generating /etc/modprobe.conf ..."
-#		PATH="${D}/sbin:${PATH}" \
-#		${S}/generate-modprobe.conf ${D}/etc/modprobe.conf \
-#			|| die "Could not create modprobe.conf"
-#	fi
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]; then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]; then
-			/sbin/modules-update
-			
-		elif [ -x /sbin/update-modules ]; then
-			/sbin/update-modules
-
-		elif [ -x /usr/sbin/update-modules ]; then
-			/usr/sbin/update-modules
-		fi
-	fi
-	# Notify user of evilness, hope for a better way ;-)
-	echo ""
- 	einfo "This overwrites the modutils files, so if you remove this,"
- 	einfo "remember to remerge modutils.  However, this package has"
- 	einfo "installed a copy of the modutils files with suffix .old"
- 	einfo "in your /sbin directory, which will automatically be used"
-	einfo "when needed."
-	echo ""
-}
-
-
-
-pkg_postrm() {
-	if [ "$(best_version ${PN})" == "${CATEGORY}/${PF}" -a ! -f /sbin/insmod ]; then
-		ewarn "Uninstalling module-init-tools has left you"
-		ewarn "without a modutils installtion. we recommend"
-		ewarn "emerging modutils immediately or remerging"
-		ewarn "module-init-tools."
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10-r3.ebuild
index 2538e5d8949d..d7d543bd7cf1 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.10-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10-r2.ebuild,v 1.2 2003/03/09 19:17:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10-r3.ebuild,v 1.1 2003/03/10 20:34:06 azarah Exp $
 
 # This includes backwards compatability for stable kernels
 IUSE=""
@@ -9,12 +9,33 @@ inherit flag-o-matic
 
 inherit eutils
 
+# Ok, theory of what we are doing is this:  modprobe from modutils
+# later than 2.4.21 have hardcoded 'above' and 'below' stuff that
+# cause generate-modprobe.conf to generate a /etc/modprobe.conf with
+# invalid (linux-2.4) modules in it.
+#
+# Now, one solution is to only use modutils-2.4.21, but then we might
+# cause issues for users that still use 2.4 kernels, as later modutils
+# might fix things ...
+#
+# Solution:  build modutils 2 times, once 2.4.21, and install insmod
+#            as /sbin/modprobe.conf, and second time build current
+#            modutils as we would.  Then we tweak generate-modprobe.conf
+#            to rather use /sbin/modprobe.conf to generate
+#            /etc/modprobe.conf ...
+#
+# <azarah@gentoo.org> (10 March 2003)
+
 MYP="${P/_pre1/-pre}"
 S="${WORKDIR}/${MYP}"
+# Do not use modutils-2.4.22 or later, as it borks modprobe.conf generation
+# with reference to invalid (linux-2.4) modules.
+OMODPROBE_PV="2.4.21"
 MODUTILS_PV="2.4.22"
 DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-		http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
+	http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${OMODPROBE_PV}.tar.bz2
+	http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
@@ -39,18 +60,32 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# Get modprobe to really shutup if we give it -q
-	epatch ${FILESDIR}/${P}-shutup-modprobe.patch
-	# Fix recursive calls to modprobe not honoring -s
-	epatch ${FILESDIR}/${P}-fix-recursive-logging.patch
-	# Fix recursive calls to modprobe not honoring -v and -C.
-	# Also do not check env variables if we have commandline args
-	epatch ${FILESDIR}/${P}-fix-more-recursive-bugs.patch
+	# Fix recursive calls to modprobe not honoring -s, -q, -v and -C
+	epatch ${FILESDIR}/${P}-fix-recursion.patch
+	# Never output to stdout if logging was requested
+	epatch ${FILESDIR}/${P}-no-stdout-on-log.patch
+	# Use older modprobe that we install as modprobe.conf when calling
+	# generate-modprobe.conf, as the newer modprobe (2.4.22 and later)
+	# generate /etc/modprobe.conf with invalid modules ...
+	epatch ${FILESDIR}/${P}-use-modprobe_conf.patch
 }
 
 src_compile() {
+	local myconf=
+	
 	filter-flags -fPIC
 
+	einfo "Building modprobe_conf..."
+	cd ${WORKDIR}/modutils-${OMODPROBE_PV}
+
+	econf \
+		--disable-strip \
+		--prefix=/ \
+		--disable-insmod-static \
+		--disable-zlib \
+		${myconf}
+	emake  || die "emake modprobe.conf failed"
+
 	einfo "Building modutils..."
 	cd ${WORKDIR}/modutils-${MODUTILS_PV}
 
@@ -74,6 +109,10 @@ src_compile() {
 
 src_install () {
 
+	cd ${WORKDIR}/modutils-${OMODPROBE_PV}
+	exeinto /sbin
+	newexe insmod/insmod modprobe.conf
+
 	cd ${WORKDIR}/modutils-${MODUTILS_PV}
 	einstall prefix="${D}"
 	dodoc COPYING CREDITS ChangeLog NEWS README TODO
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10.ebuild
deleted file mode 100644
index 51377546491a..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.10.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10.ebuild,v 1.1 2003/02/28 05:20:05 lostlogic Exp $
-
-# This includes backwards compatability for stable kernels
-IUSE=""
-
-inherit flag-o-matic
-
-inherit eutils
-
-MYP="${P/_pre1/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.22"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-		http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-kernel/development-sources-2.5.48"
-
-src_compile() {
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf}
-	emake || die "emake modultils failed"
-
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4
-	# This code was borrowed from the module-init-tools Makefile
-	for f in lsmod modprobe rmmod depmod insmod; do
-		if [ -L ${D}/sbin/${f} ]; then
-			ln -sf `ls -l ${D}/sbin/${f} | \
-				sed 's/.* -> //'`.old ${D}/sbin/${f};
-		fi;
-		mv ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-#	make prefix=${D} move-old-targets || die "Renaming old bins to *.old failed"
-
-	einstall prefix=${D}
-
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-
-	# Create the new modprobe.conf
-	dodir /etc
-
-	if [ -f /etc/modules.conf ]; then
-		einfo "Generating /etc/modprobe.conf ..."
-		PATH="${D}/sbin:${PATH}" \
-		${S}/generate-modprobe.conf ${D}/etc/modprobe.conf \
-			|| die "Could not create modprobe.conf"
-	fi
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]; then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	fi
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	# Notify user of evilness, hope for a better way ;-)
-	echo ""
- 	einfo "This overwrites the modutils files, so if you remove this,"
- 	einfo "remember to remerge modutils.  However, this package has"
- 	einfo "installed a copy of the modutils files with suffix .old"
- 	einfo "in your /sbin directory, which will automatically be used"
-	einfo "when needed."
-	echo ""
-}
-
-
-
-pkg_postrm() {
-	if [ "$(best_version ${PN})" == "${CATEGORY}/${PF}" -a ! -f /sbin/insmod ]; then
-		ewarn "Uninstalling module-init-tools has left you"
-		ewarn "without a modutils installtion. we recommend"
-		ewarn "emerging modutils immediately or remerging"
-		ewarn "module-init-tools."
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.7.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.7.ebuild
deleted file mode 100644
index 1715a1ca828e..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.7.ebuild,v 1.3 2003/02/13 16:06:00 vapier Exp $
-
-# This includes backwards compatability for stable kernels
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/${P}"
-MODUTILS_PV="2.4.22"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${P}.tar.bz2
-		http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-kernel/development-sources-2.5.48"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fix generate-modprobe.conf not accepting 2 parameters
-	# <azarah@gentoo.org> (28 Dec 2002).
-	epatch ${FILESDIR}/${P}-fix-generate-modprobe.conf-two-param.patch
-	# Fix generate-modprobe.conf not adding the last ';' to commands in braces,
-	# causing modprobe to fail do to its calling 'sh -c ...' failing ...
-	# <azarah@gentoo.org> (28 Dec 2002).
-	epatch ${FILESDIR}/${P}-generate-modprobe.conf-add-missing-semicolons.patch
-}
-
-src_compile() {
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf}
-	emake || die "emake modultils failed"
-
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4
-	# This code was borrowed from the module-init-tools Makefile
-	for f in lsmod modprobe rmmod depmod insmod; do
-		if [ -L ${D}/sbin/${f} ]; then
-			ln -sf `ls -l ${D}/sbin/${f} | \
-				sed 's/.* -> //'`.old ${D}/sbin/${f};
-		fi;
-		mv ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-#	make prefix=${D} move-old-targets || die "Renaming old bins to *.old failed"
-
-	einstall prefix=${D}
-
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-
-	# Create the new modprobe.conf
-	dodir /etc
-	einfo "Generating /etc/modprobe.conf ..."
-	PATH="${D}/sbin:${PATH}" \
-	${S}/generate-modprobe.conf /etc/modules.conf \
-		> ${D}/etc/modprobe.conf || die "Could not create modprobe.conf"
-	
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	# Notify user of evilness, hope for a better way ;-)
-	echo ""
- 	einfo "This overwrites the modutils files, so if you remove this,"
- 	einfo "remember to remerge modutils.  However, this package has"
- 	einfo "installed a copy of the modutils files with suffix .old"
- 	einfo "in your /sbin directory, which will automatically be used"
-	einfo "when needed."
-	echo ""
-}
-
-
-
-pkg_postrm() {
-	if [ "$(best_version ${PN})" == "${CATEGORY}/${PF}" -a ! -f /sbin/insmod ]; then
-		ewarn "Uninstalling module-init-tools has left you"
-		ewarn "without a modutils installtion. we recommend"
-		ewarn "emerging modutils immediately or remerging"
-		ewarn "module-init-tools."
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.9_pre1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.9_pre1.ebuild
deleted file mode 100644
index 520b79f77d16..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.9_pre1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.9_pre1.ebuild,v 1.4 2003/02/13 16:06:10 vapier Exp $
-
-# This includes backwards compatability for stable kernels
-IUSE=""
-
-inherit flag-o-matic
-
-inherit eutils
-
-MYP="${P/_pre1/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.22"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-		http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-kernel/development-sources-2.5.48"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fix generate-modprobe.conf not accepting 2 parameters
-	# <azarah@gentoo.org> (28 Dec 2002).
-	epatch ${FILESDIR}/${PN}-0.9.7-fix-generate-modprobe.conf-two-param.patch
-	# Fix generate-modprobe.conf not adding the last ';' to commands in braces,
-	# causing modprobe to fail do to its calling 'sh -c ...' failing ...
-	# <azarah@gentoo.org> (28 Dec 2002).
-	epatch ${FILESDIR}/${PN}-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf}
-	emake || die "emake modultils failed"
-
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4
-	# This code was borrowed from the module-init-tools Makefile
-	for f in lsmod modprobe rmmod depmod insmod; do
-		if [ -L ${D}/sbin/${f} ]; then
-			ln -sf `ls -l ${D}/sbin/${f} | \
-				sed 's/.* -> //'`.old ${D}/sbin/${f};
-		fi;
-		mv ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-#	make prefix=${D} move-old-targets || die "Renaming old bins to *.old failed"
-
-	einstall prefix=${D}
-
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-
-	# Create the new modprobe.conf
-	dodir /etc
-	if [ -f /etc/modules.conf ]; then
-		einfo "Generating /etc/modprobe.conf ..."
-		PATH="${D}/sbin:${PATH}" \
-		${S}/generate-modprobe.conf /etc/modules.conf \
-			> ${D}/etc/modprobe.conf || die "Could not create modprobe.conf"
-	fi
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	# Notify user of evilness, hope for a better way ;-)
-	echo ""
- 	einfo "This overwrites the modutils files, so if you remove this,"
- 	einfo "remember to remerge modutils.  However, this package has"
- 	einfo "installed a copy of the modutils files with suffix .old"
- 	einfo "in your /sbin directory, which will automatically be used"
-	einfo "when needed."
-	echo ""
-}
-
-
-
-pkg_postrm() {
-	if [ "$(best_version ${PN})" == "${CATEGORY}/${PF}" -a ! -f /sbin/insmod ]; then
-		ewarn "Uninstalling module-init-tools has left you"
-		ewarn "without a modutils installtion. we recommend"
-		ewarn "emerging modutils immediately or remerging"
-		ewarn "module-init-tools."
-	fi
-}
-