rpms/kernel/F-7 kernel-2.6.spec, 1.3225, 1.3226 linux-2.6-execshield.patch, 1.52, 1.53

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19300

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
Log Message:
* Sat Jun 09 2007 Dave Jones <davej at redhat.com>
- Reenable -rc2, revert unneeded MAP_FIXED change.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3225
retrieving revision 1.3226
diff -u -r1.3225 -r1.3226
--- kernel-2.6.spec	9 Jun 2007 18:50:59 -0000	1.3225
+++ kernel-2.6.spec	10 Jun 2007 01:28:50 -0000	1.3226
@@ -1049,7 +1049,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1 -R
 
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -2408,6 +2408,9 @@
 
 %changelog
 * Sat Jun 09 2007 Dave Jones <davej at redhat.com>
+- Reenable -rc2, revert unneeded MAP_FIXED change.
+
+* Sat Jun 09 2007 Dave Jones <davej at redhat.com>
 - Disable rc2 whilst chasing down another regression.
 
 * Fri Jun 08 2007 Dave Jones <davej at redhat.com>

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-execshield.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- linux-2.6-execshield.patch	6 Jun 2007 21:54:18 -0000	1.52
+++ linux-2.6-execshield.patch	10 Jun 2007 01:28:50 -0000	1.53
@@ -1734,21 +1734,3 @@
  			ret = new_addr;
  			if (new_addr & ~PAGE_MASK)
  				goto out;
---- linux-2.6.21.noarch/mm/mmap.c~	2007-06-06 17:50:39.000000000 -0400
-+++ linux-2.6.21.noarch/mm/mmap.c	2007-06-06 17:52:12.000000000 -0400
-@@ -1422,10 +1422,12 @@ unsigned long arch_get_unmapped_exec_are
- 	if (len > TASK_SIZE)
- 		return -ENOMEM;
- 
--	if (!addr && !(flags & MAP_FIXED))
--		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	if (flags & MAP_FIXED)
-+		return addr;
- 
--	if (addr) {
-+	if (!addr) {
-+		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
- 		addr = PAGE_ALIGN(addr);
- 		vma = find_vma(mm, addr);
- 		if (TASK_SIZE - len >= addr &&