diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-08-22 07:34:59 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-22 07:35:19 -0400 |
commit | 14f0cc6e6324aa6a74e741d3525d9135c6a8334c (patch) | |
tree | 56a79b93d67f5de52f720d86757b815bf68f87e2 /kernel.spec | |
parent | 7051aa7c8d04c3bf80f517ec3a0f542c191f92f5 (diff) | |
download | kernel-14f0cc6e6324aa6a74e741d3525d9135c6a8334c.tar.gz kernel-14f0cc6e6324aa6a74e741d3525d9135c6a8334c.tar.xz kernel-14f0cc6e6324aa6a74e741d3525d9135c6a8334c.zip |
Linux v3.6-rc2-400-g23dcfa6
- CVE-2012-3520: af_netlink: invalid handling of SCM_CREDENTIALS passing
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/kernel.spec b/kernel.spec index 9d3cc3434..fe54e105d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -744,11 +744,6 @@ Patch22000: weird-root-dentry-name-debug.patch #selinux ptrace child permissions Patch22001: selinux-apply-different-permission-to-ptrace-child.patch -#rhbz 836742 -Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch - -Patch22065: fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch - #rhbz 847548 Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch @@ -1442,11 +1437,6 @@ ApplyPatch weird-root-dentry-name-debug.patch #selinux ptrace child permissions ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch -#rhbz 836742 -ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch - -ApplyPatch fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch - #rhbz 847548 ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch @@ -2315,6 +2305,10 @@ fi # ||----w | # || || %changelog +* Wed Aug 22 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc2.git2.1 +- Linux v3.6-rc2-400-g23dcfa6 +- CVE-2012-3520: af_netlink: invalid handling of SCM_CREDENTIALS passing + * Tue Aug 21 2012 Josh Boyer <jwboyer@redhat.com> - Add patch from Dave Jones to fix suspicious RCU usage in SELinux (rhbz 846037) - Add patch from Richard W.M. Jones to fix virtio scsi oops (rhbz 847548) |