rpms/kernel/devel kernel.spec, 1.978, 1.979 linux-2.6-selinux-mprotect-checks.patch, 1.6, 1.7 linux-2.6-compile-fix-gcc-43.patch, 1.6, NONE linux-2.6-cve-2008-0600.patch, 1.1, NONE linux-2.6-debug-acpi-os-write-port.patch, 1.2, NONE linux-2.6-debug-softlockup-modules-list.patch, 1.1, NONE linux-2.6-e1000-corrupt-eeprom-checksum.patch, 1.3, NONE linux-2.6-fix-lirc-ppc64.patch, 1.1, NONE linux-2.6-mmconfig-stfu.patch, 1.1, NONE linux-2.6-ms-wireless-receiver.patch, 1.2, NONE linux-2.6-netdev-e1000-disable-alpm.patch, 1.1, NONE linux-2.6-scsi-mpt-vmware-fix.patch, 1.1, NONE linux-2.6-smarter-relatime.patch, 1.5, NONE

Dave Jones davej at fedoraproject.org
Thu Sep 25 18:18:09 UTC 2008


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30129

Modified Files:
	kernel.spec linux-2.6-selinux-mprotect-checks.patch 
Removed Files:
	linux-2.6-compile-fix-gcc-43.patch 
	linux-2.6-cve-2008-0600.patch 
	linux-2.6-debug-acpi-os-write-port.patch 
	linux-2.6-debug-softlockup-modules-list.patch 
	linux-2.6-e1000-corrupt-eeprom-checksum.patch 
	linux-2.6-fix-lirc-ppc64.patch linux-2.6-mmconfig-stfu.patch 
	linux-2.6-ms-wireless-receiver.patch 
	linux-2.6-netdev-e1000-disable-alpm.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
	linux-2.6-smarter-relatime.patch 
Log Message:
Drop a bunch of unused/old patches.
  Rediff & Reapply PPC32/Sparc SELinux mprotect patches.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -r1.978 -r1.979
--- kernel.spec	25 Sep 2008 18:04:28 -0000	1.978
+++ kernel.spec	25 Sep 2008 18:17:39 -0000	1.979
@@ -543,7 +543,6 @@
 
 # we also need compile fixes for -vanilla
 Patch07: linux-2.6-compile-fixes.patch
-#Patch08: linux-2.6-compile-fix-gcc-43.patch
 
 %if !%{nopatches}
 
@@ -580,7 +579,6 @@
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch392: linux-2.6-acpi-clear-wake-status.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -602,7 +600,6 @@
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
-Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6-lirc.patch
 
 # nouveau + drm fixes
@@ -629,8 +626,6 @@
 
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# Fix HID usage descriptor on MS wireless desktop receiver
-Patch2301: linux-2.6-ms-wireless-receiver.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -990,9 +985,6 @@
 ApplyPatch linux-2.6-compile-fixes.patch
 fi
 
-# build with gcc43
-#ApplyPatch linux-2.6-compile-fix-gcc-43.patch
-
 %if !%{nopatches}
 
 ApplyPatch linux-2.6-hotfixes.patch
@@ -1015,8 +1007,6 @@
 ### NOT (YET) UPSTREAM:
 # The EHCI ISO patch isn't yet upstream but is needed to fix reboot
 #ApplyPatch linux-2.6-ps3-ehci-iso.patch
-# Fixes some wireless optical mice
-#ApplyPatch linux-2.6-ms-wireless-receiver.patch
 # The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
 # module name to work on upgrades. Otherwise, I believe mkinitrd will fail
 # to pull the module in,
@@ -1081,8 +1071,6 @@
 #
 # fix cpqarray pci enable
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
-# fix vmware emulated scsi controller
-#ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # ALSA
 
@@ -1109,9 +1097,9 @@
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
+ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
-#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
+ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
@@ -1133,9 +1121,6 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
-# implement smarter atime updates support.
-#ApplyPatch linux-2.6-smarter-relatime.patch
-
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1752,6 +1737,10 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Drop a bunch of unused/old patches.
+  Rediff & Reapply PPC32/Sparc SELinux mprotect patches.
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Drop duplicated eeepc sata patch.
 
 * Wed Sep 24 2008 Dave Jones <davej at redhat.com>

linux-2.6-selinux-mprotect-checks.patch:

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-selinux-mprotect-checks.patch	30 Oct 2007 01:57:49 -0000	1.6
+++ linux-2.6-selinux-mprotect-checks.patch	25 Sep 2008 18:17:39 -0000	1.7
@@ -1,9 +1,13 @@
 This needs a fixed toolchain, and a userspace rebuild to work.
-For this reason, it's had difficulty getting upstream.
+For these reasons, it's had difficulty getting upstream.
 
---- linux-2.6.16-rc3/security/selinux/hooks.c	2006-02-13 13:19:09.000000000 -0500
-+++ linux-2.6.16-rc3-x/security/selinux/hooks.c	2006-02-14 14:44:48.000000000 -0500
-@@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil
+ie, Fedora has a new enough toolchain, and has been rebuilt, so we don't need
+the ifdefs.  Other distros don't/haven't, and this patch would break them
+if pushed upstream.
+
+--- linux-2.6.26.noarch/security/selinux/hooks.c~	2008-09-25 14:11:17.000000000 -0400
++++ linux-2.6.26.noarch/security/selinux/hooks.c	2008-09-25 14:12:17.000000000 -0400
+@@ -2962,7 +2962,6 @@ static int selinux_file_ioctl(struct fil
  
  static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
  {
@@ -11,7 +15,7 @@
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2376,7 +2375,6 @@ static int file_map_prot_check(struct fi
+@@ -2973,7 +2972,6 @@ static int file_map_prot_check(struct fi
  		if (rc)
  			return rc;
  	}
@@ -19,7 +23,7 @@
  
  	if (file) {
  		/* read access is always possible with a mapping */
-@@ -2423,7 +2421,6 @@ static int selinux_file_mprotect(struct 
+@@ -3024,7 +3022,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -27,7 +31,7 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2448,7 +2445,6 @@ static int selinux_file_mprotect(struct 
+@@ -3049,7 +3046,6 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;
  	}


--- linux-2.6-compile-fix-gcc-43.patch DELETED ---


--- linux-2.6-cve-2008-0600.patch DELETED ---


--- linux-2.6-debug-acpi-os-write-port.patch DELETED ---


--- linux-2.6-debug-softlockup-modules-list.patch DELETED ---


--- linux-2.6-e1000-corrupt-eeprom-checksum.patch DELETED ---


--- linux-2.6-fix-lirc-ppc64.patch DELETED ---


--- linux-2.6-mmconfig-stfu.patch DELETED ---


--- linux-2.6-ms-wireless-receiver.patch DELETED ---


--- linux-2.6-netdev-e1000-disable-alpm.patch DELETED ---


--- linux-2.6-scsi-mpt-vmware-fix.patch DELETED ---


--- linux-2.6-smarter-relatime.patch DELETED ---




More information about the fedora-extras-commits mailing list