summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2013-11-12 23:28:20 +0100
committerNicolas Chauvet <kwizart@gmail.com>2013-11-12 23:28:20 +0100
commit8d25e204627406f8a9e6b2dffa643f70d65bf62a (patch)
tree6a8c518e0da902ef820a8a9988afea2f2a2d1c05
parent2e0b7e280ec14d23fbbb316667ea36fa7af24048 (diff)
downloadkernel-8d25e204627406f8a9e6b2dffa643f70d65bf62a.tar.gz
kernel-8d25e204627406f8a9e6b2dffa643f70d65bf62a.tar.xz
kernel-8d25e204627406f8a9e6b2dffa643f70d65bf62a.zip
Add merged patch
-rw-r--r--kernel.spec16
1 files changed, 1 insertions, 15 deletions
diff --git a/kernel.spec b/kernel.spec
index bfde1dba..95fe6744 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -779,13 +779,6 @@ Patch25078: ipv6-remove-max_addresses-check-from-ipv6_create_tempaddr.patch
#rhbz 1000679
Patch25079: rt2800-rearrange-bbp-rfcsr-initialization.patch
-#CVE-2013-2888 rhbz 1000451 1002543 CVE-2013-2889 rhbz 999890 1002548
-#CVE-2013-2891 rhbz 999960 1002555 CVE-2013-2892 rhbz 1000429 1002570
-#CVE-2013-2893 rhbz 1000414 1002575 CVE-2013-2894 rhbz 1000137 1002579
-#CVE-2013-2895 rhbz 1000360 1002581 CVE-2013-2896 rhbz 1000494 1002594
-#CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
-Patch25099: HID-CVE-fixes.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1503,14 +1496,7 @@ ApplyPatch HID-Revert-Revert-HID-Fix-logitech-dj-missing-Unifying-device-issue.p
ApplyPatch media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch
#CVE-2013-0343 rhbz 914664 999380
-ApplyPatch ipv6-remove-max_addresses-check-from-ipv6_create_tempaddr.patch
-
-#CVE-2013-2888 rhbz 1000451 1002543 CVE-2013-2889 rhbz 999890 1002548
-#CVE-2013-2891 rhbz 999960 1002555 CVE-2013-2892 rhbz 1000429 1002570
-#CVE-2013-2893 rhbz 1000414 1002575 CVE-2013-2894 rhbz 1000137 1002579
-#CVE-2013-2895 rhbz 1000360 1002581 CVE-2013-2896 rhbz 1000494 1002594
-#CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
-ApplyPatch HID-CVE-fixes.patch
+#ApplyPatch ipv6-remove-max_addresses-check-from-ipv6_create_tempaddr.patch
#rhbz 1000679
ApplyPatch rt2800-rearrange-bbp-rfcsr-initialization.patch