packages: module-init-tools/module-init-tools-modprobe_d.patch, module-init...

[arekm]

Author: arekm                        Date: Tue May 31 13:51:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.13; support Linux 3.0

---- Files affected:
packages/module-init-tools:
   module-init-tools-modprobe_d.patch (1.9 -> 1.10) , module-init-tools.spec (1.86 -> 1.87) 

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools-modprobe_d.patch
diff -u packages/module-init-tools/module-init-tools-modprobe_d.patch:1.9 packages/module-init-tools/module-init-tools-modprobe_d.patch:1.10
--- packages/module-init-tools/module-init-tools-modprobe_d.patch:1.9	Sun Aug 15 10:13:33 2010
+++ packages/module-init-tools/module-init-tools-modprobe_d.patch	Tue May 31 15:51:51 2011
@@ -9,36 +9,37 @@
  #ifndef MODULE_DIR
  #define MODULE_DIR "/lib/modules"
  #endif
-@@ -1065,19 +1067,27 @@
- 		/* sort files from directory into list */
- 		while ((i = readdir(dir)) != NULL) {
- 			size_t len;
-+			struct stat statbuf;
-+			char statpath[PATH_MAX];
+@@ -1065,20 +1067,28 @@
+ 	 		/* sort files from directory into list, ignoring duplicates */
+ 			while ((i = readdir(dir)) != NULL) {
+ 				size_t len;
+ 				int cmp = -1;
++				struct stat statbuf;
++				char statpath[PATH_MAX];
  
- 			if (i->d_name[0] == '.')
- 				continue;
- 			if (!config_filter(i->d_name))
- 				continue;
+ 				if (i->d_name[0] == '.')
+ 					continue;
+ 				if (!config_filter(i->d_name))
+ 					continue;
  
-+			snprintf(statpath, sizeof(statpath), "%s/%s", filename, i->d_name);
-+			if ((stat(statpath, &statbuf) == 0) && (S_ISDIR(statbuf.st_mode)))
-+				continue;
++				snprintf(statpath, sizeof(statpath), "%s/%s", filename, i->d_name);
++				if ((stat(statpath, &statbuf) == 0) && (S_ISDIR(statbuf.st_mode)))
++					continue;
 +
- 			len = strlen(i->d_name);
- 			if (len < 6 ||
- 			    (strcmp(&i->d_name[len-5], ".conf") != 0 &&
--			     strcmp(&i->d_name[len-6], ".alias") != 0))
-+			     strcmp(&i->d_name[len-6], ".alias") != 0)) {
- 				warn("All config files need .conf: %s/%s, "
--				     "it will be ignored in a future release.\n",
-+				     "Ignoring non conformant file.\n",
- 				     filename, i->d_name);
-+				continue;
-+			}
- 			fe = malloc(sizeof(struct file_entry) + len + 1);
- 			if (fe == NULL)
- 				continue;
+ 				len = strlen(i->d_name);
+ 				if (len < 6 ||
+ 				    (strcmp(&i->d_name[len-5], ".conf") != 0 &&
+-				     strcmp(&i->d_name[len-6], ".alias") != 0))
++				     strcmp(&i->d_name[len-6], ".alias") != 0)) {
+ 					warn("All config files need .conf: %s/%s, "
+-					     "it will be ignored in a future release.\n",
++					     "Ignoring non conformant file.\n",
+ 					     filename, i->d_name);
++					continue;
++				}
+ 				fe = malloc(sizeof(struct file_entry));
+ 				if (fe == NULL)
+ 					continue;
 @@ -1129,6 +1139,10 @@
  		warn("Deprecated config file /etc/modprobe.conf, "
  		      "all config files belong into /etc/modprobe.d/.\n");

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.86 packages/module-init-tools/module-init-tools.spec:1.87
--- packages/module-init-tools/module-init-tools.spec:1.86	Fri Feb 11 06:57:59 2011
+++ packages/module-init-tools/module-init-tools.spec	Tue May 31 15:51:51 2011
@@ -16,12 +16,12 @@
 Summary(tr.UTF-8):	Modül programları
 Summary(uk.UTF-8):	Утиліти для роботи з модулями ядра
 Name:		module-init-tools
-Version:	3.12
-Release:	0.1
+Version:	3.13
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	8b2257ce9abef74c4a44d825d23140f3
+# Source0-md5:	dc575e7df00d9f745bf23b32f927b7a6
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-max.patch
@@ -184,6 +184,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2011/05/31 13:51:51  arekm
+- up to 3.13; support Linux 3.0
+
 Revision 1.86  2011/02/11 05:57:59  glen
 - be ccache friendly
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools-modprobe_d.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.86&r2=1.87&f=u