cleanup.

11 files changed, 0 insertions, 324 deletions

diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
deleted file mode 100644
index da7deba7e67b..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d61517a904d005fd83c954dd7fe49f27 module-init-tools-0.9.12.tar.bz2 112896
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2
deleted file mode 100644
index f31bba2b01dd..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 22df9ab7a027718a3cd3fca37c280dd6 module-init-tools-0.9.13-pre2.tar.bz2 113419
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14
deleted file mode 100644
index 8bf829852565..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b97a2c6226934fade702bd79c5211cab module-init-tools-0.9.14.tar.bz2 115751
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1
deleted file mode 100644
index 23e15232bebf..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d2d8d12a0358d4073a2f44453a677eda module-init-tools-0.9.15-pre1.tar.bz2 116472
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
deleted file mode 100644
index 73ab5fbd3b2f..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 958088946d2b80d338cb82b94a394eca module-init-tools-0.9.15-pre2.tar.bz2 116601
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3
deleted file mode 100644
index a4baef4e3ed1..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa41bdfe2a09f0cce2c70c603a8cd2db module-init-tools-0.9.15-pre3.tar.bz2 116911
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch
deleted file mode 100644
index 2c93619a11e3..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- module-init-tools-0.9.11-pre/modprobe.c.orig	2003-03-16 22:32:46.000000000 +0200
-+++ module-init-tools-0.9.11-pre/modprobe.c	2003-03-18 03:43:52.000000000 +0200
-@@ -52,6 +52,8 @@ struct module {
- 
- /* Do we use syslog or stderr for messages? */
- static int log;
-+/* Should we be totally quiet? */
-+static int quiet = 0;
- 
- static int getlen(const char *fmt, va_list ap)
- {
-@@ -70,6 +72,9 @@ static void message(const char *prefix, 
- 	va_list arglist;
- 	int len;
- 
-+	if (quiet)
-+		return;
-+
- 	va_start(arglist, fmt);
- 	len = strlen(prefix) + getlen(fmt, arglist) + 1;
- 	buf = malloc(len);
-@@ -87,7 +92,7 @@ static void message(const char *prefix, 
- 
- #define warn(fmt, ...) message("WARNING: ", fmt , ## __VA_ARGS__)
- #define fatal(fmt, ...) \
--	do { message("FATAL: ", fmt , ## __VA_ARGS__); exit(1); } while(0)
-+	do { message("FATAL: ", fmt , ## __VA_ARGS__);  if (quiet) exit(0); else exit(1); } while(0)
- 
- static void grammar(const char *cmd, const char *filename, unsigned int line)
- {
-@@ -1093,6 +1098,7 @@ static struct option options[] = { { "ve
- 				   { "showconfig", 0, NULL, 'c' },
- 				   { "autoclean", 0, NULL, 'k' },
- 				   { "quiet", 0, NULL, 'q' },
-+				   { "really-quiet", 0, NULL, 'Q' },
- 				   { "show", 0, NULL, 'n' },
- 				   { "dry-run", 0, NULL, 'n' },
- 				   { "syslog", 0, NULL, 's' },
-@@ -1108,6 +1114,7 @@ static struct option options[] = { { "ve
- 				   { NULL, 0, NULL, 0 } };
- 
- #define DEFAULT_CONFIG "/etc/modprobe.conf"
-+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
- 
- int main(int argc, char *argv[])
- {
-@@ -1146,7 +1153,7 @@ int main(int argc, char *argv[])
- 		try_old_version("modprobe", argv);
- 
- 	uname(&buf);
--	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
-+	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aif", options, NULL)) != -1){
- 		switch (opt) {
- 		case 'v':
- 			add_to_env_var("-v");
-@@ -1193,6 +1200,10 @@ int main(int argc, char *argv[])
- 			add_to_env_var("-q");
- 			fail_if_already = 0;
- 			break;
-+		case 'Q':
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+			break;
- 		case 's':
- 			add_to_env_var("-s");
- 			log = 1;
-@@ -1215,8 +1226,51 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 
-+	/* A hack to have absolutely no output if:
-+	 *
-+	 *   1) we have no logging enabled
-+	 * 
-+	 *   2) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-+	 *   
-+	 *   3) with the module name starting with '/dev/'.
-+	 *
-+	 * Rasionale:  This is what modprobe from modutils-2.4.22 does:
-+	 *
-+	 *   gateway root # modprobe /dev/sd1   
-+	 *   modprobe: Can't locate module /dev/sd1
-+	 *   gateway root # modprobe -C /etc/modules.conf /dev/sd1
-+	 *   modprobe: Can't locate module /dev/sd1
-+	 *   gateway root # modprobe -C /etc/modules.devfs /dev/sd1
-+	 *   gateway root #
-+	 *   
-+	 *   gateway root # modprobe foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # modprobe -C /etc/modules.conf foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # modprobe -C /etc/modules.devfs foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root #
-+	 *   
-+	 *   gateway root # modprobe -C /etc/modules.devfs /dev/sd1 && echo yes
-+	 *   yes
-+	 *   gateway root # modprobe -C /etc/modules.devfs foo && echo yes
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # 
-+	 *   
-+	 */
-+	if (!log && !quiet && !dump_only && config) {
-+		if (strncmp(argv[optind], "/dev/", 5) == 0
-+				/* Handle recursive calls */
-+			&& ((strcmp(MODPROBE_DEVFSD_CONF, config) == 0)
-+				/* devfsd calls modprobe with '-C /etc/modules.devfs' */
-+				|| (strcmp("/etc/modules.devfs", config) == 0))) {
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+		}
-+	}
-+
- 	/* If stderr not open, go to syslog */
--	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
-+	if (log || (!quiet && fstat(STDERR_FILENO, &statbuf) != 0)) {
- 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
- 		log = 1;
- 	}
-@@ -1253,7 +1307,7 @@ int main(int argc, char *argv[])
- 		if (strcmp("/etc/modules.conf", config) == 0)
- 			config = NULL;
- 		else if (strcmp("/etc/modules.devfs", config) == 0)
--			config = "/etc/modprobe.devfs";
-+			config = MODPROBE_DEVFSD_CONF;
- 	}
- 
- 	/* -r only allows certain restricted options */
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
deleted file mode 100644
index 44947b306bec..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- module-init-tools-0.9.12/modprobe.c.orig	2003-07-12 20:00:52.000000000 +0200
-+++ module-init-tools-0.9.12/modprobe.c	2003-07-12 20:28:04.000000000 +0200
-@@ -1015,7 +1015,9 @@ static char *read_config(const char *fil
- 				newresult = read_config(newfilename, 1, name,
- 							dump_only, removing,
- 							options, commands);
--				if (!result)
-+				/* Files included override aliases, etc that was
-+				 * already set ... */
-+				if (newresult)
- 					result = newresult;
- 			}
- 		} else if (strcmp(cmd, "options") == 0) {
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch
deleted file mode 100644
index 8a6848cd8a8d..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urpN module-init-tools-0.9.13-pre2/modprobe.c module-init-tools-0.9.13-pre2.devfsd/modprobe.c
---- module-init-tools-0.9.13-pre2/modprobe.c	2003-07-16 09:32:49.000000000 +0200
-+++ module-init-tools-0.9.13-pre2.devfsd/modprobe.c	2003-08-10 20:55:15.281473776 +0200
-@@ -52,6 +52,8 @@ struct module {
- 
- /* Do we use syslog or stderr for messages? */
- static int log;
-+/* Should we be totally quiet? */
-+static int quiet = 0;
- 
- static int getlen(const char *fmt, va_list ap)
- {
-@@ -70,6 +72,9 @@ static void message(const char *prefix, 
- 	va_list arglist;
- 	int len;
- 
-+	if (quiet)
-+		return;
-+
- 	va_start(arglist, fmt);
- 	len = strlen(prefix) + getlen(fmt, arglist) + 1;
- 	buf = malloc(len);
-@@ -87,7 +92,7 @@ static void message(const char *prefix, 
- 
- #define warn(fmt, ...) message("WARNING: ", fmt , ## __VA_ARGS__)
- #define fatal(fmt, ...) \
--	do { message("FATAL: ", fmt , ## __VA_ARGS__); exit(1); } while(0)
-+	do { message("FATAL: ", fmt , ## __VA_ARGS__);  if (quiet) exit(0); else exit(1); } while(0)
- 
- static void grammar(const char *cmd, const char *filename, unsigned int line)
- {
-@@ -1098,6 +1103,7 @@ static struct option options[] = { { "ve
- 				   { "showconfig", 0, NULL, 'c' },
- 				   { "autoclean", 0, NULL, 'k' },
- 				   { "quiet", 0, NULL, 'q' },
-+				   { "really-quiet", 0, NULL, 'Q' },
- 				   { "show", 0, NULL, 'n' },
- 				   { "dry-run", 0, NULL, 'n' },
- 				   { "syslog", 0, NULL, 's' },
-@@ -1114,6 +1120,7 @@ static struct option options[] = { { "ve
- 				   { NULL, 0, NULL, 0 } };
- 
- #define DEFAULT_CONFIG "/etc/modprobe.conf"
-+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
- 
- int main(int argc, char *argv[])
- {
-@@ -1153,7 +1160,7 @@ int main(int argc, char *argv[])
- 		try_old_version("modprobe", argv);
- 
- 	uname(&buf);
--	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
-+	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aif", options, NULL)) != -1){
- 		switch (opt) {
- 		case 'v':
- 			add_to_env_var("-v");
-@@ -1206,6 +1213,10 @@ int main(int argc, char *argv[])
- 			add_to_env_var("-q");
- 			fail_if_already = 0;
- 			break;
-+		case 'Q':
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+			break;
- 		case 's':
- 			add_to_env_var("-s");
- 			log = 1;
-@@ -1266,7 +1277,7 @@ int main(int argc, char *argv[])
- 		if (strcmp("/etc/modules.conf", config) == 0)
- 			config = NULL;
- 		else if (strcmp("/etc/modules.devfs", config) == 0)
--			config = "/etc/modprobe.devfs";
-+			config = MODPROBE_DEVFSD_CONF;
- 	}
- 
- 	/* -r only allows certain restricted options */
-@@ -1303,6 +1314,25 @@ int main(int argc, char *argv[])
- 			      argv[optind], 0,
- 			      remove, &modoptions, &commands);
- 
-+	/* We want absolutely no output and return 0 if:
-+	 *
-+	 *   1) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-+	 *
-+	 *   2) the module name starting with '/dev/'
-+	 *
-+	 *   3) we are trying to probe an existing alias.
-+	 *
-+	 * This is to mimic behaviour from modutils so that we do fill the logs
-+	 * with errors if devfsd tries to probe aliases in modprobe.devfs */
-+	if (!quiet && !dump_only && config
-+		&& modname) { /* Are we trying to probe an alias? */
-+		if (strncmp(argv[optind], "/dev/", 5) == 0
-+			&& (strcmp(MODPROBE_DEVFSD_CONF, config) == 0)) {
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+		}
-+	}
-+
- 	/* No luck?  Try symbol names, if starts with symbol:. */
- 	if (!modname && strncmp(argv[optind], "symbol:", strlen("symbol:")==0))
- 		modname = read_config(symfilename, 0, argv[optind], 0,
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch
deleted file mode 100644
index 93d0aae9a30d..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- module-init-tools-0.9.14/modprobe.c.orig	2003-09-15 22:41:32.252740832 +0200
-+++ module-init-tools-0.9.14/modprobe.c	2003-09-15 23:10:44.895298664 +0200
-@@ -1148,6 +1148,7 @@ int main(int argc, char *argv[])
- 	int strip_vermagic = 0;
- 	int strip_modversion = 0;
- 	int ignore_proc = 0;
-+	int set_config_file = 0;
- 	enum noexists_response noexists = NOEXISTS_ERROR;
- 	enum exists_response exists = EXISTS_ERROR;
- 	unsigned int i, num_modules;
-@@ -1184,8 +1185,12 @@ int main(int argc, char *argv[])
- 			buf.release[sizeof(buf.release)-1] = '\0';
- 			break;
- 		case 'C':
-+			/* We should not add this to the environment if we might
-+			 * still change it below (hack for old modutils compatibility)
- 			add_to_env_var("-C");
- 			add_to_env_var(optarg);
-+			*/
-+			set_config_file = 1;
- 			config = optarg;
- 			break;
- 		case 'D':
-@@ -1294,16 +1299,27 @@ int main(int argc, char *argv[])
- 	   modprobe with -C /etc/modules.conf or /etc/modules.devfs,
- 	   to work.  FIXME. */
- 	/* Modern devfsd or variants should use -Q explicitly in 2.6. */
--	if (config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
--		if (strcmp("/etc/modules.conf", config) == 0) {
--			quiet = 1;
--			config = NULL;
--		} else if (strcmp("/etc/modules.devfs", config) == 0) {
--			config = MODPROBE_DEVFSD_CONF;
-+	if (!quiet && config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
-+		if (strcmp("/etc/modules.conf", config) == 0
-+			|| strcmp("/etc/modules.devfs", config) == 0
-+			|| strcmp(MODPROBE_DEVFSD_CONF, config) == 0) {
-+			add_to_env_var("-Q");
- 			quiet = 1;
-+
-+			if (strcmp("/etc/modules.conf", config) == 0)
-+				config = NULL;
-+			else
-+				config = MODPROBE_DEVFSD_CONF;
- 		}
- 	}
- 
-+	if (set_config_file && !dump_only) {
-+		/* Ok, now add the config file to the MODPROBE_OPTIONS
-+		 * environment variable */
-+		add_to_env_var("-C");
-+		add_to_env_var(config);
-+	}
-+
- 	if (dump_only) {
- 		struct module_command *commands = NULL;
- 		struct module_options *modoptions = NULL;
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch
deleted file mode 100644
index 5387e0c6d6cb..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- module-init-tools-0.9.7/moduleops_core.c.chmou	2002-12-26 07:04:42.000000000 +0100
-+++ module-init-tools-0.9.7/moduleops_core.c	2003-01-14 21:24:17.000000000 +0100
-@@ -30,6 +30,9 @@
- 	ksyms = PERBIT(load_section)(module->mmap, "__ksymtab", &size);
- 	for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++)
- 		add_symbol(ksyms[i].name, module);
-+ 	ksyms = PERBIT(load_section)(module->mmap, "__gpl_ksymtab", &size);
-+ 	for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++)
-+	  add_symbol(ksyms[i].name, module);
- }
- 
- /* Calculate the dependencies for this module */