rpms/kudzu/devel lrmi-fix.patch,NONE,1.1 kudzu.spec,1.100,1.101

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10655

Modified Files:
	kudzu.spec 
Added Files:
	lrmi-fix.patch 
Log Message:
* Wed Nov 16 2005 Dave Jones <davej at redhat.com> - 1.2.12-2
- Hopefully fix ddcprobe to work with > 2.6.14 kernels.


lrmi-fix.patch:
 lrmi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lrmi-fix.patch ---

--- a/ddcprobe/lrmi.c.~1~	2003-02-11 06:47:38.000000000 -0800
+++ b/ddcprobe/lrmi.c	2005-11-15 23:23:31.000000000 -0800
@@ -243,7 +243,7 @@
 
 	m = mmap((void *)0, 0x502,
 	 PROT_READ | PROT_WRITE | PROT_EXEC,
-	 MAP_FIXED | MAP_PRIVATE, fd_mem, 0);
+	 MAP_FIXED | MAP_SHARED, fd_mem, 0);
 
 	if (m == (void *)-1)
 		{
@@ -252,7 +252,7 @@
 		}
 
 	m = mmap((void *)0xa0000, 0x100000 - 0xa0000,
-	 PROT_READ | PROT_WRITE,
+	 PROT_READ,
 	 MAP_FIXED | MAP_SHARED, fd_mem, 0xa0000);
 
 	if (m == (void *)-1)



Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kudzu.spec	15 Nov 2005 19:19:12 -0000	1.100
+++ kudzu.spec	16 Nov 2005 06:27:13 -0000	1.101
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.12
-Release: 1
+Release: 2
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -14,6 +14,8 @@
 BuildPrereq: pciutils-devel >= 2.1.99.test8-3, python-devel python gettext
 BuildRoot: %{_tmppath}/%{name}-root
 
+Patch1: lrmi-fix.patch
+
 %description
 Kudzu is a hardware probing tool run at system boot time to determine
 what hardware has been added or removed from the system.
@@ -31,6 +33,8 @@
 
 %setup
 
+%patch1 -p1
+
 # hack: do not start kudzu on s390/s390x on bootup
 %ifarch s390 s390x
 perl -pi -e "s/345/-/g" kudzu.init
@@ -79,6 +83,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Nov 16 2005 Dave Jones <davej at redhat.com> - 1.2.12-2
+- Hopefully fix ddcprobe to work with > 2.6.14 kernels.
+
 * Tue Nov 15 2005 Bill Nottingham <notting at redhat.com> - 1.2.12-1
 - allow multiple files for video aliases under /usr/share/hwdata/videoaliases