rpms/module-init-tools/devel module-init-tools-noescape.patch, NONE, 1.1 module-init-tools.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1357

Modified Files:
	module-init-tools.spec 
Added Files:
	module-init-tools-noescape.patch 
Log Message:
don't escape '-' in modules.alias, so the aliases match the actual
filename


module-init-tools-noescape.patch:
 depmod.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE module-init-tools-noescape.patch ---
diff -ru depmod.c.old depmod.c
--- depmod.c	2005-04-30 08:38:46.000000000 -0400
+++ depmod.c	2005-09-08 15:52:26.000000000 -0400
@@ -607,13 +607,8 @@
 	else
 		afterslash++;
 
-	/* Convert to underscores, stop at first . */
-	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
-		if (afterslash[i] == '-')
-			modname[i] = '_';
-		else
+	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++)
 			modname[i] = afterslash[i];
-	}
 	modname[i] = '\0';
 }
 


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- module-init-tools.spec	22 Jul 2005 21:11:04 -0000	1.12
+++ module-init-tools.spec	9 Sep 2005 04:30:47 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.2
+Release: 0.%{preversion}.3
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2
@@ -10,6 +10,7 @@
 Source2: modprobe.conf.dist
 Patch1: module-init-tools-allconf.patch
 Patch2: module-init-tools-badmodule.patch
+Patch3: module-init-tools-noescape.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -27,6 +28,7 @@
 %setup -q -n module-init-tools-%{version}-%{preversion}
 %patch1 -p1 -b .dist
 %patch2 -p1 -b .boom
+%patch3 -p0 -b .noescape
 
 %build
 export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -88,6 +90,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Sep  9 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.3
+- don't escape '-' in module names for module.alias
+
 * Fri Jul 22 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.2
 - fix depmod segfault on bad modules (#162716)