2009/devel/kernel/pae/kernel-pae - Merge from default kernel

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Fri Jan 29 11:21:58 2010
New Revision: 85675

Added:
   2009/devel/kernel/pae/kernel-pae/files/kernel/linux-2.6-ath5k-fix-eeprom-checksum-check-for-custom-sized-eeproms.patch
      - copied unchanged from r85674, 2009/devel/kernel/default/kernel/files/kernel/linux-2.6-ath5k-fix-eeprom-checksum-check-for-custom-sized-eeproms.patch
   2009/devel/kernel/pae/kernel-pae/files/kernel/net-next-2.6.git-e1000-enhance-frame-fragment-detection.patch
      - copied unchanged from r85674, 2009/devel/kernel/default/kernel/files/kernel/net-next-2.6.git-e1000-enhance-frame-fragment-detection.patch
   2009/devel/kernel/pae/kernel-pae/files/ubuntu/ubuntu-lucid.git-29f1e2fdb1c62b0a7e27740d8480fbc371f76495.patch
      - copied unchanged from r85674, 2009/devel/kernel/default/kernel/files/ubuntu/ubuntu-lucid.git-29f1e2fdb1c62b0a7e27740d8480fbc371f76495.patch
   2009/devel/kernel/pae/kernel-pae/files/ubuntu/ubuntu-lucid.git-a7baa7164fdf25b2819798ee2238a3cc7b4ada75.patch
      - copied unchanged from r85674, 2009/devel/kernel/default/kernel/files/ubuntu/ubuntu-lucid.git-a7baa7164fdf25b2819798ee2238a3cc7b4ada75.patch
   2009/devel/kernel/pae/kernel-pae/files/ubuntu/ubuntu-lucid.git-isapnp_init-make-isa-PNP-scanning-async.patch
      - copied unchanged from r85674, 2009/devel/kernel/default/kernel/files/ubuntu/ubuntu-lucid.git-isapnp_init-make-isa-PNP-scanning-async.patch
Modified:
   2009/devel/kernel/pae/kernel-pae/   (props changed)
   2009/devel/kernel/pae/kernel-pae/comar/   (props changed)
   2009/devel/kernel/pae/kernel-pae/files/   (props changed)
   2009/devel/kernel/pae/kernel-pae/pspec.xml
Log:
Merge from default kernel

---
 files/kernel/linux-2.6-ath5k-fix-eeprom-checksum-check-for-custom-sized-eeproms.patch |  104 ++++++++++
 files/kernel/net-next-2.6.git-e1000-enhance-frame-fragment-detection.patch            |   77 +++++++
 files/ubuntu/ubuntu-lucid.git-29f1e2fdb1c62b0a7e27740d8480fbc371f76495.patch          |   98 +++++++++
 files/ubuntu/ubuntu-lucid.git-a7baa7164fdf25b2819798ee2238a3cc7b4ada75.patch          |   66 ++++++
 files/ubuntu/ubuntu-lucid.git-isapnp_init-make-isa-PNP-scanning-async.patch           |   39 +++
 pspec.xml                                                                             |   17 +
 6 files changed, 400 insertions(+), 1 deletion(-)

Modified: 2009/devel/kernel/pae/kernel-pae/pspec.xml
=================================================================
--- 2009/devel/kernel/pae/kernel-pae/pspec.xml	(original)
+++ 2009/devel/kernel/pae/kernel-pae/pspec.xml	Fri Jan 29 11:21:58 2010
@@ -18,6 +18,7 @@
             <Dependency>unifdef</Dependency>
             <Dependency>diffutils</Dependency>
             <Dependency>bootsplash</Dependency>
+            <Dependency>docbook-xsl</Dependency>
         </BuildDependencies>
         <Patches>
             <!-- fuse: fuse_ioctl_copy_user() denial of service (CVE-2009-4410) (#11842) -->
@@ -30,6 +31,12 @@
             <!-- timer: Revert "Prevent clockevent_devices list corruption" to fix shutdown hangs (#12036) -->
             <Patch level="1">kernel/linux-2.6-kernel-timer-revert-prevent-clockevent_devices-list-corruption.patch</Patch>
 
+            <!-- e1000: Enhance frame fragment detection (CVE-2009-4536) (#12090) -->
+            <Patch level="1">kernel/net-next-2.6.git-e1000-enhance-frame-fragment-detection.patch</Patch>
+
+            <!-- ath5k: Fix EEPROM checksum check regression (#12093) -->
+            <Patch level="1">kernel/linux-2.6-ath5k-fix-eeprom-checksum-check-for-custom-sized-eeproms.patch</Patch>
+
             <!-- Squashfs-lzma support -->
             <Patch level="1">squashfs/linux-2.6-squashfs-constify-super_operations-struct.patch</Patch>
             <Patch level="1">squashfs/squashfs-devel-add-lzma-support.patch</Patch>
@@ -212,6 +219,12 @@
             <Patch level="1">ubuntu/apparmor/apparmor.diff</Patch>
             <Patch level="1">ubuntu/apparmor/security-default-lsm.diff</Patch>
 
+            <!--
+            <Patch level="1">ubuntu/ubuntu-lucid.git-isapnp_init-make-isa-PNP-scanning-async.patch</Patch>
+            <Patch level="1">ubuntu/ubuntu-lucid.git-29f1e2fdb1c62b0a7e27740d8480fbc371f76495.patch</Patch>
+            <Patch level="1">ubuntu/ubuntu-lucid.git-a7baa7164fdf25b2819798ee2238a3cc7b4ada75.patch</Patch>
+            -->
+
 
             <!-- Subset of OpenSuSE Kernel Patches -->
 
@@ -403,7 +416,9 @@
                 - quota: Fix regression on ext3 file-systems causing panic upon boot (#12008).
                 - timer: Revert "Prevent clockevent_devices list corruption" to fix shutdown hangs (#12036),
                 - disable X86_CPU_DEBUG,
-                - kernel/signal.c: fix kernel information leak with print-fatal-signals=1 (CVE-2010-0003) (#12072).
+                - kernel/signal.c: fix kernel information leak with print-fatal-signals=1 (CVE-2010-0003) (#12072),
+                - ath5k: Fix EEPROM checksum check regression (#12093),
+                - e1000: Enhance frame fragment detection (CVE-2009-4536) (#12090).
             </Comment>
             <Name>Ozan Çağlayan</Name>
             <Email>ozan at pardus.org.tr</Email>