SOURCES: module-init-tools-insmod-zlib.patch, module-init-tools-modprobe_d....

[arekm]

Author: arekm                        Date: Sun Nov  2 22:53:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   module-init-tools-insmod-zlib.patch (1.5 -> 1.6) , module-init-tools-modprobe_d.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/module-init-tools-insmod-zlib.patch
diff -u SOURCES/module-init-tools-insmod-zlib.patch:1.5 SOURCES/module-init-tools-insmod-zlib.patch:1.6
--- SOURCES/module-init-tools-insmod-zlib.patch:1.5	Sun Aug 24 07:47:24 2008
+++ SOURCES/module-init-tools-insmod-zlib.patch	Sun Nov  2 23:53:51 2008
@@ -60,14 +60,15 @@
 diff -urN module-init-tools-3.0.org/Makefile.am module-init-tools-3.0/Makefile.am
 --- module-init-tools-3.0.org/Makefile.am	2004-07-17 19:56:16.090395360 +0200
 +++ module-init-tools-3.0/Makefile.am	2004-07-17 20:05:45.953762960 +0200
-@@ -1,14 +1,12 @@
+@@ -1,4 +1,4 @@
 -insmod_SOURCES = insmod.c testing.h
-+insmod_SOURCES = insmod.c zlibsupport.c testing.h zlibsupport.h
++insmod_SOURCES = insmod.c testing.h zlibsupport.c zlibsupport.h
  lsmod_SOURCES = lsmod.c testing.h
- modprobe_SOURCES = modprobe.c zlibsupport.c testing.h zlibsupport.h
+ modprobe_SOURCES = modprobe.c logging.c index.c zlibsupport.c logging.h index.h testing.h zlibsupport.h
  rmmod_SOURCES = rmmod.c testing.h
- depmod_SOURCES = depmod.c moduleops.c tables.c zlibsupport.c depmod.h moduleops.h tables.h list.h testing.h  zlibsupport.h
+@@ -6,10 +6,8 @@
  modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
+ modindex_SOURCES = modindex.c logging.c index.c logging.h index.h
  
 -insmod_static_SOURCES = insmod.c
 +insmod_static_SOURCES = insmod.c zlibsupport.c zlibsupport.h
@@ -75,5 +76,5 @@
 -# We don't want the $(zlib_flags) here: that makes a dynamic executable
 -insmod_static_LDADD = 
  
- EXTRA_insmod_SOURCES = backwards_compat.c
- EXTRA_lsmod_SOURCES = backwards_compat.c
+ modprobe_LDADD = $(ZLIB)
+ depmod_LDADD = $(ZLIB)

================================================================
Index: SOURCES/module-init-tools-modprobe_d.patch
diff -u SOURCES/module-init-tools-modprobe_d.patch:1.3 SOURCES/module-init-tools-modprobe_d.patch:1.4
--- SOURCES/module-init-tools-modprobe_d.patch:1.3	Sat Jan 21 17:58:51 2006
+++ SOURCES/module-init-tools-modprobe_d.patch	Sun Nov  2 23:53:52 2008
@@ -26,22 +26,17 @@
  
  static void read_toplevel_config(const char *filename,
  				 const char *name,
-@@ -1235,10 +1238,12 @@
+@@ -1367,6 +1367,10 @@
  	}
  
  	/* Try defaults. */
 +	if ( modprobe_d_ver != NULL )
 +		read_config(modprobe_d_ver, name, dump_only, removing,
 +				options, commands, aliases, blacklist);
++
  	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);
- 	}
- }
- 
+ 		read_config(default_configs[i], name, dump_only, removing,
+ 				options, commands, aliases, blacklist);
 @@ -1547,6 +1552,10 @@
  				    + sizeof("/modules.symbols")));
  	sprintf(symfilename, "%s/modules.symbols", dirname);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-insmod-zlib.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-modprobe_d.patch?r1=1.3&r2=1.4&f=u