rpms/silo/F-9 silo-1.4.14-preventoverlap.patch, NONE, 1.1 silo.spec, 1.2, 1.3

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/silo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8437

Modified Files:
	silo.spec 
Added Files:
	silo-1.4.14-preventoverlap.patch 
Log Message:
patch from pjones to prevent overflow between kernel and initrd

silo-1.4.14-preventoverlap.patch:

--- NEW FILE silo-1.4.14-preventoverlap.patch ---
diff -up silo-1.4.14/second/memory.c.BAD silo-1.4.14/second/memory.c
--- silo-1.4.14/second/memory.c.BAD	2008-10-14 10:59:02.000000000 -0500
+++ silo-1.4.14/second/memory.c	2008-10-14 11:00:36.000000000 -0500
@@ -330,8 +330,13 @@ static char *sun4u_memory_find (unsigned
 			continue;
 
 		if (p[i].size >= len) {
-			phys = p[i].phys;
-			break;
+			if (is_kernel) {
+				phys = p[i].phys;
+				break;
+			} else if (p[i].phys > phys) {
+				phys = p[i].phys;
+				continue;
+			}
 		}
 	}
 


Index: silo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/silo/F-9/silo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- silo.spec	22 Mar 2008 14:33:28 -0000	1.2
+++ silo.spec	14 Oct 2008 17:01:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: The SILO boot loader for SPARCs
 Name: silo
 Version: 1.4.13
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 ExclusiveArch: sparcv9
 Group: System Environment/Base
@@ -16,6 +16,7 @@
 Patch3: silo_degraded_raid1.patch
 Patch4: silo-big-kernel.patch
 Patch5: silo-1.4.13-localheaders.patch
+Patch6: silo-1.4.14-preventoverlap.patch
 
 %description
 The silo package installs the SILO (Sparc Improved LOader) boot
@@ -30,6 +31,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 make %{?_smp_mflags}
@@ -67,6 +69,9 @@
 %{_mandir}/man8/silo.8*
  
 %changelog
+* Tue Oct 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-9
+- patch from pjones to prevent overflow between kernel and initrd
+
 * Sat Mar 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-8
 - fix for no linux/elf.h
 - embed local copy of ufs_fs.h